From 501c180b5f7c865eef382710b2d7adaa90a443c7 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 15 Feb 2018 08:26:26 -0800
Subject: [PATCH] Use properties in package props to redirect imports

---
 src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.props          |  6 +++++-
 src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.targets        |  8 ++++----
 .../netstandard2.0/Microsoft.NET.Sdk.Razor.props   |  5 ++---
 .../netstandard2.0/Microsoft.NET.Sdk.Razor.targets | 14 --------------
 .../Microsoft.NET.Sdk.Razor.props                  |  3 ++-
 .../Microsoft.NET.Sdk.Razor.targets                | 14 --------------
 6 files changed, 13 insertions(+), 37 deletions(-)
 delete mode 100644 src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.targets
 delete mode 100644 src/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Microsoft.NET.Sdk.Razor.targets

diff --git a/src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.props b/src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.props
index c95725d653..b5fb8f7017 100644
--- a/src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.props
+++ b/src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.props
@@ -10,5 +10,9 @@ Copyright (c) .NET Foundation. All rights reserved.
 ***********************************************************************************************
 -->
 <Project ToolsVersion="14.0">
-  <Import Project="$(MSBuildThisFileDirectory)..\build\netstandard2.0\Sdk.Razor.CurrentVersion.props" Condition="'$(_RazorSdkPackageReferenced)' != 'true'" />
+  <PropertyGroup>
+    <RazorSdkCurrentVersionProps Condition="'$(RazorSdkCurrentVersionProps)' == ''">$(MSBuildThisFileDirectory)..\build\netstandard2.0\Sdk.Razor.CurrentVersion.props</RazorSdkCurrentVersionProps>
+  </PropertyGroup>
+
+  <Import Project="$(RazorSdkCurrentVersionProps)" />
 </Project>
diff --git a/src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.targets b/src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.targets
index 441bba39f8..c096a5cbf4 100644
--- a/src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.targets
+++ b/src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.targets
@@ -11,11 +11,11 @@ Copyright (c) .NET Foundation. All rights reserved.
 -->
 <Project ToolsVersion="14.0">
 
-  <PropertyGroup>
-    <_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 Condition="'$(RazorSdkCurrentVersionTargets)' == ''">
+    <RazorSdkCurrentVersionTargets Condition="'$(IsCrossTargetingBuild)' == 'true'">$(MSBuildThisFileDirectory)..\buildMultiTargeting\Sdk.Razor.CurrentVersion.MultiTargeting.targets</RazorSdkCurrentVersionTargets>
+    <RazorSdkCurrentVersionTargets Condition="'$(IsCrossTargetingBuild)' != 'true'">$(MSBuildThisFileDirectory)..\build\netstandard2.0\Sdk.Razor.CurrentVersion.targets</RazorSdkCurrentVersionTargets>
   </PropertyGroup>
 
-  <Import Project="$(_RazorSdkTargetsPath)" Condition="'$(_RazorSdkPackageReferenced)' != 'true'"  />
+  <Import Project="$(RazorSdkCurrentVersionTargets)" />
 
 </Project>
diff --git a/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.props b/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.props
index 413376f510..6fad4d5180 100644
--- a/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.props
+++ b/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.props
@@ -10,9 +10,8 @@ Copyright (c) .NET Foundation. All rights reserved.
 ***********************************************************************************************
 -->
 <Project ToolsVersion="14.0">
-  <Import Project="Sdk.Razor.CurrentVersion.props" />
-
   <PropertyGroup>
-    <_RazorSdkPackageReferenced>true</_RazorSdkPackageReferenced>
+    <RazorSdkCurrentVersionProps>$(MSBuildThisFileDirectory)Sdk.Razor.CurrentVersion.props</RazorSdkCurrentVersionProps>
+    <RazorSdkCurrentVersionTargets>$(MSBuildThisFileDirectory)Sdk.Razor.CurrentVersion.targets</RazorSdkCurrentVersionTargets>
   </PropertyGroup>
 </Project>
diff --git a/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.targets b/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.targets
deleted file mode 100644
index 7a5540f394..0000000000
--- a/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.targets
+++ /dev/null
@@ -1,14 +0,0 @@
-<!--
-***********************************************************************************************
-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
-          impossible to load or build your projects from the command-line or the IDE.
-
-Copyright (c) .NET Foundation. All rights reserved.
-***********************************************************************************************
--->
-<Project ToolsVersion="14.0">
-  <Import Project="Sdk.Razor.CurrentVersion.targets" />
-</Project>
diff --git a/src/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Microsoft.NET.Sdk.Razor.props b/src/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Microsoft.NET.Sdk.Razor.props
index 5c775cd329..a04423a57a 100644
--- a/src/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Microsoft.NET.Sdk.Razor.props
+++ b/src/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Microsoft.NET.Sdk.Razor.props
@@ -11,6 +11,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 -->
 <Project ToolsVersion="14.0">
   <PropertyGroup>
-    <_RazorSdkPackageReferenced>true</_RazorSdkPackageReferenced>
+    <RazorSdkCurrentVersionProps>$(MSBuildThisFileDirectory)..\build\netstandard2.0\Sdk.Razor.CurrentVersion.props</RazorSdkCurrentVersionProps>
+    <RazorSdkCurrentVersionTargets>$(MSBuildThisFileDirectory)Sdk.Razor.CurrentVersion.MultiTargeting.targets</RazorSdkCurrentVersTargetsFile>
   </PropertyGroup>
 </Project>
diff --git a/src/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Microsoft.NET.Sdk.Razor.targets b/src/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Microsoft.NET.Sdk.Razor.targets
deleted file mode 100644
index e1ef8742d3..0000000000
--- a/src/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Microsoft.NET.Sdk.Razor.targets
+++ /dev/null
@@ -1,14 +0,0 @@
-<!--
-***********************************************************************************************
-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
-          impossible to load or build your projects from the command-line or the IDE.
-
-Copyright (c) .NET Foundation. All rights reserved.
-***********************************************************************************************
--->
-<Project ToolsVersion="14.0">
-  <Import Project="Sdk.Razor.CurrentVersion.MultiTargeting.targets" />
-</Project>