Rename Microsoft.AspNetCore.Razor.Sdk to Microsoft.NET.Sdk.Razor

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

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.

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)

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>

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>

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)..\buildMultiTargeting\Sdk.Razor.CurrentVersion.MultiTargeting.targets</RazorSdkTargetsPath>
-    <RazorSdkTargetsPath Condition="'$(IsCrossTargetingBuild)' != 'true'">$(MSBuildThisFileDirectory)..\build\netstandard2.0\Razor.Sdk.CurrentVersion.targets</RazorSdkTargetsPath>
+    <RazorSdkTargetsPath Condition="'$(IsCrossTargetingBuild)' != 'true'">$(MSBuildThisFileDirectory)..\build\netstandard2.0\Sdk.Razor.CurrentVersion.targets</RazorSdkTargetsPath>
   </PropertyGroup>
 
   <Import Project="$(RazorSdkTargetsPath)" />

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

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>
+<Project ToolsVersion="14.0">
-  <Import Project="Razor.Sdk.CurrentVersion.props" />
+  <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>

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>
+<Project ToolsVersion="14.0">
-  <Import Project="Razor.Sdk.CurrentVersion.targets" />
+  <Import Project="Sdk.Razor.CurrentVersion.targets" />
 </Project>

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
   -->

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>

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>
+<Project ToolsVersion="14.0">
-  <Import Project="Razor.Sdk.CurrentVersion.MultiTargeting.targets" />
+  <Import Project="Sdk.Razor.CurrentVersion.MultiTargeting.targets" />
 </Project>

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." />

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>

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>

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>

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>

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>