More cleanup

pranavkm · pranavkm · commit fe1f9fbfda17 · 2018-11-21T16:43:36.000-08:00
diff --git a/build/dependencies.props b/build/dependencies.props
@@ -40,9 +40,7 @@
     <MicrosoftAspNetCoreJsonPatchPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreJsonPatchPackageVersion>
     <MicrosoftAspNetCoreLocalizationPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreLocalizationPackageVersion>
     <MicrosoftAspNetCoreLocalizationRoutingPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreLocalizationRoutingPackageVersion>
-    <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
     <MicrosoftAspNetCoreRangeHelperSourcesPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreRangeHelperSourcesPackageVersion>
-    <MicrosoftAspNetCoreRazorLanguagePackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreRazorLanguagePackageVersion>
     <MicrosoftAspNetCoreRazorRuntimePackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreRazorRuntimePackageVersion>
     <MicrosoftAspNetCoreRazorTagHelpersTestingSourcesPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreRazorTagHelpersTestingSourcesPackageVersion>
     <MicrosoftAspNetCoreResponseCachingAbstractionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreResponseCachingAbstractionsPackageVersion>
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompiledViewDescriptor.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompiledViewDescriptor.cs
@@ -51,7 +51,6 @@ public CompiledViewDescriptor(RazorCompiledItem item, RazorViewAttribute attribu
             // later.
             ExpirationTokens = Array.Empty<IChangeToken>();
             RelativePath = ViewPath.NormalizePath(item?.Identifier ?? attribute.Path);
-            IsPrecompiled = true;
         }
 
         /// <summary>
@@ -72,11 +71,6 @@ public CompiledViewDescriptor(RazorCompiledItem item, RazorViewAttribute attribu
         /// </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>
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompiler.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompiler.cs
@@ -51,7 +51,7 @@ public RazorViewCompiler(
 
                 if (!_compiledViews.ContainsKey(compiledView.RelativePath))
                 {
-                    // View ordering has precedence semantics, a view with a higher precedence was
+                    // View ordering has precedence semantics, a view with a higher precedence was not
                     // already added to the list.
                     _compiledViews.Add(compiledView.RelativePath, Task.FromResult(compiledView));
                 }
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeatureProvider.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeatureProvider.cs
@@ -50,7 +50,6 @@ public void PopulateFeature(IEnumerable<ApplicationPart> parts, ViewsFeature fea
                         ExpirationTokens = Array.Empty<IChangeToken>(),
                         RelativePath = relativePath,
                         ViewAttribute = attribute,
-                        IsPrecompiled = true,
                     };
 
                     feature.ViewDescriptors.Add(viewDescriptor);
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj b/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj
@@ -41,7 +41,6 @@
         repositoryUrl=$(RepositoryUrl);
         repositoryCommit=$(RepositoryCommit);
         targetframework=$(TargetFramework);
-        MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion=$(MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion);
         MicrosoftAspNetCoreRazorRuntimePackageVersion=$(MicrosoftAspNetCoreRazorRuntimePackageVersion);
         MicrosoftCodeAnalysisRazorPackageVersion=$(MicrosoftCodeAnalysisRazorPackageVersion);
         MicrosoftCodeAnalysisCSharpPackageVersion=$(MicrosoftCodeAnalysisCSharpPackageVersion);
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.nuspec b/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.nuspec
@@ -16,7 +16,6 @@
     <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" />
@@ -25,7 +24,6 @@
       </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" />
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngine.cs b/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngine.cs
@@ -416,10 +416,6 @@ internal ViewLocationCacheResult CreateCacheResult(
                 var viewStartPages = isMainPage ?
                     GetViewStartPages(viewDescriptor.RelativePath, expirationTokens) :
                     Array.Empty<ViewLocationCacheItem>();
-                if (viewDescriptor.IsPrecompiled)
-                {
-                    _logger.PrecompiledViewFound(relativePath);
-                }
 
                 return new ViewLocationCacheResult(
                     new ViewLocationCacheItem(factoryResult.RazorPageFactory, relativePath),
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/breakingchanges.netcore.json b/src/Microsoft.AspNetCore.Mvc.Razor/breakingchanges.netcore.json
@@ -53,5 +53,15 @@
     "TypeId": "public class Microsoft.AspNetCore.Mvc.Razor.RazorViewEngineOptions",
     "MemberId": "public System.Collections.Generic.IList<Microsoft.Extensions.FileProviders.IFileProvider> get_FileProviders()",
     "Kind": "Removal"
+  },
+  {
+    "TypeId": "public class Microsoft.AspNetCore.Mvc.Razor.Compilation.CompiledViewDescriptor",
+    "MemberId": "public System.Boolean get_IsPrecompiled()",
+    "Kind": "Removal"
+  },
+  {
+    "TypeId": "public class Microsoft.AspNetCore.Mvc.Razor.Compilation.CompiledViewDescriptor",
+    "MemberId": "public System.Void set_IsPrecompiled(System.Boolean value)",
+    "Kind": "Removal"
   }
 ]
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/CompiledPageRouteModelProvider.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/CompiledPageRouteModelProvider.cs
@@ -70,11 +70,6 @@ private IEnumerable<CompiledViewDescriptor> GetViewDescriptors(ApplicationPartMa
                     continue;
                 }
 
-                if (!viewDescriptor.IsPrecompiled)
-                {
-                    continue;
-                }
-
                 if (IsRazorPage(viewDescriptor))
                 {
                     yield return viewDescriptor;
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewEngineTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewEngineTest.cs
@@ -8,17 +8,13 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Abstractions;
-using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 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.FileProviders;
 using Microsoft.Extensions.Logging.Abstractions;
-using Microsoft.Extensions.Logging.Testing;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
 using Microsoft.Extensions.WebEncoders.Testing;
@@ -1307,38 +1303,6 @@ public void FindPage_LooksForPages_UsesRouteValuesAsFallback()
             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),
-                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")]
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/CompiledPageRouteModelProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/CompiledPageRouteModelProviderTest.cs
@@ -9,12 +9,10 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 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.ApplicationModels
 {
@@ -125,34 +123,6 @@ public void OnProvidersExecuting_AddsModelsForCompiledViews_Version_2_1()
                 });
         }
 
-        [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()
         {
@@ -472,19 +442,10 @@ public void OnProvidersExecuting_UsesTheFirstDescriptorForEachPath()
             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"),
-                }),
+                CreateVersion_2_1_Descriptor("/Pages/About.cshtml"),
+                CreateVersion_2_1_Descriptor("/Pages/Home.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"),
-                }),
+                CreateVersion_2_1_Descriptor("/Pages/About.cshtml"),
             };
 
             var provider = CreateProvider(descriptors: descriptors);
@@ -618,11 +579,9 @@ public void GetRouteTemplate_ReturnsNull_IfAttributeDoesNotExist()
 
         private TestCompiledPageRouteModelProvider CreateProvider(
            RazorPagesOptions options = null,
-           IList<CompiledViewDescriptor> descriptors = null,
-           VirtualRazorProjectFileSystem fileSystem = null)
+           IList<CompiledViewDescriptor> descriptors = null)
         {
             options = options ?? new RazorPagesOptions();
-            fileSystem = fileSystem ?? new VirtualRazorProjectFileSystem();
 
             var provider = new TestCompiledPageRouteModelProvider(
                 new ApplicationPartManager(),
@@ -638,7 +597,6 @@ private static CompiledViewDescriptor CreateVersion_2_0_Descriptor(string path,
         {
             return new CompiledViewDescriptor
             {
-                IsPrecompiled = true,
                 RelativePath = path,
                 ViewAttribute = new RazorPageAttribute(path, typeof(object), routeTemplate),
             };
@@ -650,7 +608,6 @@ private static CompiledViewDescriptor CreateVersion_2_1_Descriptor(
         {
             return new CompiledViewDescriptor
             {
-                IsPrecompiled = true,
                 RelativePath = path,
                 Item = new TestRazorCompiledItem(typeof(object), "mvc.1.0.razor-page", path, metadata ?? Array.Empty<object>()),
             };
diff --git a/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj b/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj
@@ -11,7 +11,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Razor.Runtime" Version="$(MicrosoftAspNetCoreRazorRuntimePackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="$(MicrosoftAspNetCoreRazorLanguagePackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.WebEncoders" Version="$(MicrosoftExtensionsWebEncodersPackageVersion)" />
   </ItemGroup>
 
diff --git a/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestRazorProjectItem.cs b/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestRazorProjectItem.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/VirtualRazorProjectFileSystem.cs b/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/VirtualRazorProjectFileSystem.cs

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public RazorViewCompiler(`
`51`	`51`
`52`	`52`	`if (!_compiledViews.ContainsKey(compiledView.RelativePath))`
`53`	`53`	`{`
`54`		`- // View ordering has precedence semantics, a view with a higher precedence was`
	`54`	`+ // View ordering has precedence semantics, a view with a higher precedence was not`
`55`	`55`	`// already added to the list.`
`56`	`56`	`_compiledViews.Add(compiledView.RelativePath, Task.FromResult(compiledView));`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,11 +70,6 @@ private IEnumerable<CompiledViewDescriptor> GetViewDescriptors(ApplicationPartMa`
`70`	`70`	`continue;`
`71`	`71`	`}`
`72`	`72`
`73`		`- if (!viewDescriptor.IsPrecompiled)`
`74`		`- {`
`75`		`- continue;`
`76`		`- }`
`77`		`-`
`78`	`73`	`if (IsRazorPage(viewDescriptor))`
`79`	`74`	`{`
`80`	`75`	`yield return viewDescriptor;`