Skip to content

Commit 868fa42

Browse files
committed
- 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.
1 parent 7dbb5f9 commit 868fa42

4 files changed

+1286
-1261
lines changed

Source/WhiteTie/WhiteTie.NuGet.Required.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Dependencies:
1616
<WhiteTieNuGetRequiredImported>True</WhiteTieNuGetRequiredImported>
1717
</PropertyGroup>
1818

19-
<Target Name="NuGetPackageProjectOutputGroup" DependsOnTargets="Build;BuildPackage" Condition=" '$(_WhiteTieNuGetExe)' != '' "
19+
<Target Name="NuGetPackageProjectOutputGroup" DependsOnTargets="NuGetPreparePackageAttributes" Condition=" '$(_WhiteTieNuGetExe)' != '' "
2020
Returns="@(NuGetPackageProjectOutputGroupOutput)">
2121

2222
<ItemGroup Condition=" '$(PackageOutputDir)' != '' AND '$(NuGetTargetLibFrameworkFolderName)' != '' AND '$(_NuSpecId)' != '' AND '$(_NuSpecVersion)' != '' ">

Source/WhiteTie/WhiteTie.NuGet.VS.targets

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ This file was originally generated by Visual Studio 2013, modified and included
44
-->
55
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
66
<PropertyGroup>
7+
<WhiteTieNuGetVSTargetsImported>True</WhiteTieNuGetVSTargetsImported>
8+
79
<NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetDir)NuGet.exe</NuGetExePath>
810

911
<PackageOutputDir Condition=" '$(PackageOutputDir)' == '' ">$(TargetDir.Trim('\\'))</PackageOutputDir>

0 commit comments

Comments
 (0)