diff options
| author | Nat Ayewah <nayewah@microsoft.com> | 2017-02-16 04:31:08 +0300 |
|---|---|---|
| committer | Justin Emgarten <justin@emgarten.com> | 2017-02-16 08:15:46 +0300 |
| commit | 5a8c149e9b88a975e6311b024d0ecdf5994673ab (patch) | |
| tree | 09d852e98f961fd5df0088fbe71f6c729476ee03 | |
| parent | 776bb2b300e1333a6bc3297d441eabba2d640264 (diff) | |
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
| -rw-r--r-- | src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportAfter.targets | 2 | ||||
| -rw-r--r-- | src/Microsoft.NuGet.Build.Tasks/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 3ebfa8a..49fcee2 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 4dfa45d..5a202bd 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> |