diff --git a/build/dependencies.props b/build/dependencies.props index 00832a0819..911a48f68e 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,83 +4,83 @@ 0.10.11 - 2.1.0-preview2-15728 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 + 2.1.0-preview2-15733 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 5.2.4 2.6.1 2.6.1 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-26224-02 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 - 2.1.0-preview2-30272 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-26308-02 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 + 2.1.0-preview2-30281 2.0.0 - 2.1.0-preview2-26225-03 - 2.1.0-preview2-30272 + 2.1.0-preview2-26308-01 + 2.1.0-preview2-30281 15.6.0 4.7.49 1.0.1 - 4.5.0-preview2-26224-02 - 4.5.0-preview2-26224-02 - 4.5.0-preview2-26224-02 + 4.5.0-preview2-26308-02 + 4.5.0-preview2-26308-02 + 4.5.0-preview2-26308-02 0.8.0 2.3.1 2.4.0-beta.1.build3945 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 138d848db1..7e595b2958 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview2-15728 -commithash:393377068ddcf51dfee0536536d455f57a828b06 +version:2.1.0-preview2-15732 +commithash:f65b527f19fa0ef31a8e0e0e0ee2783e8268e091 diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/AdditionalAssemblyPart.cs b/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/AdditionalAssemblyPart.cs index a900e1b042..5bc8754ace 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/AdditionalAssemblyPart.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/AdditionalAssemblyPart.cs @@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationParts /// An that was added by an assembly that referenced it through the use /// of an assembly metadata attribute. /// - public class AdditionalAssemblyPart : AssemblyPart, ICompilationReferencesProvider + public class AdditionalAssemblyPart : AssemblyPart, ICompilationReferencesProvider, IApplicationPartTypeProvider { /// public AdditionalAssemblyPart(Assembly assembly) : base(assembly) @@ -19,5 +19,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationParts } IEnumerable ICompilationReferencesProvider.GetReferencePaths() => Array.Empty(); + + IEnumerable IApplicationPartTypeProvider.Types => Array.Empty(); } } diff --git a/test/WebSites/BasicWebSite/Controllers/HomeController.cs b/test/WebSites/BasicWebSite/Controllers/HomeController.cs index a68df9b313..454aca34b8 100644 --- a/test/WebSites/BasicWebSite/Controllers/HomeController.cs +++ b/test/WebSites/BasicWebSite/Controllers/HomeController.cs @@ -127,7 +127,9 @@ namespace BasicWebSite.Controllers public IActionResult GetAssemblyPartData([FromServices] ApplicationPartManager applicationPartManager) { // Ensures that the entry assembly part is marked correctly. - var assemblyPartMetadata = applicationPartManager.ApplicationParts + var assemblyPartMetadata = applicationPartManager + .ApplicationParts + .Where(part => part.GetType() == typeof(AssemblyPart)) .Select(part => part.Name) .ToArray(); diff --git a/test/WebSites/BasicWebSite/Views/RemoteAttribute_Home/Details.cshtml b/test/WebSites/BasicWebSite/Views/RemoteAttribute_Home/Details.cshtml deleted file mode 100644 index 6aa8ce67a5..0000000000 --- a/test/WebSites/BasicWebSite/Views/RemoteAttribute_Home/Details.cshtml +++ /dev/null @@ -1,78 +0,0 @@ -@model BasicWebSite.Models.RemoteAttributeUser -@{ - Layout = "_Layout.cshtml"; - string areaName; - ViewContext.RouteData.Values.TryGetValue("area", out areaName); - areaName = areaName ?? "root"; - ViewBag.Title = "Details in " + areaName + " area."; -} - -

@ViewBag.Title

-
-

Person

-
- -
-
- @Html.DisplayNameFor(model => model.Id) -
- -
- @Html.DisplayFor(model => model.Id) -
-
- -
-
- @Html.DisplayNameFor(model => model.UserId1) -
- -
- @Html.DisplayFor(model => model.UserId1) -
-
- -
-
- @Html.DisplayNameFor(model => model.UserId2) -
- -
- @Html.DisplayFor(model => model.UserId2) -
-
- -
-
- @Html.DisplayNameFor(model => model.UserId3) -
- -
- @Html.DisplayFor(model => model.UserId3) -
-
- -
-
- @Html.DisplayNameFor(model => model.UserId4) -
- -
- @Html.DisplayFor(model => model.UserId4) -
-
- -
-
- @Html.DisplayNameFor(model => model.UserId5) -
- -
- @Html.DisplayFor(model => model.UserId5) -
-
-
- -

- @Html.ActionLink("Create a new one", "Create") -

\ No newline at end of file diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj b/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj index 29c752e7cd..52dc3bc28e 100644 --- a/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj +++ b/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj @@ -3,6 +3,8 @@ $(StandardTestWebsiteTfms) full + + false diff --git a/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj b/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj index 8c7085f7fd..3415507f8c 100644 --- a/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj +++ b/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj @@ -3,6 +3,7 @@ $(StandardTestWebsiteTfms) $(DefineConstants) + false diff --git a/test/WebSites/RazorPagesWebSite/Login.cshtml b/test/WebSites/RazorPagesWebSite/Login.cshtml deleted file mode 100644 index 939fa6c3ed..0000000000 --- a/test/WebSites/RazorPagesWebSite/Login.cshtml +++ /dev/null @@ -1,2 +0,0 @@ -@page -@Context.Request.Query["ReturnUrl"] \ No newline at end of file diff --git a/test/WebSites/RazorPagesWebSite/Show.cshtml b/test/WebSites/RazorPagesWebSite/Show.cshtml index ba30ad94bb..010bf8732a 100644 --- a/test/WebSites/RazorPagesWebSite/Show.cshtml +++ b/test/WebSites/RazorPagesWebSite/Show.cshtml @@ -1,5 +1 @@ @page - -@function{ - public int Id {get; set;} -} diff --git a/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj b/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj index 991903c25b..f030bccb62 100644 --- a/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj +++ b/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj @@ -3,6 +3,7 @@ $(StandardTestWebsiteTfms) true + false