diff options
Diffstat (limited to 'samples/tools.proj')
| -rw-r--r-- | samples/tools.proj | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/samples/tools.proj b/samples/tools.proj index e7d89d9..0c413b7 100644 --- a/samples/tools.proj +++ b/samples/tools.proj @@ -15,13 +15,20 @@ </ToolProjects> </ItemGroup> - <MSBuild Projects="@(ToolProjects)" Targets="%(ToolProjects.Targets)" BuildInParallel="$(BuildInParallel)"> - <Output TaskParameter="TargetOutputs" ItemName="OfflineProvider"/> + <MSBuild Projects="@(ToolProjects)" Targets="%(ToolProjects.Targets);BuiltProjectOutputGroupDependencies" BuildInParallel="$(BuildInParallel)"> + <Output TaskParameter="TargetOutputs" ItemName="ToolProjectsOutputs"/> </MSBuild> <ItemGroup> - <!-- Remove the un-unified assembly. --> - <OfflineProvider Remove="$(OutputPath)$(SignedSubPath)$(ProductName).dll" /> + <!-- Exclude the un-unified assemblies. --> + <OfflineProvider Include="@(ToolProjectsOutputs)" + Condition=" '%(ToolProjectsOutputs.CopyLocal)' != 'false' " + Exclude=" + $(OutputPath)$(ProductName).dll; + $(OutputPath)$(SignedSubPath)$(ProductName).dll; + $(ProjectRoot)lib\Microsoft.Contracts.dll; + " /> + <!-- add the PDBs --> <OfflineProvider Include="@(OfflineProvider->'%(SymbolPath)')" /> <OfflineProviderTargets Include=" @@ -40,7 +47,7 @@ <Target Name="Build" DependsOnTargets="Layout" Returns="@(RedistributableFiles)"> <PropertyGroup> - <ToolsZip>$(ToolsDirectoryNoSlash).zip</ToolsZip> + <ToolsZip>$(ToolsDirectoryNoSlash)$(ZipFormat)</ToolsZip> </PropertyGroup> <ItemGroup> <RedistributableFiles Include="$(ToolsZip)"> @@ -49,10 +56,12 @@ </RedistributableFiles> </ItemGroup> - <Zip ZipFileName="$(ToolsZip)" - Files="@(AllToolTargets)" - WorkingDirectory="$(ToolsDirectory)" - ZipLevel="$(ZipLevel)" /> + <Delete Files="$(ToolsZip)" /> + <AddFilesTo7Zip + ZipFileName="$(ToolsZip)" + Files="@(AllToolTargets)" + WorkingDirectory="$(ToolsDirectory)" + ToolPath="$(Zip7ToolPath)" /> </Target> <Import Project="$(ProjectRoot)tools\DotNetOpenAuth.automated.targets"/> |