diff options
Diffstat (limited to 'nuget/nuget.proj')
| -rw-r--r-- | nuget/nuget.proj | 70 |
1 files changed, 16 insertions, 54 deletions
diff --git a/nuget/nuget.proj b/nuget/nuget.proj index ceca8f0..78157dc 100644 --- a/nuget/nuget.proj +++ b/nuget/nuget.proj @@ -5,7 +5,8 @@ <Target Name="BuildIntermediates"> <ItemGroup> - <ProductTargets Include="BuildUnifiedProduct;ReSignDelaySignedAssemblies" /> + <ProductTargets Include="BuildUnifiedProduct;ReSignDelaySignedAssemblies" Condition=" '$(SkipNugetDependenciesBuild)' != 'true' " /> + <ProductTargets Include="GetOutputPath" /> </ItemGroup> <!-- We build the entire unified, signed product targeting both CLRs, since NuGet supports packages that contain both, @@ -15,80 +16,41 @@ Targets="@(ProductTargets)" Properties="TargetFrameworkVersion=v3.5" BuildInParallel="$(BuildInParallel)"> - <Output TaskParameter="TargetOutputs" ItemName="ResignedAssembliesOutputs35"/> + <Output TaskParameter="TargetOutputs" ItemName="TargetOutputs35"/> </MSBuild> <MSBuild Projects="$(ProjectRoot)src\DotNetOpenAuth\DotNetOpenAuth.proj" Targets="@(ProductTargets)" Properties="TargetFrameworkVersion=v4.0" BuildInParallel="$(BuildInParallel)"> - <Output TaskParameter="TargetOutputs" ItemName="ResignedAssembliesOutputs40"/> + <Output TaskParameter="TargetOutputs" ItemName="TargetOutputs40"/> </MSBuild> <ItemGroup> - <ResignedAssembliesOutputs Include="@(ResignedAssembliesOutputs35)" Condition=" '%(MSBuildSourceTargetName)' == 'Sign' "> + <ResignedAssembliesOutputs Include="@(TargetOutputs35)" Condition=" '%(MSBuildSourceTargetName)' == 'Sign' "> <TargetFramework>v3.5</TargetFramework> </ResignedAssembliesOutputs> - <ResignedAssembliesOutputs Include="@(ResignedAssembliesOutputs40)" Condition=" '%(MSBuildSourceTargetName)' == 'Sign' "> + <ResignedAssembliesOutputs Include="@(TargetOutputs40)" Condition=" '%(MSBuildSourceTargetName)' == 'Sign' "> <TargetFramework>v4.0</TargetFramework> </ResignedAssembliesOutputs> </ItemGroup> - </Target> - - <Target Name="Layout" DependsOnTargets="BuildIntermediates"> <PropertyGroup> - <NuGetLayoutPath>$(DropsRoot)NuGet\$(BuildVersion)\</NuGetLayoutPath> + <OutputPath35 Condition=" '%(MSBuildSourceTargetName)' == 'GetOutputPath' ">@(TargetOutputs35)</OutputPath35> + <OutputPath40 Condition=" '%(MSBuildSourceTargetName)' == 'GetOutputPath' ">@(TargetOutputs40)</OutputPath40> </PropertyGroup> + </Target> - <MSBuild Projects="$(ProjectRoot)src\DotNetOpenAuth\DotNetOpenAuth.proj" Targets="DocumentationProjectOutputGroup" BuildInParallel="$(BuildInParallel)"> - <Output TaskParameter="TargetOutputs" ItemName="NuGetSource"/> - </MSBuild> - - <!-- IMPORTANT: These must appear as separate ItemGroups or else batching screws it up. --> - <ItemGroup> - <NuGetSource Include="%(ResignedAssembliesOutputs.Identity)" Condition=" '%(FileName)%(Extension)' == 'DotNetOpenAuth.dll' "> - <TargetPath Condition=" '%(TargetFramework)' == 'v4.0' ">$(NuGetLayoutPath)lib\net40-full\%(FileName)%(Extension)</TargetPath> - <TargetPath Condition=" '%(TargetFramework)' == 'v3.5' ">$(NuGetLayoutPath)lib\net35-full\%(FileName)%(Extension)</TargetPath> - </NuGetSource> - </ItemGroup> - <ItemGroup> - <NuGetContentSource Include="$(ProjectRoot)NuGet\content\**"/> - </ItemGroup> - <ItemGroup> - <NuGetSource Include="@(NuGetContentSource)"> - <TargetPath>$(NuGetLayoutPath)content\%(RecursiveDir)%(FileName)%(Extension)</TargetPath> - </NuGetSource> - - <NuSpecSource Include="DotNetOpenAuth.Ultimate.nuspec"> - <LayoutPath>$(NuGetLayoutPath)</LayoutPath> - <BeforeTokens>$version$</BeforeTokens> - <AfterTokens>$(BuildVersion)</AfterTokens> - </NuSpecSource> - - <NuSpecTarget Include="@(NuSpecSource->'$(NuGetLayoutPath)%(FileName)%(Extension)')" /> - </ItemGroup> + <Target Name="Build" DependsOnTargets="BuildIntermediates"> <ItemGroup> - <NuGetContentsTarget Include="%(NuGetSource.TargetPath)" /> + <NuGetPackages Include="*.nuspec" /> + <NuGetProperties Include="version=$(BuildVersion)" /> + <NuGetProperties Include="OutputPath35=$(OutputPath35)" /> + <NuGetProperties Include="OutputPath40=$(OutputPath40)" /> </ItemGroup> - - <CopyWithTokenSubstitution - SourceFiles="@(NuSpecSource)" - DestinationFiles="@(NuSpecTarget)" - /> - - <Copy - SourceFiles="@(NuGetSource)" - DestinationFiles="@(NuGetContentsTarget)" - SkipUnchangedFiles="true" /> - - <Purge Directories="$(NuGetLayoutPath)" IntendedFiles="@(NuGetContentsTarget);@(NuSpecTarget)" /> - </Target> - - <Target Name="Build" DependsOnTargets="Layout"> <NuGetPack - NuSpec="%(NuSpecTarget.Identity)" - BaseDirectory="%(NuSpecTarget.LayoutPath)" + NuSpec="%(NuGetPackages.Identity)" OutputPackageDirectory="$(DropsRoot)" + Properties="@(NuGetProperties)" ToolPath="$(NuGetToolPath)" /> </Target> |