diff --git a/src/Microsoft.AspNetCore.Razor.Sdk/SDK/Sdk.props b/src/Microsoft.AspNetCore.Razor.Sdk/SDK/Sdk.props
index 112c785827..7a18500e21 100644
--- a/src/Microsoft.AspNetCore.Razor.Sdk/SDK/Sdk.props
+++ b/src/Microsoft.AspNetCore.Razor.Sdk/SDK/Sdk.props
@@ -9,7 +9,7 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
 Copyright (c) .NET Foundation. All rights reserved.
 ***********************************************************************************************
 -->
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
 
   <Import Project="$(MSBuildThisFileDirectory)..\build\netstandard2.0\Razor.Sdk.CurrentVersion.props" />
 
diff --git a/src/Microsoft.AspNetCore.Razor.Sdk/SDK/Sdk.targets b/src/Microsoft.AspNetCore.Razor.Sdk/SDK/Sdk.targets
index 923cfd2914..07ca7a2b58 100644
--- a/src/Microsoft.AspNetCore.Razor.Sdk/SDK/Sdk.targets
+++ b/src/Microsoft.AspNetCore.Razor.Sdk/SDK/Sdk.targets
@@ -9,12 +9,13 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
 Copyright (c) .NET Foundation. All rights reserved.
 ***********************************************************************************************
 -->
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
 
-  <Import Project="$(_RazorSdkCurrentVersionPath)"
-    Condition="'$(IsCrossTargetingBuild)' != 'true' AND '$(_RazorSdkCurrentVersionPath)' != '' AND Exists('$(_RazorSdkCurrentVersionPath)')" />
+  <PropertyGroup Condition="'$(RazorSdkTargetsPath)' == ''">
+    <RazorSdkTargetsPath Condition="'$(IsCrossTargetingBuild)' == 'true'">$(MSBuildThisFileDirectory)..\buildMultiTargeting\Razor.Sdk.CurrentVersion.MultiTargeting.targets</RazorSdkTargetsPath>
+    <RazorSdkTargetsPath Condition="'$(IsCrossTargetingBuild)' != 'true'">$(MSBuildThisFileDirectory)..\build\netstandard2.0\Razor.Sdk.CurrentVersion.targets</RazorSdkTargetsPath>
+  </PropertyGroup>
 
-  <Import Project="$(MSBuildThisFileDirectory)..\build\netstandard2.0\Razor.Sdk.CurrentVersion.targets"
-    Condition="'$(IsCrossTargetingBuild)' != 'true' AND '$(MicrosoftAspNetCoreRazorSdkTargetsImported)' != 'true'" />
+  <Import Project="$(RazorSdkTargetsPath)" />
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.Compilation.targets b/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.Compilation.targets
index c24954dce9..2e79266287 100644
--- a/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.Compilation.targets
+++ b/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.Compilation.targets
@@ -1,3 +1,15 @@
+<!--
+***********************************************************************************************
+Microsoft.AspNetCore.Razor.Design.Compilation.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+
 <Project>
   <!--
   What follows in this file is based on:
diff --git a/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Sdk.props b/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Sdk.props
index 2a187e7f14..5ea34a2e05 100644
--- a/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Sdk.props
+++ b/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Sdk.props
@@ -1,8 +1,19 @@
+<!--
+***********************************************************************************************
+Microsoft.AspNetCore.Razor.Sdk.props
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
 <Project>
-  <Import Project="Sdk.CurrentVersion.props" />
+  <Import Project="Razor.Sdk.CurrentVersion.props" />
 
   <PropertyGroup>
     <!-- Redirect the SDK to use the targets from the current package -->
-    <_RazorSdkCurrentVersionPath>$(MSBuildFileDirectory)Sdk.CurrentVersion.targets</_RazorSdkCurrentVersionPath>
+    <RazorSdkTargetsPath>$(MSBuildFileDirectory)Sdk.CurrentVersion.targets</RazorSdkTargetsPath>
   </PropertyGroup>
 </Project>
diff --git a/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Sdk.targets b/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Sdk.targets
index ef4bfffadc..c66b8329e0 100644
--- a/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Sdk.targets
+++ b/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Sdk.targets
@@ -1,3 +1,14 @@
+<!--
+***********************************************************************************************
+Microsoft.AspNetCore.Razor.Sdk.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
 <Project>
-  <Import Project="Sdk.CurrentVersion.targets" />
+  <Import Project="Razor.Sdk.CurrentVersion.targets" />
 </Project>
diff --git a/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Razor.Sdk.CurrentVersion.props b/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Razor.Sdk.CurrentVersion.props
index a9365239ed..5a48657084 100644
--- a/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Razor.Sdk.CurrentVersion.props
+++ b/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Razor.Sdk.CurrentVersion.props
@@ -1,3 +1,14 @@
+<!--
+***********************************************************************************************
+Razor.Sdk.CurrentVersion.props
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
 <Project>
   <!--
     Properties and tasks supporting Razor MSBuild integration
@@ -29,9 +40,4 @@
     <CopyRefAssembliesToPublishDirectory Condition="'$(CopyRefAssembliesToPublishDirectory)'==''">false</CopyRefAssembliesToPublishDirectory>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <!-- This property is used by the SDK package to redirect the location of Sdk.CurrentVersion.targets -->
-    <_RazorSdkCurrentVersionPath>$(MSBuildThisFileDirectory)Sdk.CurrentVersions.target</_RazorSdkCurrentVersionPath>
-  </PropertyGroup>
-
 </Project>
diff --git a/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Razor.Sdk.CurrentVersion.targets b/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Razor.Sdk.CurrentVersion.targets
index 1de0454fea..ce6fff4b20 100644
--- a/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Razor.Sdk.CurrentVersion.targets
+++ b/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Razor.Sdk.CurrentVersion.targets
@@ -1,4 +1,15 @@
-<Project>
+<!--
+***********************************************************************************************
+Razor.Sdk.CurrentVersion.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+<Project>
   <!-- 
     Targets supporting Razor MSBuild integration. Contain support for generating C# code using Razor
     and including the generated code in the project lifecycle, including compiling, publishing and producing
@@ -10,10 +21,6 @@
   -->
   <Import Project="$(CustomBeforeRazorSdkTargets)" Condition="'$(CustomBeforeRazorSdkTargets)' != '' and Exists('$(CustomBeforeRazorSdkTargets)')"/>
 
-  <PropertyGroup>
-    <MicrosoftAspNetCoreRazorSdkTargetsImported>true</MicrosoftAspNetCoreRazorSdkTargetsImported>
-  </PropertyGroup>
-
   <!--
     Razor defines two primary targets:
       'RazorGenerate' - which updates generated code
diff --git a/src/Microsoft.AspNetCore.Razor.Sdk/buildMultiTargeting/Microsoft.AspNetCore.Razor.Sdk.targets b/src/Microsoft.AspNetCore.Razor.Sdk/buildMultiTargeting/Microsoft.AspNetCore.Razor.Sdk.targets
new file mode 100644
index 0000000000..59e281f8dd
--- /dev/null
+++ b/src/Microsoft.AspNetCore.Razor.Sdk/buildMultiTargeting/Microsoft.AspNetCore.Razor.Sdk.targets
@@ -0,0 +1,14 @@
+<!--
+***********************************************************************************************
+Microsoft.AspNetCore.Razor.Sdk.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+<Project>
+  <Import Project="Razor.Sdk.CurrentVersion.MultiTargeting.targets" />
+</Project>
diff --git a/src/Microsoft.AspNetCore.Razor.Sdk/buildMultiTargeting/Razor.Sdk.CurrentVersion.MultiTargeting.targets b/src/Microsoft.AspNetCore.Razor.Sdk/buildMultiTargeting/Razor.Sdk.CurrentVersion.MultiTargeting.targets
new file mode 100644
index 0000000000..26c2e0d494
--- /dev/null
+++ b/src/Microsoft.AspNetCore.Razor.Sdk/buildMultiTargeting/Razor.Sdk.CurrentVersion.MultiTargeting.targets
@@ -0,0 +1,26 @@
+<!--
+***********************************************************************************************
+Razor.Sdk.CurrentVersion.MultiTargeting.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+<Project>
+
+  <PropertyGroup>
+    <RazorSdkTargetsImported>true</RazorSdkTargetsImported>
+  </PropertyGroup>
+
+  <Target Name="RazorCompile">
+    <Error Text="The 'RazorCompile' target is not supported without specifying a target framework. The current project targets multiple frameworks, please specify a framework to execute this target." />
+  </Target>
+
+  <Target Name="RazorGenerate">
+    <Error Text="The 'RazorGenerate' target is not supported without specifying a target framework. The current project targets multiple frameworks, please specify a framework to execute this target." />
+  </Target>
+
+</Project>