diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
index 29d5e8ea4c..6a40423d94 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
@@ -34,9 +34,12 @@ Copyright (c) .NET Foundation. All rights reserved.
     to trigger a workspace update for the declaration files when they change.
   -->
   <ItemGroup>
-    <Content Update="@(RazorComponent)">
+    <Content Update="**\*.razor">
+      <Generator>MSBuild:RazorGenerateComponentDeclarationDesignTime</Generator>
+    </Content>
+
+    <Content Update="$(_RazorComponentInclude)">
       <Generator>MSBuild:RazorGenerateComponentDeclarationDesignTime</Generator>
-      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
     </Content>
   </ItemGroup>
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index 245a4e0143..5aa5c6ffb0 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -92,11 +92,16 @@ Copyright (c) .NET Foundation. All rights reserved.
       _RazorAddDebugSymbolsProjectOutputGroupOutput
     </DebugSymbolsProjectOutputGroupDependsOn>
 
-    <CoreCompileDependsOn>
+    <CoreCompileDependsOn Condition="'$(DesignTimeBuild)'!='true'">
       RazorComponentGenerate;
       $(CoreCompileDependsOn)
     </CoreCompileDependsOn>
 
+    <CoreCompileDependsOn Condition="'$(DesignTimeBuild)'=='true'">
+      RazorGenerateComponentDeclarationDesignTime;
+      $(CoreCompileDependsOn)
+    </CoreCompileDependsOn>
+
     <PrepareForBuildDependsOn>
       $(PrepareForBuildDependsOn);
       ResolveRazorGenerateInputs
@@ -408,8 +413,22 @@ Copyright (c) .NET Foundation. All rights reserved.
       <RazorComponent Include="@(Content)" Condition="'%(Content.Extension)'=='.razor'" />
       <RazorComponent Include="$(_RazorComponentInclude)" />
     </ItemGroup>
+
+    <ItemGroup>
+      <Content Condition="'%(Content.Extension)'=='.razor'" CopyToPublishDirectory="Never" />
+    </ItemGroup>
   </Target>
 
+  <!--
+    Temporarary workaround for https://github.com/aspnet/AspNetCore/issues/6859. This can be removed after a VS insertion with a newer copy of the DesignTime targets.
+  -->
+  <ItemGroup>
+    <Content Update="$(_RazorComponentInclude)">
+      <Generator>MSBuild:RazorGenerateComponentDeclarationDesignTime</Generator>
+      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+
   <Target Name="AssignRazorComponentTargetPaths" Condition="'@(RazorComponent)' != ''">
     <AssignTargetPath Files="@(RazorComponent)" RootFolder="$(MSBuildProjectDirectory)">
       <Output TaskParameter="AssignedFiles" ItemName="RazorComponentWithTargetPath" />