Merge branch 'release/3.1'

\n\nCommit migrated from 3eeb3ff068

src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorIntermediateNodeLoweringPhase.cs

@@ -1099,8 +1099,6 @@ namespace Microsoft.AspNetCore.Razor.Language
 
                 if (node.Source != null)
                 {
-                    Debug.Assert(node.Source.Value.FilePath != null);
-
                     node.Source = new SourceSpan(
                         node.Source.Value.FilePath,
                         node.Source.Value.AbsoluteIndex,

src/Razor/test/testassets/MvcWithComponents/Views/Home/Index.cshtml

@@ -2,4 +2,4 @@
     ViewData["Title"] = "Home Page";
 }
 
-Hello world!
+Hello world!

src/Razor/test/testassets/MvcWithComponents/Views/_ViewImports.cshtml

@@ -1,3 +1,4 @@
 @using MvcWithComponents
 @using MvcWithComponents.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@inject DateTime TheTime

src/Razor/test/testassets/SimpleMvc/Views/_ViewImports.cshtml

@@ -1,3 +1,4 @@
 @using SimpleMvc
 @using SimpleMvc.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@inject DateTime TheTime

src/Razor/test/testassets/SimpleMvc11/Views/_ViewImports.cshtml

@@ -1,2 +1,3 @@
 @using SimpleMvc11
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@inject DateTime TheTime

src/Razor/test/testassets/SimpleMvc21/Views/_ViewImports.cshtml

@@ -2,3 +2,4 @@
 @using SimpleMvc.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @namespace SimpleMvc21
+@inject DateTime TheTime

src/Razor/test/testassets/SimpleMvc22/Views/_ViewImports.cshtml

@@ -2,3 +2,4 @@
 @using SimpleMvc.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @namespace SimpleMvc21
+@inject DateTime TheTime