From 35779abd9aa9d49ac862296f030734dab58e7bc4 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 2 Feb 2018 12:14:20 -0800
Subject: [PATCH] Rename Microsoft.AspNetCore.Razor.Sdk to
 Microsoft.NET.Sdk.Razor

---
 Razor.sln                                                 | 2 +-
 ...crosoft.AspNetCore.Razor.Design.CodeGeneration.targets | 2 +-
 .../Microsoft.AspNetCore.Razor.Design.props               | 2 +-
 .../Microsoft.AspNetCore.Razor.Design.props               | 4 ++--
 .../Microsoft.NET.Sdk.Razor.csproj}                       | 0
 .../SDK/Sdk.props                                         | 4 ++--
 .../SDK/Sdk.targets                                       | 6 +++---
 .../Microsoft.Net.Sdk.Razor.Compilation.targets}          | 4 ++--
 .../build/netstandard2.0/Microsoft.Net.Sdk.Razor.props}   | 8 ++++----
 .../build/netstandard2.0/Microsoft.Net.Sdk.Razor.targets} | 6 +++---
 .../build/netstandard2.0/Sdk.Razor.CurrentVersion.props}  | 4 ++--
 .../netstandard2.0/Sdk.Razor.CurrentVersion.targets}      | 6 +++---
 .../buildMultiTargeting/Microsoft.NET.Sdk.Razor.targets}  | 6 +++---
 .../Sdk.Razor.CurrentVersion.MultiTargeting.targets}      | 4 ++--
 .../AppWithP2PReference/AppWithP2PReference.csproj        | 2 +-
 test/testapps/ClassLibrary/ClassLibrary.csproj            | 2 +-
 test/testapps/Directory.Build.targets                     | 2 +-
 test/testapps/SimpleMvc/SimpleMvc.csproj                  | 2 +-
 test/testapps/SimplePages/SimplePages.csproj              | 2 +-
 19 files changed, 34 insertions(+), 34 deletions(-)
 rename src/{Microsoft.AspNetCore.Razor.Sdk/Microsoft.AspNetCore.Razor.Sdk.csproj => Microsoft.Net.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj} (100%)
 rename src/{Microsoft.AspNetCore.Razor.Sdk => Microsoft.Net.Sdk.Razor}/SDK/Sdk.props (89%)
 rename src/{Microsoft.AspNetCore.Razor.Sdk => Microsoft.Net.Sdk.Razor}/SDK/Sdk.targets (74%)
 rename src/{Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.Compilation.targets => Microsoft.Net.Sdk.Razor/build/netstandard2.0/Microsoft.Net.Sdk.Razor.Compilation.targets} (99%)
 rename src/{Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Sdk.props => Microsoft.Net.Sdk.Razor/build/netstandard2.0/Microsoft.Net.Sdk.Razor.props} (74%)
 rename src/{Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Sdk.targets => Microsoft.Net.Sdk.Razor/build/netstandard2.0/Microsoft.Net.Sdk.Razor.targets} (81%)
 rename src/{Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Razor.Sdk.CurrentVersion.props => Microsoft.Net.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.props} (97%)
 rename src/{Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Razor.Sdk.CurrentVersion.targets => Microsoft.Net.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets} (99%)
 rename src/{Microsoft.AspNetCore.Razor.Sdk/buildMultiTargeting/Microsoft.AspNetCore.Razor.Sdk.targets => Microsoft.Net.Sdk.Razor/buildMultiTargeting/Microsoft.NET.Sdk.Razor.targets} (80%)
 rename src/{Microsoft.AspNetCore.Razor.Sdk/buildMultiTargeting/Razor.Sdk.CurrentVersion.MultiTargeting.targets => Microsoft.Net.Sdk.Razor/buildMultiTargeting/Sdk.Razor.CurrentVersion.MultiTargeting.targets} (92%)

diff --git a/Razor.sln b/Razor.sln
index f184c02441..d24fb58587 100644
--- a/Razor.sln
+++ b/Razor.sln
@@ -92,7 +92,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Razo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Tools", "src\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj", "{3E7F2D49-3B45-45A8-9893-F73EC1EEBAAB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Razor.Sdk", "src\Microsoft.AspNetCore.Razor.Sdk\Microsoft.AspNetCore.Razor.Sdk.csproj", "{7D9ECCEE-71D1-4A42-ABEE-876AFA1B4FC9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.NET.Sdk.Razor", "src\Microsoft.NET.Sdk.Razor\Microsoft.NET.Sdk.Razor.csproj", "{7D9ECCEE-71D1-4A42-ABEE-876AFA1B4FC9}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Razor.Tools.Test", "test\Microsoft.AspNetCore.Razor.Tools.Test\Microsoft.AspNetCore.Razor.Tools.Test.csproj", "{6EA56B2B-89EC-4C38-A384-97D203375B06}"
 EndProject
diff --git a/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.CodeGeneration.targets b/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.CodeGeneration.targets
index aeb778b6c1..8ae440eb70 100644
--- a/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.CodeGeneration.targets
+++ b/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.CodeGeneration.targets
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="14.0">
   <!--
     Targets used for Razor SDK code generation. Support for the RazorCoreGenerate target.
     This target is explicitly imported by Razor SDK.
diff --git a/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.props b/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.props
index 52e4eaaee4..6549731539 100644
--- a/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.props
+++ b/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.props
@@ -1,4 +1,4 @@
-<Project TreatAsLocalProperty="_RazorTaskFolder;_RazorTaskAssembly">
+<Project ToolsVersion="14.0" TreatAsLocalProperty="_RazorTaskFolder;_RazorTaskAssembly">
   <PropertyGroup>
     <!--
     Used by the Web SDK if the Razor SDK can be used for compilation. This needs to live in a nuget package (not in the SDK)
diff --git a/src/Microsoft.AspNetCore.Razor.Design/buildMultiTargeting/Microsoft.AspNetCore.Razor.Design.props b/src/Microsoft.AspNetCore.Razor.Design/buildMultiTargeting/Microsoft.AspNetCore.Razor.Design.props
index e4a047fc18..227f58dea9 100644
--- a/src/Microsoft.AspNetCore.Razor.Design/buildMultiTargeting/Microsoft.AspNetCore.Razor.Design.props
+++ b/src/Microsoft.AspNetCore.Razor.Design/buildMultiTargeting/Microsoft.AspNetCore.Razor.Design.props
@@ -1,3 +1,3 @@
-<Project>
+<Project ToolsVersion="14.0">
   <Import Project="..\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Microsoft.AspNetCore.Razor.Sdk/Microsoft.AspNetCore.Razor.Sdk.csproj b/src/Microsoft.Net.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.Razor.Sdk/Microsoft.AspNetCore.Razor.Sdk.csproj
rename to src/Microsoft.Net.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
diff --git a/src/Microsoft.AspNetCore.Razor.Sdk/SDK/Sdk.props b/src/Microsoft.Net.Sdk.Razor/SDK/Sdk.props
similarity index 89%
rename from src/Microsoft.AspNetCore.Razor.Sdk/SDK/Sdk.props
rename to src/Microsoft.Net.Sdk.Razor/SDK/Sdk.props
index 7a18500e21..a02a52aed3 100644
--- a/src/Microsoft.AspNetCore.Razor.Sdk/SDK/Sdk.props
+++ b/src/Microsoft.Net.Sdk.Razor/SDK/Sdk.props
@@ -9,8 +9,8 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
 Copyright (c) .NET Foundation. All rights reserved.
 ***********************************************************************************************
 -->
-<Project>
+<Project ToolsVersion="14.0">
 
-  <Import Project="$(MSBuildThisFileDirectory)..\build\netstandard2.0\Razor.Sdk.CurrentVersion.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\build\netstandard2.0\Sdk.Razor.CurrentVersion.props" />
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.Razor.Sdk/SDK/Sdk.targets b/src/Microsoft.Net.Sdk.Razor/SDK/Sdk.targets
similarity index 74%
rename from src/Microsoft.AspNetCore.Razor.Sdk/SDK/Sdk.targets
rename to src/Microsoft.Net.Sdk.Razor/SDK/Sdk.targets
index 07ca7a2b58..82e5ccf1e8 100644
--- a/src/Microsoft.AspNetCore.Razor.Sdk/SDK/Sdk.targets
+++ b/src/Microsoft.Net.Sdk.Razor/SDK/Sdk.targets
@@ -9,11 +9,11 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
 Copyright (c) .NET Foundation. All rights reserved.
 ***********************************************************************************************
 -->
-<Project>
+<Project ToolsVersion="14.0">
 
   <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>
+    <RazorSdkTargetsPath Condition="'$(IsCrossTargetingBuild)' == 'true'">$(MSBuildThisFileDirectory)..\buildMultiTargeting\Sdk.Razor.CurrentVersion.MultiTargeting.targets</RazorSdkTargetsPath>
+    <RazorSdkTargetsPath Condition="'$(IsCrossTargetingBuild)' != 'true'">$(MSBuildThisFileDirectory)..\build\netstandard2.0\Sdk.Razor.CurrentVersion.targets</RazorSdkTargetsPath>
   </PropertyGroup>
 
   <Import Project="$(RazorSdkTargetsPath)" />
diff --git a/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.Compilation.targets b/src/Microsoft.Net.Sdk.Razor/build/netstandard2.0/Microsoft.Net.Sdk.Razor.Compilation.targets
similarity index 99%
rename from src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.Compilation.targets
rename to src/Microsoft.Net.Sdk.Razor/build/netstandard2.0/Microsoft.Net.Sdk.Razor.Compilation.targets
index 2e79266287..a2a73bdc8a 100644
--- a/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.Compilation.targets
+++ b/src/Microsoft.Net.Sdk.Razor/build/netstandard2.0/Microsoft.Net.Sdk.Razor.Compilation.targets
@@ -1,6 +1,6 @@
 <!--
 ***********************************************************************************************
-Microsoft.AspNetCore.Razor.Design.Compilation.targets
+Microsoft.Net.Sdk.Razor.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
@@ -10,7 +10,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 ***********************************************************************************************
 -->
 
-<Project>
+<Project ToolsVersion="14.0">
   <!--
   What follows in this file is based on:
      https://github.com/dotnet/roslyn/blob/4d92b18aee99ba8b1b4770ce65133e9ca65a94fe/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets
diff --git a/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Sdk.props b/src/Microsoft.Net.Sdk.Razor/build/netstandard2.0/Microsoft.Net.Sdk.Razor.props
similarity index 74%
rename from src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Sdk.props
rename to src/Microsoft.Net.Sdk.Razor/build/netstandard2.0/Microsoft.Net.Sdk.Razor.props
index 5ea34a2e05..e5ebcb407e 100644
--- a/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Sdk.props
+++ b/src/Microsoft.Net.Sdk.Razor/build/netstandard2.0/Microsoft.Net.Sdk.Razor.props
@@ -1,6 +1,6 @@
 <!--
 ***********************************************************************************************
-Microsoft.AspNetCore.Razor.Sdk.props
+Microsoft.Net.Sdk.Razor.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
@@ -9,11 +9,11 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
 Copyright (c) .NET Foundation. All rights reserved.
 ***********************************************************************************************
 -->
-<Project>
-  <Import Project="Razor.Sdk.CurrentVersion.props" />
+<Project ToolsVersion="14.0">
+  <Import Project="Sdk.Razor.CurrentVersion.props" />
 
   <PropertyGroup>
     <!-- Redirect the SDK to use the targets from the current package -->
-    <RazorSdkTargetsPath>$(MSBuildFileDirectory)Sdk.CurrentVersion.targets</RazorSdkTargetsPath>
+    <RazorSdkTargetsPath>$(MSBuildFileDirectory)Sdk.Razor.CurrentVersion.targets</RazorSdkTargetsPath>
   </PropertyGroup>
 </Project>
diff --git a/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Sdk.targets b/src/Microsoft.Net.Sdk.Razor/build/netstandard2.0/Microsoft.Net.Sdk.Razor.targets
similarity index 81%
rename from src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Sdk.targets
rename to src/Microsoft.Net.Sdk.Razor/build/netstandard2.0/Microsoft.Net.Sdk.Razor.targets
index c66b8329e0..98b72fb3ff 100644
--- a/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Microsoft.AspNetCore.Razor.Sdk.targets
+++ b/src/Microsoft.Net.Sdk.Razor/build/netstandard2.0/Microsoft.Net.Sdk.Razor.targets
@@ -1,6 +1,6 @@
 <!--
 ***********************************************************************************************
-Microsoft.AspNetCore.Razor.Sdk.targets
+Microsoft.Net.Sdk.Razor.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
@@ -9,6 +9,6 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
 Copyright (c) .NET Foundation. All rights reserved.
 ***********************************************************************************************
 -->
-<Project>
-  <Import Project="Razor.Sdk.CurrentVersion.targets" />
+<Project ToolsVersion="14.0">
+  <Import Project="Sdk.Razor.CurrentVersion.targets" />
 </Project>
diff --git a/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Razor.Sdk.CurrentVersion.props b/src/Microsoft.Net.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
similarity index 97%
rename from src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Razor.Sdk.CurrentVersion.props
rename to src/Microsoft.Net.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
index 8ced51abdf..725b355e41 100644
--- a/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Razor.Sdk.CurrentVersion.props
+++ b/src/Microsoft.Net.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
@@ -1,6 +1,6 @@
 <!--
 ***********************************************************************************************
-Razor.Sdk.CurrentVersion.props
+Sdk.Razor.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
@@ -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>
+<Project ToolsVersion="14.0">
   <!--
     Properties and tasks supporting Razor MSBuild integration
   -->
diff --git a/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Razor.Sdk.CurrentVersion.targets b/src/Microsoft.Net.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
similarity index 99%
rename from src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Razor.Sdk.CurrentVersion.targets
rename to src/Microsoft.Net.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index 02cabafedb..1984a0156d 100644
--- a/src/Microsoft.AspNetCore.Razor.Sdk/build/netstandard2.0/Razor.Sdk.CurrentVersion.targets
+++ b/src/Microsoft.Net.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -1,6 +1,6 @@
 <!--
 ***********************************************************************************************
-Razor.Sdk.CurrentVersion.targets
+Sdk.Razor.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
@@ -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>
+<Project ToolsVersion="14.0">
   <!-- 
     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
@@ -147,7 +147,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     RazorCoreCompile should be defined there.
   -->
-  <Import Project="Microsoft.AspNetCore.Razor.Design.Compilation.targets" />
+  <Import Project="Microsoft.Net.Sdk.Razor.Compilation.targets" />
 
   <Target Name="PrepareForRazorGenerate" DependsOnTargets="$(PrepareForRazorGenerateDependsOn)">
   </Target>
diff --git a/src/Microsoft.AspNetCore.Razor.Sdk/buildMultiTargeting/Microsoft.AspNetCore.Razor.Sdk.targets b/src/Microsoft.Net.Sdk.Razor/buildMultiTargeting/Microsoft.NET.Sdk.Razor.targets
similarity index 80%
rename from src/Microsoft.AspNetCore.Razor.Sdk/buildMultiTargeting/Microsoft.AspNetCore.Razor.Sdk.targets
rename to src/Microsoft.Net.Sdk.Razor/buildMultiTargeting/Microsoft.NET.Sdk.Razor.targets
index 59e281f8dd..e1ef8742d3 100644
--- a/src/Microsoft.AspNetCore.Razor.Sdk/buildMultiTargeting/Microsoft.AspNetCore.Razor.Sdk.targets
+++ b/src/Microsoft.Net.Sdk.Razor/buildMultiTargeting/Microsoft.NET.Sdk.Razor.targets
@@ -1,6 +1,6 @@
 <!--
 ***********************************************************************************************
-Microsoft.AspNetCore.Razor.Sdk.targets
+Microsoft.NET.Sdk.Razor.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
@@ -9,6 +9,6 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
 Copyright (c) .NET Foundation. All rights reserved.
 ***********************************************************************************************
 -->
-<Project>
-  <Import Project="Razor.Sdk.CurrentVersion.MultiTargeting.targets" />
+<Project ToolsVersion="14.0">
+  <Import Project="Sdk.Razor.CurrentVersion.MultiTargeting.targets" />
 </Project>
diff --git a/src/Microsoft.AspNetCore.Razor.Sdk/buildMultiTargeting/Razor.Sdk.CurrentVersion.MultiTargeting.targets b/src/Microsoft.Net.Sdk.Razor/buildMultiTargeting/Sdk.Razor.CurrentVersion.MultiTargeting.targets
similarity index 92%
rename from src/Microsoft.AspNetCore.Razor.Sdk/buildMultiTargeting/Razor.Sdk.CurrentVersion.MultiTargeting.targets
rename to src/Microsoft.Net.Sdk.Razor/buildMultiTargeting/Sdk.Razor.CurrentVersion.MultiTargeting.targets
index dea90cc702..a4e070ef57 100644
--- a/src/Microsoft.AspNetCore.Razor.Sdk/buildMultiTargeting/Razor.Sdk.CurrentVersion.MultiTargeting.targets
+++ b/src/Microsoft.Net.Sdk.Razor/buildMultiTargeting/Sdk.Razor.CurrentVersion.MultiTargeting.targets
@@ -1,6 +1,6 @@
 <!--
 ***********************************************************************************************
-Razor.Sdk.CurrentVersion.MultiTargeting.targets
+Sdk.Razor.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
@@ -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>
+<Project ToolsVersion="14.0">
 
   <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." />
diff --git a/test/testapps/AppWithP2PReference/AppWithP2PReference.csproj b/test/testapps/AppWithP2PReference/AppWithP2PReference.csproj
index 8b35af4413..ac5bb85014 100644
--- a/test/testapps/AppWithP2PReference/AppWithP2PReference.csproj
+++ b/test/testapps/AppWithP2PReference/AppWithP2PReference.csproj
@@ -3,7 +3,7 @@
     <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\netstandard2.0\</_RazorMSBuildRoot>
   </PropertyGroup>
 
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Sdk\SDK\Sdk.props" />
+  <Import Project="$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\SDK\Sdk.props" />
   <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props" />
 
   <PropertyGroup>
diff --git a/test/testapps/ClassLibrary/ClassLibrary.csproj b/test/testapps/ClassLibrary/ClassLibrary.csproj
index cc24521d0c..86cb453382 100644
--- a/test/testapps/ClassLibrary/ClassLibrary.csproj
+++ b/test/testapps/ClassLibrary/ClassLibrary.csproj
@@ -3,7 +3,7 @@
     <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\netstandard2.0\</_RazorMSBuildRoot>
   </PropertyGroup>
 
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Sdk\SDK\Sdk.props" />
+  <Import Project="$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\SDK\Sdk.props" />
   <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props" />
 
   <PropertyGroup>
diff --git a/test/testapps/Directory.Build.targets b/test/testapps/Directory.Build.targets
index 73a13b4997..4f2e91835c 100644
--- a/test/testapps/Directory.Build.targets
+++ b/test/testapps/Directory.Build.targets
@@ -1,3 +1,3 @@
 <Project>
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Sdk\SDK\Sdk.targets" />
+  <Import Project="$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\SDK\Sdk.targets" />
 </Project>
diff --git a/test/testapps/SimpleMvc/SimpleMvc.csproj b/test/testapps/SimpleMvc/SimpleMvc.csproj
index 0a1e15bfad..4525726119 100644
--- a/test/testapps/SimpleMvc/SimpleMvc.csproj
+++ b/test/testapps/SimpleMvc/SimpleMvc.csproj
@@ -3,7 +3,7 @@
     <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\netstandard2.0\</_RazorMSBuildRoot>
   </PropertyGroup>
 
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Sdk\SDK\Sdk.props" />
+  <Import Project="$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\SDK\Sdk.props" />
   <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props" />
 
   <PropertyGroup>
diff --git a/test/testapps/SimplePages/SimplePages.csproj b/test/testapps/SimplePages/SimplePages.csproj
index 0a1e15bfad..4525726119 100644
--- a/test/testapps/SimplePages/SimplePages.csproj
+++ b/test/testapps/SimplePages/SimplePages.csproj
@@ -3,7 +3,7 @@
     <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\netstandard2.0\</_RazorMSBuildRoot>
   </PropertyGroup>
 
-  <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Sdk\SDK\Sdk.props" />
+  <Import Project="$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\SDK\Sdk.props" />
   <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props" />
 
   <PropertyGroup>