[release/9.0.3xx] Update dependencies from dotnet/razor (#45980)

v-wuzhai · web-flow · commit 4247b2e3a603 · 2025-01-20T10:24:28.000+08:00
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -321,22 +321,22 @@
       <Sha>af22effae4069a5dfb9b0735859de48820104f5b</Sha>
       <SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25058.6">
+    <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25066.1">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>46efcec83821d7f0322c01bc9549de83e855dcac</Sha>
+      <Sha>9b1e979b6c3fe7cfbe30f595b9b0994d20bd482c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25058.6">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25066.1">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>46efcec83821d7f0322c01bc9549de83e855dcac</Sha>
+      <Sha>9b1e979b6c3fe7cfbe30f595b9b0994d20bd482c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25058.6">
+    <Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25066.1">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>46efcec83821d7f0322c01bc9549de83e855dcac</Sha>
+      <Sha>9b1e979b6c3fe7cfbe30f595b9b0994d20bd482c</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25058.6">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25066.1">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>46efcec83821d7f0322c01bc9549de83e855dcac</Sha>
+      <Sha>9b1e979b6c3fe7cfbe30f595b9b0994d20bd482c</Sha>
       <SourceBuild RepoName="razor" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0">
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -229,9 +229,9 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/razor -->
-    <MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25058.6</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
-    <MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25058.6</MicrosoftCodeAnalysisRazorToolingInternalVersion>
-    <MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25058.6</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
+    <MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25066.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
+    <MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25066.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
+    <MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25066.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/wpf -->
diff --git a/src/RazorSdk/Tool/CompositeRazorProjectFileSystem.cs b/src/RazorSdk/Tool/CompositeRazorProjectFileSystem.cs
@@ -25,11 +25,6 @@ public override IEnumerable<RazorProjectItem> EnumerateItems(string basePath)
             }
         }
 
-        public override RazorProjectItem GetItem(string path)
-        {
-            return GetItem(path, fileKind: null);
-        }
-
         public override RazorProjectItem GetItem(string path, string fileKind)
         {
             RazorProjectItem razorProjectItem = null;
diff --git a/src/RazorSdk/Tool/GenerateCommand.cs b/src/RazorSdk/Tool/GenerateCommand.cs
@@ -397,10 +397,8 @@ public SourceItem(string sourcePath, string outputPath, string physicalRelativeP
             public string CssScope { get; }
         }
 
-        private class StaticTagHelperFeature : ITagHelperFeature
+        private class StaticTagHelperFeature : RazorEngineFeatureBase, ITagHelperFeature
         {
-            public RazorEngine Engine { get; set; }
-
             public IReadOnlyList<TagHelperDescriptor> TagHelpers { get; set; }
 
             public IReadOnlyList<TagHelperDescriptor> GetDescriptors() => TagHelpers;

Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,6 @@ public override IEnumerable<RazorProjectItem> EnumerateItems(string basePath)`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`- public override RazorProjectItem GetItem(string path)`
`29`		`- {`
`30`		`- return GetItem(path, fileKind: null);`
`31`		`- }`
`32`		`-`
`33`	`28`	`public override RazorProjectItem GetItem(string path, string fileKind)`
`34`	`29`	`{`
`35`	`30`	`RazorProjectItem razorProjectItem = null;`
Original file line number	Diff line number	Diff line change
`@@ -397,10 +397,8 @@ public SourceItem(string sourcePath, string outputPath, string physicalRelativeP`
`397`	`397`	`public string CssScope { get; }`
`398`	`398`	`}`
`399`	`399`
`400`		`- private class StaticTagHelperFeature : ITagHelperFeature`
	`400`	`+ private class StaticTagHelperFeature : RazorEngineFeatureBase, ITagHelperFeature`
`401`	`401`	`{`
`402`		`- public RazorEngine Engine { get; set; }`
`403`		`-`
`404`	`402`	`public IReadOnlyList<TagHelperDescriptor> TagHelpers { get; set; }`
`405`	`403`
`406`	`404`	`public IReadOnlyList<TagHelperDescriptor> GetDescriptors() => TagHelpers;`