Fix build break

Author: ajaybhargavb

src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewCompiler.cs

@@ -180,7 +180,7 @@ private Task<CompiledViewDescriptor> CreateCacheEntry(string normalizedPath)
                     compilationTaskSource = new TaskCompletionSource<CompiledViewDescriptor>();
                     foreach (var importItem in _templateEngine.GetImportItems(projectItem))
                     {
-                        cacheEntryOptions.ExpirationTokens.Add(_fileProvider.Watch(importItem.Path));
+                        cacheEntryOptions.ExpirationTokens.Add(_fileProvider.Watch(importItem.FilePath));
                     }
                     cacheEntry = compilationTaskSource.Task;
                 }

src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngine.cs

@@ -432,7 +432,7 @@ private IReadOnlyList<ViewLocationCacheItem> GetViewStartPages(
 
             foreach (var viewStartProjectItem in _razorProject.FindHierarchicalItems(path, ViewStartFileName))
             {
-                var result = _pageFactory.CreateFactory(viewStartProjectItem.Path);
+                var result = _pageFactory.CreateFactory(viewStartProjectItem.FilePath);
                 var viewDescriptor = result.ViewDescriptor;
                 if (viewDescriptor?.ExpirationTokens != null)
                 {
@@ -447,7 +447,7 @@ private IReadOnlyList<ViewLocationCacheItem> GetViewStartPages(
                     // Populate the viewStartPages list so that _ViewStarts appear in the order the need to be
                     // executed (closest last, furthest first). This is the reverse order in which
                     // ViewHierarchyUtility.GetViewStartLocations returns _ViewStarts.
-                    viewStartPages.Insert(0, new ViewLocationCacheItem(result.RazorPageFactory, viewStartProjectItem.Path));
+                    viewStartPages.Insert(0, new ViewLocationCacheItem(result.RazorPageFactory, viewStartProjectItem.FilePath));
                 }
             }
 

src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionDescriptorChangeProvider.cs

@@ -47,7 +47,7 @@ public PageActionDescriptorChangeProvider(
 
             var importFileAtPagesRoot = rootDirectory + "/" + templateEngine.Options.ImportsFileName;
             _additionalFilesToTrack = templateEngine.GetImportItems(importFileAtPagesRoot)
-                .Select(item => item.Path)
+                .Select(item => item.FilePath)
                 .ToArray();
 
             _searchPattern = rootDirectory + "/**/*.cshtml";

src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvokerProvider.cs

@@ -212,7 +212,7 @@ internal List<Func<IRazorPage>> GetViewStartFactories(CompiledPageActionDescript
                 ViewStartFileName);
             foreach (var item in viewStartItems)
             {
-                var factoryResult = _razorPageFactoryProvider.CreateFactory(item.Path);
+                var factoryResult = _razorPageFactoryProvider.CreateFactory(item.FilePath);
                 if (factoryResult.Success)
                 {
                     viewStartFactories.Insert(0, factoryResult.RazorPageFactory);

src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/RazorProjectPageRouteModelProvider.cs

@@ -49,7 +49,7 @@ public void OnProvidersExecuting(PageRouteModelProviderContext context)
 
                 var routeModel = new PageRouteModel(
                     relativePath: item.CombinedPath,
-                    viewEnginePath: item.PathWithoutExtension);
+                    viewEnginePath: item.FilePathWithoutExtension);
                 PageSelectorModel.PopulateDefaults(routeModel, routeTemplate);
 
                 context.RouteModels.Add(routeModel);

test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/FileProviderRazorProjectTest.cs

@@ -48,9 +48,9 @@ public void EnumerateFiles_ReturnsCshtmlFiles()
             var razorFiles = razorProject.EnumerateItems("/");
 
             // Assert
-            Assert.Collection(razorFiles.OrderBy(f => f.Path),
-                file => Assert.Equal("/File1.cshtml", file.Path),
-                file => Assert.Equal("/File3.cshtml", file.Path));
+            Assert.Collection(razorFiles.OrderBy(f => f.FilePath),
+                file => Assert.Equal("/File1.cshtml", file.FilePath),
+                file => Assert.Equal("/File3.cshtml", file.FilePath));
         }
 
         [Fact]
@@ -89,11 +89,11 @@ public void EnumerateFiles_IteratesOverAllCshtmlUnderRoot()
             var razorFiles = razorProject.EnumerateItems("/");
 
             // Assert
-            Assert.Collection(razorFiles.OrderBy(f => f.Path),
-                file => Assert.Equal("/File1.cshtml", file.Path),
-                file => Assert.Equal("/Level1-Dir1/File2.cshtml", file.Path),
-                file => Assert.Equal("/Level1-Dir1/File3.cshtml", file.Path),
-                file => Assert.Equal("/Level1-Dir2/File5.cshtml", file.Path));
+            Assert.Collection(razorFiles.OrderBy(f => f.FilePath),
+                file => Assert.Equal("/File1.cshtml", file.FilePath),
+                file => Assert.Equal("/Level1-Dir1/File2.cshtml", file.FilePath),
+                file => Assert.Equal("/Level1-Dir1/File3.cshtml", file.FilePath),
+                file => Assert.Equal("/Level1-Dir2/File5.cshtml", file.FilePath));
         }
 
         [Fact]
@@ -132,9 +132,9 @@ public void EnumerateFiles_IteratesOverAllCshtmlUnderPath()
             var razorFiles = razorProject.EnumerateItems("/Level1-Dir1");
 
             // Assert
-            Assert.Collection(razorFiles.OrderBy(f => f.Path),
-                file => Assert.Equal("/File2.cshtml", file.Path),
-                file => Assert.Equal("/File3.cshtml", file.Path));
+            Assert.Collection(razorFiles.OrderBy(f => f.FilePath),
+                file => Assert.Equal("/File2.cshtml", file.FilePath),
+                file => Assert.Equal("/File3.cshtml", file.FilePath));
         }
     }
 }

test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageDirectiveFeatureTest.cs

@@ -170,7 +170,7 @@ public TestRazorProjectItem(string content)
 
         public override bool Exists => throw new NotImplementedException();
 
-        public override string Path => "Test.cshtml";
+        public override string FilePath => "Test.cshtml";
 
         public override string PhysicalPath => null;
 

test/WebSites/RazorPageExecutionInstrumentationWebSite/TestRazorCompilationService.cs

@@ -24,7 +24,7 @@ public override RazorProjectItem GetItem(string path)
         private class TestRazorProjectItem : FileProviderRazorProjectItem
         {
             public TestRazorProjectItem(FileProviderRazorProjectItem projectItem)
-                : base(projectItem.FileInfo, projectItem.BasePath, projectItem.Path)
+                : base(projectItem.FileInfo, projectItem.BasePath, projectItem.FilePath)
             {
             }