diff --git a/eng/Versions.props b/eng/Versions.props
index d0e0fa9d3e..477658d6a0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -105,7 +105,7 @@
     <MicrosoftEntityFrameworkCorePackageVersion>3.0.0-preview.18604.3</MicrosoftEntityFrameworkCorePackageVersion>
 
     <!-- Packages from aspnet/AspNetCore-Tooling -->
-    <MicrosoftNETSdkRazorPackageVersion>3.0.0-preview-19057-06</MicrosoftNETSdkRazorPackageVersion>
+    <MicrosoftNETSdkRazorPackageVersion>3.0.0-preview-19064-09</MicrosoftNETSdkRazorPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="Build tool dependencies">
diff --git a/src/Components/build/dependencies.props b/src/Components/build/dependencies.props
index 9e3ba7f2cf..2043b6926f 100644
--- a/src/Components/build/dependencies.props
+++ b/src/Components/build/dependencies.props
@@ -12,7 +12,7 @@
     <MicrosoftAspNetCoreHtmlAbstractionsPackageVersion>3.0.0-alpha1-10605</MicrosoftAspNetCoreHtmlAbstractionsPackageVersion>
     <MicrosoftAspNetCoreRazorDesignPackageVersion>3.0.0-alpha1-10605</MicrosoftAspNetCoreRazorDesignPackageVersion>
     <MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-alpha1-10605</MicrosoftExtensionsDependencyInjectionPackageVersion>
-    <MicrosoftNETSdkRazorPackageVersion>3.0.0-preview-19057-06</MicrosoftNETSdkRazorPackageVersion>
+    <MicrosoftNETSdkRazorPackageVersion>3.0.0-preview-19064-09</MicrosoftNETSdkRazorPackageVersion>
     <MonoCecilPackageVersion>0.10.1</MonoCecilPackageVersion>
     <SignalRPackageVersion>3.0.0-alpha1-10605</SignalRPackageVersion>
     <TemplateBlazorPackageVersion>0.8.0-preview-19064-0339</TemplateBlazorPackageVersion>
diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/RazorCompilation.targets b/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/RazorCompilation.targets
index f3c62f1e56..2dbfe3ce78 100644
--- a/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/RazorCompilation.targets
+++ b/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/RazorCompilation.targets
@@ -12,6 +12,7 @@
     <GenerateRazorAssemblyInfo>false</GenerateRazorAssemblyInfo>
     <GenerateRazorHostingAssemblyInfo>false</GenerateRazorHostingAssemblyInfo>
     <GenerateProvideApplicationPartFactoryAttribute>false</GenerateProvideApplicationPartFactoryAttribute>
+    <_RazorComponentInclude>**\*.cshtml</_RazorComponentInclude>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,8 +25,4 @@
     </RazorExtension>
   </ItemGroup>
 
-  <ItemGroup>
-    <RazorComponent Include="@(Content->WithMetadataValue('Extension', '.cshtml'))" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/RazorComponentsWeb-CSharp.App.csproj.in b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/RazorComponentsWeb-CSharp.App.csproj.in
index fa2964e06a..8766fab7d0 100644
--- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/RazorComponentsWeb-CSharp.App.csproj.in
+++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/RazorComponentsWeb-CSharp.App.csproj.in
@@ -10,7 +10,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="${MicrosoftAspNetCoreComponentsPackageVersion}" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Build" Version="${MicrosoftAspNetCoreComponentsPackageVersion}" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="${MicrosoftNETSdkRazorPackageVersion}" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>