- Fixed a bug that caused flavor projects to be built multiple times.

- Fixed a bug that caused the NuGet command to produce a package from the project file rather than the generated .nuspec file, in some situations.
RxDave · May 26, 2016 · 868fa42 · 868fa42
1 parent 7dbb5f9
commit 868fa42
Show file tree

Hide file tree

Showing 4 changed files with 1,286 additions and 1,261 deletions.
diff --git a/Source/WhiteTie/WhiteTie.NuGet.Required.targets b/Source/WhiteTie/WhiteTie.NuGet.Required.targets
@@ -16,7 +16,7 @@ Dependencies:
     <WhiteTieNuGetRequiredImported>True</WhiteTieNuGetRequiredImported>
   </PropertyGroup>
 
-  <Target Name="NuGetPackageProjectOutputGroup" DependsOnTargets="Build;BuildPackage" Condition=" '$(_WhiteTieNuGetExe)' != '' "
+  <Target Name="NuGetPackageProjectOutputGroup" DependsOnTargets="NuGetPreparePackageAttributes" Condition=" '$(_WhiteTieNuGetExe)' != '' "
           Returns="@(NuGetPackageProjectOutputGroupOutput)">
 
     <ItemGroup Condition=" '$(PackageOutputDir)' != '' AND '$(NuGetTargetLibFrameworkFolderName)' != '' AND '$(_NuSpecId)' != '' AND '$(_NuSpecVersion)' != '' ">

diff --git a/Source/WhiteTie/WhiteTie.NuGet.VS.targets b/Source/WhiteTie/WhiteTie.NuGet.VS.targets
@@ -4,6 +4,8 @@ This file was originally generated by Visual Studio 2013, modified and included
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <WhiteTieNuGetVSTargetsImported>True</WhiteTieNuGetVSTargetsImported>
+
     <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetDir)NuGet.exe</NuGetExePath>
 
     <PackageOutputDir Condition=" '$(PackageOutputDir)' == '' ">$(TargetDir.Trim('\\'))</PackageOutputDir>