From 657dc0baca9bb697d8529f5d272b698d7ae98269 Mon Sep 17 00:00:00 2001
From: Faizan Ahmad <faahmad@microsoft.com>
Date: Thu, 6 Oct 2016 22:41:05 +0530
Subject: [PATCH] Create new Microsoft.TestPlatform.ImportAfter.targets

---
 .../Microsoft.NuGet.ImportAfter.targets       |  6 ------
 ...Microsoft.TestPlatform.ImportAfter.targets | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 resources/MSBuildImports/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.TestPlatform.ImportAfter.targets

diff --git a/resources/MSBuildImports/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets b/resources/MSBuildImports/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets
index 22d290e9a..f88dc4adf 100644
--- a/resources/MSBuildImports/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets
+++ b/resources/MSBuildImports/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets
@@ -20,10 +20,4 @@ Copyright (c) .NET Foundation. All rights reserved.
     <NuGetRestoreTargets Condition="'$(NuGetRestoreTargets)'==''">$(MSBuildExtensionsPath)\NuGet.targets</NuGetRestoreTargets>
   </PropertyGroup>
   <Import Condition="Exists('$(NuGetRestoreTargets)')" Project="$(NuGetRestoreTargets)" />
-
-  <!-- Import Microsoft.TestPlatform.targets for Test3 -->
-  <PropertyGroup>
-    <VSTestTargets Condition="'$(VSTestTargets)'==''">$(MSBuildExtensionsPath)\Microsoft.TestPlatform.targets</VSTestTargets>
-  </PropertyGroup>
-  <Import Condition="Exists('$(VSTestTargets)')" Project="$(VSTestTargets)" />
 </Project>
diff --git a/resources/MSBuildImports/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.TestPlatform.ImportAfter.targets b/resources/MSBuildImports/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.TestPlatform.ImportAfter.targets
new file mode 100644
index 000000000..97f203482
--- /dev/null
+++ b/resources/MSBuildImports/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.TestPlatform.ImportAfter.targets
@@ -0,0 +1,19 @@
+<!--
+***********************************************************************************************
+Microsoft.TestPlatform.ImportAfter.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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Import Microsoft.TestPlatform.targets for VSTest target -->
+  <PropertyGroup>
+    <VSTestTargets Condition="'$(VSTestTargets)'==''">$(MSBuildExtensionsPath)\Microsoft.TestPlatform.targets</VSTestTargets>
+  </PropertyGroup>
+  <Import Condition="Exists('$(VSTestTargets)')" Project="$(VSTestTargets)" />
+</Project>