From 010b43cedfc488c5b2d585bc08bc49bd046ca612 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 13 Feb 2018 12:07:21 -0800
Subject: [PATCH] Make imports work without warnings or errors when the Sdk is
 referenced via MsBuild and package.

---
 src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.props        |  4 +---
 src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.targets      |  8 ++++----
 .../netstandard2.0/Microsoft.NET.Sdk.Razor.props |  3 +--
 .../Microsoft.NET.Sdk.Razor.props                | 16 ++++++++++++++++
 4 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 src/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Microsoft.NET.Sdk.Razor.props

diff --git a/src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.props b/src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.props
index a02a52aed3..c95725d653 100644
--- a/src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.props
+++ b/src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.props
@@ -10,7 +10,5 @@ Copyright (c) .NET Foundation. All rights reserved.
 ***********************************************************************************************
 -->
 <Project ToolsVersion="14.0">
-
-  <Import Project="$(MSBuildThisFileDirectory)..\build\netstandard2.0\Sdk.Razor.CurrentVersion.props" />
-
+  <Import Project="$(MSBuildThisFileDirectory)..\build\netstandard2.0\Sdk.Razor.CurrentVersion.props" Condition="'$(_RazorSdkPackageReferenced)' != 'true'" />
 </Project>
diff --git a/src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.targets b/src/Microsoft.NET.Sdk.Razor/Sdk/Sdk.targets
index 82e5ccf1e8..441bba39f8 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 Condition="'$(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>
+    <_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)" />
+  <Import Project="$(_RazorSdkTargetsPath)" Condition="'$(_RazorSdkPackageReferenced)' != 'true'"  />
 
 </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 439697f9bc..413376f510 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
@@ -13,7 +13,6 @@ Copyright (c) .NET Foundation. All rights reserved.
   <Import Project="Sdk.Razor.CurrentVersion.props" />
 
   <PropertyGroup>
-    <!-- Redirect the SDK to use the targets from the current package -->
-    <RazorSdkTargetsPath>$(MSBuildThisFileDirectory)Sdk.Razor.CurrentVersion.targets</RazorSdkTargetsPath>
+    <_RazorSdkPackageReferenced>true</_RazorSdkPackageReferenced>
   </PropertyGroup>
 </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
new file mode 100644
index 0000000000..5c775cd329
--- /dev/null
+++ b/src/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Microsoft.NET.Sdk.Razor.props
@@ -0,0 +1,16 @@
+<!--
+***********************************************************************************************
+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
+          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">
+  <PropertyGroup>
+    <_RazorSdkPackageReferenced>true</_RazorSdkPackageReferenced>
+  </PropertyGroup>
+</Project>