diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorBuildTest.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorBuildTest.cs index e9ecfacbdf..fc5920d906 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorBuildTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorBuildTest.cs @@ -41,7 +41,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests Assert.Equal("Hello from buildtime-compiled precompilation view!", responseBody.Trim()); } - [Fact(Skip = "Not yet implemented")] + [Fact] public async Task Rzc_LocalPageWithDifferentContent_IsUsed() { // Act @@ -53,7 +53,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests Assert.Equal("Hello from runtime-compiled rzc page!", responseBody.Trim()); } - [Fact(Skip = "Not yet implemented")] + [Fact] public async Task Rzc_LocalViewWithDifferentContent_IsUsed() { // Act diff --git a/test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page.cs b/test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page.cs index 76d83023c6..5010dc1c8e 100644 --- a/test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page.cs +++ b/test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page.cs @@ -1,10 +1,42 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace RazorBuildWebSite.Views.Pages.Rzc +#pragma checksum "D:\k\Mvc\test\WebSites\RazorBuildWebSite\Pages\Rzc\Page.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "bffc62fb5650504812475cb29d6819b8737df1ac" +// +#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 { - class Page + #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", @"bffc62fb5650504812475cb29d6819b8737df1ac", @"/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, 41, 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 Html { get; private set; } + public global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary ViewData => (global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary)PageContext?.ViewData; + public Page_Model Model => ViewData.Model; } } +#pragma warning restore 1591 diff --git a/test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page_Model.cs b/test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page_Model.cs index bccaaf5373..9faad97ed3 100644 --- a/test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page_Model.cs +++ b/test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page_Model.cs @@ -1,7 +1,7 @@  using Microsoft.AspNetCore.Mvc.RazorPages; -namespace RazorBuildWebSite.Views.Pages.Rzc +namespace RazorBuildWebSite.Pages.Rzc { public class Page_Model : PageModel { diff --git a/test/WebSites/RazorBuildWebSite.Views/Views/Rzc/View.cs b/test/WebSites/RazorBuildWebSite.Views/Views/Rzc/View.cs index eae030ba4e..70eaff7457 100644 --- a/test/WebSites/RazorBuildWebSite.Views/Views/Rzc/View.cs +++ b/test/WebSites/RazorBuildWebSite.Views/Views/Rzc/View.cs @@ -1,10 +1,40 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace RazorBuildWebSite.Views.Views.Rzc +#pragma checksum "D:\k\Mvc\test\WebSites\RazorBuildWebSite\Views\Rzc\View.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "f058eaf6ac156124e321c4994a1975ec25cb4ba7" +// +#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 { - class Index + #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", @"f058eaf6ac156124e321c4994a1975ec25cb4ba7", @"/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 { + #pragma warning disable 1998 + public async override global::System.Threading.Tasks.Task ExecuteAsync() + { + BeginContext(0, 37, 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 Html { get; private set; } } } +#pragma warning restore 1591 diff --git a/test/WebSites/RazorBuildWebSite/Pages/Precompilation/Page.cshtml.cs b/test/WebSites/RazorBuildWebSite/Pages/Precompilation/Page.cshtml.cs deleted file mode 100644 index 8e7b83ecae..0000000000 --- a/test/WebSites/RazorBuildWebSite/Pages/Precompilation/Page.cshtml.cs +++ /dev/null @@ -1,9 +0,0 @@ - -using Microsoft.AspNetCore.Mvc.RazorPages; - -namespace RazorBuildWebSite.Pages.Precompilation -{ - public class Page_Model : PageModel - { - } -} \ No newline at end of file diff --git a/test/WebSites/RazorBuildWebSite/Pages/Rzc/Page.cshtml.cs b/test/WebSites/RazorBuildWebSite/Pages/Rzc/Page.cshtml.cs deleted file mode 100644 index 9e665e54a4..0000000000 --- a/test/WebSites/RazorBuildWebSite/Pages/Rzc/Page.cshtml.cs +++ /dev/null @@ -1,9 +0,0 @@ - -using Microsoft.AspNetCore.Mvc.RazorPages; - -namespace RazorBuildWebSite.Pages.Rzc -{ - public class Page_Model : PageModel - { - } -} \ No newline at end of file