From 54b95c9138a20e84337126d10d8008109c9d3b55 Mon Sep 17 00:00:00 2001
From: Nat Ayewah <nayewah@microsoft.com>
Date: Wed, 15 Feb 2017 17:31:08 -0800
Subject: [PATCH] Add skip imports conditions to Microsoft.NuGet ImportBefore
 and ImportAfter props/targets https://github.com/dotnet/sdk/pull/870
 https://github.com/dotnet/roslyn-project-system/issues/1474
 https://github.com/dotnet/roslyn-project-system/issues/1508

---
 .../ImportBeforeAfter/Microsoft.NuGet.ImportAfter.targets       | 2 +-
 .../ImportBeforeAfter/Microsoft.NuGet.ImportBefore.props        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportAfter.targets b/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportAfter.targets
index 3ebfa8a3d..49fcee223 100644
--- a/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportAfter.targets
+++ b/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportAfter.targets
@@ -13,7 +13,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   <PropertyGroup>
     <NuGetTargets Condition="'$(NuGetTargets)'==''">$(MSBuildExtensionsPath)\Microsoft\NuGet\$(VisualStudioVersion)\Microsoft.NuGet.targets</NuGetTargets>
   </PropertyGroup>
-  <Import Condition="Exists('$(NuGetTargets)')" Project="$(NuGetTargets)" />
+  <Import Condition="Exists('$(NuGetTargets)') and '$(SkipImportNuGetBuildTargets)' != 'true'" Project="$(NuGetTargets)" />
 
   <!-- Import NuGet.targets for Restore -->
   <PropertyGroup>
diff --git a/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportBefore.props b/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportBefore.props
index 4dfa45d94..5a202bd8b 100644
--- a/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportBefore.props
+++ b/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportBefore.props
@@ -13,5 +13,5 @@ Copyright (c) .NET Foundation. All rights reserved.
   <PropertyGroup>
     <NuGetProps Condition="'$(NuGetProps)'==''">$(MSBuildExtensionsPath)\Microsoft\NuGet\$(VisualStudioVersion)\Microsoft.NuGet.props</NuGetProps>
   </PropertyGroup>
-  <Import Condition="Exists('$(NuGetProps)')" Project="$(NuGetProps)" />
+  <Import Condition="Exists('$(NuGetProps)') and '$(SkipImportNuGetProps)' != 'true'" Project="$(NuGetProps)" />
 </Project>