())
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
index 92c0267af8..0028493f0f 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int64 - LackModel.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int64 - LackModel.cshtml
@@ -15,7 +15,7 @@
}
- @Html.Partial(partialViewName: "LackModel.cshtml")
+ @(await Html.PartialAsync(partialViewName: "LackModel.cshtml"))
@(await Component.InvokeAsync())
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/ViewModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/ViewModel.cshtml
index bf3f5e64d9..d647c0ccc5 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/ViewModel.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/ViewModel.cshtml
@@ -24,7 +24,7 @@
@Html.DisplayFor(m => m, templateName: "LackModel")
- @Html.Partial(partialViewName: "DisplayTemplates/LackModel.cshtml")
+ @(await Html.PartialAsync(partialViewName: "DisplayTemplates/LackModel.cshtml"))
@(await Component.InvokeAsync
())
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj
index d6ea8aeef0..3f712b583f 100644
--- a/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj
@@ -1,12 +1,13 @@
-
+
netcoreapp3.0
$(DefineConstants)
+ true
-
+
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj
index d6ea8aeef0..3f712b583f 100644
--- a/src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj
@@ -1,12 +1,13 @@
-
+
netcoreapp3.0
$(DefineConstants)
+ true
-
+
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj
index 334fbee131..90d4eb16d2 100644
--- a/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj
@@ -1,24 +1,26 @@
-
+
netcoreapp3.0
$(DefineConstants)
false
+ true
-
+
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj b/src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj
index d0c00e364c..110ba0c8cc 100644
--- a/src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj
+++ b/src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj
@@ -6,12 +6,11 @@
false
<_EnableAllInclusiveRazorSdk>true
+ true
-
-
-
+
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/SearchInPages.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/SearchInPages.cshtml
index 9e0c846031..99cd541a61 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/SearchInPages.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/SearchInPages.cshtml
@@ -1,2 +1,2 @@
@page
-@Html.Partial("_FileInShared")
\ No newline at end of file
+@(await Html.PartialAsync("_FileInShared"))
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj b/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj
index b239857a9b..5b9dfef8cb 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj
@@ -2,16 +2,18 @@
netcoreapp3.0
+ true
-
+
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/Index.cshtml
index 4b7d8ae335..0084534e52 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/Index.cshtml
+++ b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/Index.cshtml
@@ -1,3 +1,3 @@
-@Html.Partial("../EmbeddedShared/_Partial.cshtml")
-@Html.Partial("_EmbeddedPartial")
+@(await Html.PartialAsync("../EmbeddedShared/_Partial.cshtml"))
+@(await Html.PartialAsync("_EmbeddedPartial"))
Tag Helper Link
diff --git a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/RelativeNonPath.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/RelativeNonPath.cshtml
index 1aca712209..03303e5f91 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/RelativeNonPath.cshtml
+++ b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/RelativeNonPath.cshtml
@@ -1,2 +1,2 @@
@{ Layout = "../EmbeddedShared/_Layout"; }
-@Html.Partial("./EmbeddedPartial")
\ No newline at end of file
+@(await Html.PartialAsync("./EmbeddedPartial"))
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj b/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj
index 38916a14d6..0d933d664e 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj
+++ b/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj
@@ -3,6 +3,7 @@
netcoreapp3.0
$(DefineConstants);NETCOREAPP2_0_CUSTOM_DEFINE
+ true
@@ -10,13 +11,14 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/BackSlashView.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/BackSlashView.cshtml
index e28dd6e75f..2685d9023f 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/BackSlashView.cshtml
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/BackSlashView.cshtml
@@ -3,4 +3,4 @@
Layout = "_Layout";
}
Page
-@Html.Partial("_BackSlashPartial")
\ No newline at end of file
+@(await Html.PartialAsync("_BackSlashPartial"))
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ExpanderViews/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ExpanderViews/Index.cshtml
index 0178074b3f..90beca3986 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/Views/ExpanderViews/Index.cshtml
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ExpanderViews/Index.cshtml
@@ -1 +1 @@
-@Html.Partial("_ExpanderPartial")
\ No newline at end of file
+@(await Html.PartialAsync("_ExpanderPartial"))
\ 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
index 981fbb5c34..b5623ecf0f 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/PartialWithModel.cshtml
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/PartialWithModel.cshtml
@@ -1,3 +1,3 @@
@model Person
@Model.Name
-@Html.Partial("_Partial", Model.Address)
\ No newline at end of file
+@(await Html.PartialAsync("_Partial", Model.Address))
\ 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
index 12619d26bf..bb6f49b30c 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewPartialMissingSection.cshtml
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewPartialMissingSection.cshtml
@@ -1,4 +1,4 @@
@{
Layout = null;
}
-@Html.Partial("PartialMissingSection")
\ No newline at end of file
+@(await Html.PartialAsync("PartialMissingSection"))
\ 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
index 3c2c59e986..a02bd71da0 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/SearchInPages.cshtml
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/SearchInPages.cshtml
@@ -1 +1 @@
-@Html.Partial("_SharedFromPages")
+@(await Html.PartialAsync("_SharedFromPages"))
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/ViewWithPartials.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/ViewWithPartials.cshtml
index b4396d7849..b1b7d27d9d 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/ViewWithPartials.cshtml
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/ViewWithPartials.cshtml
@@ -1,4 +1,4 @@
@{
var partial = (string)ViewData["Partial"];
}
-@Html.Partial(partial)
+@(await Html.PartialAsync(partial))
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/Index.cshtml
index 46f7e96b35..3c9afbc493 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/Index.cshtml
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/Index.cshtml
@@ -2,5 +2,5 @@
@ViewContext.ExecutingFilePath
@ViewContext.View.Path
@await Component.InvokeAsync("ComponentForViewWithPaths")
- @Html.Partial("_Partial")
+ @(await Html.PartialAsync("_Partial"))
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/Index.cshtml
index 71684f7ea6..b85a43861c 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/Index.cshtml
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/Index.cshtml
@@ -1,3 +1,3 @@
@inject FrameworkSpecificHelper MyHelper
@MyHelper.ExecuteOperation()
-@Html.Partial("_Partial")
\ No newline at end of file
+@(await Html.PartialAsync("_Partial"))
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj b/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj
index 8e30a60f34..c75b215a2f 100644
--- a/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj
+++ b/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj
@@ -2,6 +2,7 @@
netcoreapp3.0
+ true
@@ -9,11 +10,11 @@
-
+
+
+
+
-
-
-
-
+
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj b/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj
index 6474adec51..c78ee19561 100644
--- a/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj
+++ b/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj
@@ -2,15 +2,16 @@
netcoreapp3.0
+ true
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj b/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj
index 0327018a97..eaa0efc833 100644
--- a/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj
+++ b/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj
@@ -2,12 +2,13 @@
netcoreapp3.0
+ true
-
+
-
-
+
+
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj
index 2e074bd5e8..f969a9cf47 100644
--- a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj
@@ -3,14 +3,15 @@
netcoreapp3.0
true
+ true
-
+
-
-
-
-
+
+
+
+
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj b/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj
index 02bb2b01e7..e2e026a1fb 100644
--- a/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj
+++ b/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj
@@ -2,6 +2,7 @@
netcoreapp3.0
+ true
@@ -9,10 +10,10 @@
-
+
-
-
-
+
+
+
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs
deleted file mode 100644
index 083d9cb643..0000000000
--- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-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
deleted file mode 100644
index 0b3c694008..0000000000
--- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionResults/ActionResultController.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-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
deleted file mode 100644
index 563304e06f..0000000000
--- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/EnumParameterOverloadsController.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-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 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
deleted file mode 100644
index c920ac4274..0000000000
--- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/ParameterAttributeController.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-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 PostUserNameFromUri(int id, [FromUri]string name) { return null; }
- public List 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
deleted file mode 100644
index 26a43386aa..0000000000
--- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/TestController.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-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 GetUsers() { return null; }
-
- public List 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
deleted file mode 100644
index eb1f362164..0000000000
--- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsActionNameController.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-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
deleted file mode 100644
index 9d4747c600..0000000000
--- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsController.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-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
deleted file mode 100644
index 5ab7351f19..0000000000
--- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsDefaultPostController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-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
deleted file mode 100644
index c293d99056..0000000000
--- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsVerbOverrideController.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-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
deleted file mode 100644
index ea8c0ee813..0000000000
--- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-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 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 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 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 CreateValidationDictionary()
- {
- var result = new Dictionary();
- 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
deleted file mode 100644
index 000779dd63..0000000000
--- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpRequestMessage/HttpRequestMessageController.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-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 EchoProperty()
- {
- await Echo(Request);
- return new EmptyResult();
- }
-
- public async Task EchoParameter(HttpRequestMessage request)
- {
- if (!object.ReferenceEquals(request, Request))
- {
- throw new InvalidOperationException();
- }
-
- await Echo(request);
- return new EmptyResult();
- }
-
- public async Task 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 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(HttpStatusCode.OK, user);
- }
- else
- {
- // This will use the provided media type
- return Request.CreateResponse(HttpStatusCode.OK, user, mediaType);
- }
- }
-
- public HttpResponseMessage GetUserJson()
- {
- var user = new User()
- {
- Name = "Test User",
- };
-
- return Request.CreateResponse(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
deleted file mode 100644
index 5f1984664e..0000000000
--- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpResponseExceptionController.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-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
deleted file mode 100644
index 46f259fd10..0000000000
--- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/MvcController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-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
deleted file mode 100644
index 9f02342567..0000000000
--- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ParameterBinding/EmployeesController.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-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
deleted file mode 100644
index bb8326bff4..0000000000
--- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/Employee.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-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
deleted file mode 100644
index 62b08d1912..0000000000
--- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/User.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-
-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
deleted file mode 100644
index dd8a9a34ad..0000000000
--- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/UserAddress.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-
-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
deleted file mode 100644
index b8ceb65939..0000000000
--- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/UserKind.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-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
deleted file mode 100644
index b8dda25a9d..0000000000
--- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Startup.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.IO;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace WebApiCompatShimWebSite
-{
- public class Startup
- {
- public void ConfigureServices(IServiceCollection services)
- {
- // Add MVC services to the services container
- services.AddMvc()
- .AddWebApiConventions()
- .SetCompatibilityVersion(CompatibilityVersion.Latest)
- .AddMvcOptions(options => options.EnableEndpointRouting = false);
- }
-
- 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()
- .UseKestrel()
- .UseIISIntegration();
- }
-}
-
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj
deleted file mode 100644
index fa96f2123e..0000000000
--- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
- netcoreapp3.0
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/readme.md b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/readme.md
deleted file mode 100644
index 2ab97802df..0000000000
--- a/src/Mvc/test/WebSites/WebApiCompatShimWebSite/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-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/XmlFormattersWebSite.csproj b/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj
index 8b439ab3b0..70fa3dd1e4 100644
--- a/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj
+++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj
@@ -1,14 +1,15 @@
netcoreapp3.0
+ true
-
-
+
+
-
-
-
+
+
+
diff --git a/src/Mvc/version.props b/src/Mvc/version.props
deleted file mode 100644
index 43ce0a32a4..0000000000
--- a/src/Mvc/version.props
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
- 3.0.0
- alpha1
- t000
- a-
-
- $(VersionPrefix)
- $(VersionPrefix)-$(VersionSuffix)-final
- $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-'))
- $(VersionSuffix)-$(BuildNumber)
-
- 0.1.0
- preview1
-
- $(ExperimentalVersionPrefix)
- $(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final
- $(FeatureBranchVersionPrefix)$(ExperimentalVersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-'))
- $(ExperimentalVersionSuffix)-$(BuildNumber)
-
-
diff --git a/src/Servers/IIS/IISIntegration.NoV1.sln b/src/Servers/IIS/IISIntegration.NoV1.sln
index 4e82bfbad4..43cbf1fc02 100644
--- a/src/Servers/IIS/IISIntegration.NoV1.sln
+++ b/src/Servers/IIS/IISIntegration.NoV1.sln
@@ -30,8 +30,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server
{46A8612B-418B-4D70-B3A7-A21DD0627473} = {46A8612B-418B-4D70-B3A7-A21DD0627473}
EndProjectSection
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration.Tests", "test\Microsoft.AspNetCore.Server.IISIntegration.Tests\Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj", "{4106DB10-E09F-480E-9CE6-B39235512EE6}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E-9CC8-450C-8A8D-94FC76428150}"
ProjectSection(SolutionItems) = preProject
build\applicationhost.config = build\applicationhost.config
@@ -54,8 +52,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISExpress.FunctionalTests"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NativeIISSample", "samples\NativeIISSample\NativeIISSample.csproj", "{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InProcessWebSite", "test\testassets\InProcessWebSite\InProcessWebSite.csproj", "{679FA2A2-898B-4320-884E-C2D294A97CE1}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IIS", "src\Microsoft.AspNetCore.Server.IIS\Microsoft.AspNetCore.Server.IIS.csproj", "{46A8612B-418B-4D70-B3A7-A21DD0627473}"
ProjectSection(ProjectDependencies) = postProject
{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}
@@ -64,11 +60,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server
{D57EA297-6DC2-4BC0-8C91-334863327863} = {D57EA297-6DC2-4BC0-8C91-334863327863}
EndProjectSection
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StressTestWebSite", "test\testassets\StressTestWebSite\StressTestWebSite.csproj", "{13FD8F12-FFBE-4D01-B4AC-444F2994B04F}"
- ProjectSection(ProjectDependencies) = postProject
- {46A8612B-418B-4D70-B3A7-A21DD0627473} = {46A8612B-418B-4D70-B3A7-A21DD0627473}
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLibTests", "test\CommonLibTests\CommonLibTests.vcxproj", "{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}"
@@ -81,8 +72,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "src\AspNetCore
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "src\AspNetCoreModuleV2\IISLib\IISLib.vcxproj", "{09D9D1D6-2951-4E14-BC35-76A23CF9391A}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcessWebSite", "test\testassets\OutOfProcessWebSite\OutOfProcessWebSite.csproj", "{42E60F88-E23F-417A-8143-0CCEC05E1D02}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{622D35C9-627B-466E-8D15-752968CC79AF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Performance", "benchmarks\IIS.Performance\IIS.Performance.csproj", "{48F46909-E76A-4788-BCE1-E543C0E140FE}"
@@ -113,10 +102,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.BackwardsCompatibility.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.ForwardsCompatibility.FunctionalTests", "test\IIS.ForwardsCompatibility.FunctionalTests\IIS.ForwardsCompatibility.FunctionalTests.csproj", "{D1EA5D99-28FD-4197-81DE-17098846B38B}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InProcessWebSite", "test\testassets\InProcessForwardsCompatWebSite\InProcessWebSite.csproj", "{BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestTasks", "test\testassets\TestTasks\TestTasks.csproj", "{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InProcessWebSite", "test\testassets\InProcessWebSite\InProcessWebSite.csproj", "{E685D546-FDCD-4A4C-9183-728C308A9A9E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcessWebSite", "test\testassets\OutOfProcessWebSite\OutOfProcessWebSite.csproj", "{CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StressTestWebSite", "test\testassets\StressTestWebSite\StressTestWebSite.csproj", "{7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MIcrosoft.AspNetCore.Server.IISIntegration.Tests", "test\IISIntegration.Tests\MIcrosoft.AspNetCore.Server.IISIntegration.Tests.csproj", "{ACCF17D6-CEA0-4008-8F36-70085163CAE7}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -151,18 +146,6 @@ Global
{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x64.Build.0 = Release|Any CPU
{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x86.ActiveCfg = Release|Any CPU
{8B3446E8-E6A8-4591-AA63-A95837C6E97C}.Release|x86.Build.0 = Release|Any CPU
- {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x64.ActiveCfg = Debug|Any CPU
- {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x64.Build.0 = Debug|Any CPU
- {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x86.ActiveCfg = Debug|Any CPU
- {4106DB10-E09F-480E-9CE6-B39235512EE6}.Debug|x86.Build.0 = Debug|Any CPU
- {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|Any CPU.Build.0 = Release|Any CPU
- {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x64.ActiveCfg = Release|Any CPU
- {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x64.Build.0 = Release|Any CPU
- {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x86.ActiveCfg = Release|Any CPU
- {4106DB10-E09F-480E-9CE6-B39235512EE6}.Release|x86.Build.0 = Release|Any CPU
{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -187,18 +170,6 @@ Global
{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x64.Build.0 = Release|x64
{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x86.ActiveCfg = Release|x86
{9BC4AFCB-325D-4C81-8228-8CF301CE2F97}.Release|x86.Build.0 = Release|x86
- {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|Any CPU.ActiveCfg = Debug|x64
- {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|Any CPU.Build.0 = Debug|x64
- {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x64.ActiveCfg = Debug|x64
- {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x64.Build.0 = Debug|x64
- {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x86.ActiveCfg = Debug|x86
- {679FA2A2-898B-4320-884E-C2D294A97CE1}.Debug|x86.Build.0 = Debug|x86
- {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|Any CPU.ActiveCfg = Release|x64
- {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|Any CPU.Build.0 = Release|x64
- {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x64.ActiveCfg = Release|x64
- {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x64.Build.0 = Release|x64
- {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x86.ActiveCfg = Release|x86
- {679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x86.Build.0 = Release|x86
{46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|Any CPU.Build.0 = Debug|Any CPU
{46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -211,18 +182,6 @@ Global
{46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x64.Build.0 = Release|Any CPU
{46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x86.ActiveCfg = Release|Any CPU
{46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x86.Build.0 = Release|Any CPU
- {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|Any CPU.ActiveCfg = Debug|x64
- {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|Any CPU.Build.0 = Debug|x64
- {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x64.ActiveCfg = Debug|x64
- {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x64.Build.0 = Debug|x64
- {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x86.ActiveCfg = Debug|x86
- {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x86.Build.0 = Debug|x86
- {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|Any CPU.ActiveCfg = Release|x64
- {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|Any CPU.Build.0 = Release|x64
- {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x64.ActiveCfg = Release|x64
- {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x64.Build.0 = Release|x64
- {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x86.ActiveCfg = Release|x86
- {13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Release|x86.Build.0 = Release|x86
{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|Any CPU.ActiveCfg = Debug|Win32
{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.ActiveCfg = Debug|x64
{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.Build.0 = Debug|x64
@@ -263,18 +222,6 @@ Global
{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x64.Build.0 = Release|x64
{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.ActiveCfg = Release|Win32
{09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.Build.0 = Release|Win32
- {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|Any CPU.ActiveCfg = Debug|x64
- {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|Any CPU.Build.0 = Debug|x64
- {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x64.ActiveCfg = Debug|x64
- {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x64.Build.0 = Debug|x64
- {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x86.ActiveCfg = Debug|x86
- {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x86.Build.0 = Debug|x86
- {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|Any CPU.ActiveCfg = Release|x64
- {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|Any CPU.Build.0 = Release|x64
- {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x64.ActiveCfg = Release|x64
- {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x64.Build.0 = Release|x64
- {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x86.ActiveCfg = Release|x86
- {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Release|x86.Build.0 = Release|x86
{48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{48F46909-E76A-4788-BCE1-E543C0E140FE}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -399,16 +346,6 @@ Global
{D1EA5D99-28FD-4197-81DE-17098846B38B}.Release|x64.Build.0 = Release|Any CPU
{D1EA5D99-28FD-4197-81DE-17098846B38B}.Release|x86.ActiveCfg = Release|Any CPU
{D1EA5D99-28FD-4197-81DE-17098846B38B}.Release|x86.Build.0 = Release|Any CPU
- {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}.Debug|Any CPU.ActiveCfg = Debug|x86
- {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}.Debug|x64.ActiveCfg = Debug|x64
- {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}.Debug|x64.Build.0 = Debug|x64
- {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}.Debug|x86.ActiveCfg = Debug|x86
- {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}.Debug|x86.Build.0 = Debug|x86
- {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}.Release|Any CPU.ActiveCfg = Release|x86
- {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}.Release|x64.ActiveCfg = Release|x64
- {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}.Release|x64.Build.0 = Release|x64
- {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}.Release|x86.ActiveCfg = Release|x86
- {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493}.Release|x86.Build.0 = Release|x86
{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -421,6 +358,48 @@ Global
{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Release|x64.Build.0 = Release|Any CPU
{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Release|x86.ActiveCfg = Release|Any CPU
{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}.Release|x86.Build.0 = Release|Any CPU
+ {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|x64.ActiveCfg = Debug|x64
+ {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|x64.Build.0 = Debug|x64
+ {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|x86.ActiveCfg = Debug|x86
+ {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Debug|x86.Build.0 = Debug|x86
+ {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|Any CPU.ActiveCfg = Release|x86
+ {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|x64.ActiveCfg = Release|x64
+ {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|x64.Build.0 = Release|x64
+ {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|x86.ActiveCfg = Release|x86
+ {E685D546-FDCD-4A4C-9183-728C308A9A9E}.Release|x86.Build.0 = Release|x86
+ {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Debug|x64.ActiveCfg = Debug|x64
+ {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Debug|x64.Build.0 = Debug|x64
+ {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Debug|x86.ActiveCfg = Debug|x86
+ {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Debug|x86.Build.0 = Debug|x86
+ {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Release|Any CPU.ActiveCfg = Release|x86
+ {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Release|x64.ActiveCfg = Release|x64
+ {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Release|x64.Build.0 = Release|x64
+ {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Release|x86.ActiveCfg = Release|x86
+ {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70}.Release|x86.Build.0 = Release|x86
+ {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Debug|x64.ActiveCfg = Debug|x64
+ {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Debug|x64.Build.0 = Debug|x64
+ {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Debug|x86.ActiveCfg = Debug|x86
+ {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Debug|x86.Build.0 = Debug|x86
+ {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|Any CPU.ActiveCfg = Release|x86
+ {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|x64.ActiveCfg = Release|x64
+ {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|x64.Build.0 = Release|x64
+ {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|x86.ActiveCfg = Release|x86
+ {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE}.Release|x86.Build.0 = Release|x86
+ {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Debug|x64.Build.0 = Debug|Any CPU
+ {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Debug|x86.Build.0 = Debug|Any CPU
+ {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Release|x64.ActiveCfg = Release|Any CPU
+ {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Release|x64.Build.0 = Release|Any CPU
+ {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Release|x86.ActiveCfg = Release|Any CPU
+ {ACCF17D6-CEA0-4008-8F36-70085163CAE7}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -428,19 +407,15 @@ Global
GlobalSection(NestedProjects) = preSolution
{E4E2BDC4-A9C6-4AE9-B429-032EC83EDE64} = {C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9}
{8B3446E8-E6A8-4591-AA63-A95837C6E97C} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD}
- {4106DB10-E09F-480E-9CE6-B39235512EE6} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
{9BC4AFCB-325D-4C81-8228-8CF301CE2F97} = {C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9}
- {679FA2A2-898B-4320-884E-C2D294A97CE1} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}
{46A8612B-418B-4D70-B3A7-A21DD0627473} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD}
- {13FD8F12-FFBE-4D01-B4AC-444F2994B04F} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}
{744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
{1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
{06CA2C2B-83B0-4D83-905A-E0C74790009E} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD}
{EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {06CA2C2B-83B0-4D83-905A-E0C74790009E}
{55494E58-E061-4C4C-A0A8-837008E72F85} = {06CA2C2B-83B0-4D83-905A-E0C74790009E}
{09D9D1D6-2951-4E14-BC35-76A23CF9391A} = {06CA2C2B-83B0-4D83-905A-E0C74790009E}
- {42E60F88-E23F-417A-8143-0CCEC05E1D02} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}
{48F46909-E76A-4788-BCE1-E543C0E140FE} = {622D35C9-627B-466E-8D15-752968CC79AF}
{D57EA297-6DC2-4BC0-8C91-334863327863} = {06CA2C2B-83B0-4D83-905A-E0C74790009E}
{7F87406C-A3C8-4139-A68D-E4C344294A67} = {06CA2C2B-83B0-4D83-905A-E0C74790009E}
@@ -452,8 +427,11 @@ Global
{D17B7B35-5361-4A50-B499-E03E5C3CC095} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
{582B07BC-73F4-4689-8557-B039298BD82C} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
{D1EA5D99-28FD-4197-81DE-17098846B38B} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
- {BBBC85B2-5D7A-4D09-90B1-8DBCC9059493} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}
{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
+ {E685D546-FDCD-4A4C-9183-728C308A9A9E} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}
+ {CFC23E23-7AD5-4D7D-9F3C-DBD241231E70} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}
+ {7C0B25FC-DADA-489D-A3FB-F3D732FC8ECE} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}
+ {ACCF17D6-CEA0-4008-8F36-70085163CAE7} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5}
diff --git a/src/Servers/IIS/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs b/src/Servers/IIS/test/IISIntegration.Tests/IISExtensionTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs
rename to src/Servers/IIS/test/IISIntegration.Tests/IISExtensionTests.cs
diff --git a/src/Servers/IIS/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs b/src/Servers/IIS/test/IISIntegration.Tests/IISMiddlewareTests.cs
similarity index 100%
rename from src/Servers/IIS/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs
rename to src/Servers/IIS/test/IISIntegration.Tests/IISMiddlewareTests.cs
diff --git a/src/Servers/IIS/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj b/src/Servers/IIS/test/IISIntegration.Tests/MIcrosoft.AspNetCore.Server.IISIntegration.Tests.csproj
similarity index 100%
rename from src/Servers/IIS/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj
rename to src/Servers/IIS/test/IISIntegration.Tests/MIcrosoft.AspNetCore.Server.IISIntegration.Tests.csproj
diff --git a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj
index 1a91bad913..cc07e55027 100644
--- a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj
+++ b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj
@@ -16,7 +16,7 @@
-
+