mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #4421 from eerhardt/NuGetImportsBefore

Browse source 
Removing the old Microsoft.NuGet.targets in ImportsBefore/After.
This commit is contained in:
Eric Erhardt 2016-10-17 10:36:58 -05:00 • committed by GitHub
commit 081408b6c1
2 changed files with 0 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

17
resources/MSBuildImports/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props
View file

@ -1,17 +0,0 @@
<!--
***********************************************************************************************
Microsoft.NuGet.ImportBefore.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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NuGetProps Condition="'$(NuGetProps)'==''">$(MSBuildExtensionsPath)\Microsoft.NuGet.props</NuGetProps>
</PropertyGroup>
<Import Condition="Exists('$(NuGetProps)')" Project="$(NuGetProps)" />
</Project>

5
resources/MSBuildImports/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets
View file

@ -10,11 +10,6 @@ Copyright (c) .NET Foundation. All rights reserved.
*********************************************************************************************** ***********************************************************************************************
--> -->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NuGetTargets Condition="'$(NuGetTargets)'==''">$(MSBuildExtensionsPath)\Microsoft.NuGet.targets</NuGetTargets>
</PropertyGroup>
<Import Condition="Exists('$(NuGetTargets)')" Project="$(NuGetTargets)" />
<!-- Import NuGet.targets for Restore --> <!-- Import NuGet.targets for Restore -->
<PropertyGroup> <PropertyGroup>
<NuGetRestoreTargets Condition="'$(NuGetRestoreTargets)'==''">$(MSBuildExtensionsPath)\NuGet.targets</NuGetRestoreTargets> <NuGetRestoreTargets Condition="'$(NuGetRestoreTargets)'==''">$(MSBuildExtensionsPath)\NuGet.targets</NuGetRestoreTargets>