diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2012-04-15 10:30:24 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2012-04-15 10:30:24 -0700 |
| commit | 8243e92ef551c7b3ea01939f5c3717ddcc7896cd (patch) | |
| tree | 28d6dc62c8c34d84c2cf1b24a9fda8371ab18e38 /tools/DotNetOpenAuth.targets | |
| parent | 4a306da9e44c7286c30c77d556e1f0f37d5e5ceb (diff) | |
| download | DotNetOpenAuth-8243e92ef551c7b3ea01939f5c3717ddcc7896cd.zip DotNetOpenAuth-8243e92ef551c7b3ea01939f5c3717ddcc7896cd.tar.gz DotNetOpenAuth-8243e92ef551c7b3ea01939f5c3717ddcc7896cd.tar.bz2 | |
Fixed nightly build to include the deployable archives for docs and samples.
Also fixed up some build breaks that can occur when building certain project targets with explicit TFV properties, which seemed related to the problem.
Diffstat (limited to 'tools/DotNetOpenAuth.targets')
| -rw-r--r-- | tools/DotNetOpenAuth.targets | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/DotNetOpenAuth.targets b/tools/DotNetOpenAuth.targets index bcf580f..ffbd9fd 100644 --- a/tools/DotNetOpenAuth.targets +++ b/tools/DotNetOpenAuth.targets @@ -110,7 +110,15 @@ </Target> <Target Name="ResignDelaySignedAssemblies" Outputs="@(ResignedAssembliesOutputs)"> - <MSBuild Projects="@(DelaySignedProjects)" Targets="Sign" BuildInParallel="$(BuildInParallel)"> + <MSBuild Projects="@(DelaySignedProjects)" Targets="Sign" BuildInParallel="$(BuildInParallel)" + Condition=" '%(DelaySignedProjects.TargetFrameworkVersion)' == '' or '%(DelaySignedProjects.TargetFrameworkVersion)' == '$(TargetFrameworkVersion)' "> + <Output TaskParameter="TargetOutputs" ItemName="ResignedAssembliesOutputs"/> + </MSBuild> + </Target> + + <Target Name="ResignShippingDelaySignedAssemblies" Outputs="@(ResignedAssembliesOutputs)"> + <MSBuild Projects="@(DelaySignedProjects)" Targets="Sign" BuildInParallel="$(BuildInParallel)" + Condition=" '%(DelaySignedProjects.Nonshipping)' != 'true' and ('%(DelaySignedProjects.TargetFrameworkVersion)' == '' or '%(DelaySignedProjects.TargetFrameworkVersion)' == '$(TargetFrameworkVersion)') "> <Output TaskParameter="TargetOutputs" ItemName="ResignedAssembliesOutputs"/> </MSBuild> </Target> |