diff options
Diffstat (limited to 'nuget/nuget.proj')
| -rw-r--r-- | nuget/nuget.proj | 48 |
1 files changed, 38 insertions, 10 deletions
diff --git a/nuget/nuget.proj b/nuget/nuget.proj index 9a2091e..4d79d1f 100644 --- a/nuget/nuget.proj +++ b/nuget/nuget.proj @@ -5,7 +5,7 @@ <Target Name="BuildIntermediates"> <ItemGroup> - <ProductTargets Include="BuildUnifiedProduct;ReSignDelaySignedAssemblies" Condition=" '$(SkipNugetDependenciesBuild)' != 'true' " /> + <ProductTargets Include="BuildUnifiedProduct;ResignShippingDelaySignedAssemblies" Condition=" '$(SkipNugetDependenciesBuild)' != 'true' " /> <ProductTargets Include="GetOutputPath" /> <AspNetTargets Include="Build;Sign" Condition=" '$(SkipNugetDependenciesBuild)' != 'true' " /> <AspNetTargets Include="GetOutputPath" /> @@ -28,11 +28,24 @@ <Output TaskParameter="TargetOutputs" ItemName="TargetOutputs40"/> </MSBuild> <MSBuild + Projects="$(ProjectRoot)src\DotNetOpenAuth\DotNetOpenAuth.proj" + Targets="@(ProductTargets)" + Properties="TargetFrameworkVersion=v4.5" + BuildInParallel="$(BuildInParallel)"> + <Output TaskParameter="TargetOutputs" ItemName="TargetOutputs45"/> + </MSBuild> + <MSBuild Projects="$(ProjectRoot)src\DotNetOpenAuth.AspNet\DotNetOpenAuth.AspNet.csproj" Targets="@(AspNetTargets)" Properties="TargetFrameworkVersion=v4.0" BuildInParallel="$(BuildInParallel)"> </MSBuild> + <MSBuild + Projects="$(ProjectRoot)src\DotNetOpenAuth.AspNet\DotNetOpenAuth.AspNet.csproj" + Targets="@(AspNetTargets)" + Properties="TargetFrameworkVersion=v4.5" + BuildInParallel="$(BuildInParallel)"> + </MSBuild> <ItemGroup> <ResignedAssembliesOutputs Include="@(TargetOutputs35)" Condition=" '%(MSBuildSourceTargetName)' == 'Sign' "> @@ -41,39 +54,54 @@ <ResignedAssembliesOutputs Include="@(TargetOutputs40)" Condition=" '%(MSBuildSourceTargetName)' == 'Sign' "> <TargetFramework>v4.0</TargetFramework> </ResignedAssembliesOutputs> + <ResignedAssembliesOutputs Include="@(TargetOutputs45)" Condition=" '%(MSBuildSourceTargetName)' == 'Sign' "> + <TargetFramework>v4.5</TargetFramework> + </ResignedAssembliesOutputs> </ItemGroup> <PropertyGroup> <OutputPath35 Condition=" '%(MSBuildSourceTargetName)' == 'GetOutputPath' ">@(TargetOutputs35)</OutputPath35> <OutputPath40 Condition=" '%(MSBuildSourceTargetName)' == 'GetOutputPath' ">@(TargetOutputs40)</OutputPath40> + <OutputPath45 Condition=" '%(MSBuildSourceTargetName)' == 'GetOutputPath' ">@(TargetOutputs45)</OutputPath45> </PropertyGroup> </Target> - <Target Name="Build" DependsOnTargets="BuildIntermediates"> + <Target Name="Build" DependsOnTargets="BuildIntermediates" Returns="@(NuGetPackages)"> <ItemGroup> <NuGetProperties Include="version=$(NuGetPackageVersion)" /> <NuGetProperties Include="oauth2version=$(OAuth2PackagesVersion)" /> <NuGetProperties Include="OutputPath35=$(OutputPath35)" /> <NuGetProperties Include="OutputPath40=$(OutputPath40)" /> + <NuGetProperties Include="OutputPath45=$(OutputPath45)" /> <NuGetProperties Include="IntermediatePath=$(IntermediatePath40)" /> - <NuGetPackages Include="*.nuspec" Exclude="DotNetOpenAuth.nuspec"> + <NuGetSpecifications Include="*.nuspec" Exclude="*oauth2*.nuspec;DotNetOpenAuth.nuspec"> <Symbols>true</Symbols> - </NuGetPackages> - <NuGetPackages Include="DotNetOpenAuth.nuspec" /> + <PackageVersion>$(NuGetPackageVersion)</PackageVersion> + </NuGetSpecifications> + <NuGetSpecifications Include="*oauth2*.nuspec" Exclude="DotNetOpenAuth.nuspec"> + <Symbols>true</Symbols> + <PackageVersion>$(OAuth2PackagesVersion)</PackageVersion> + </NuGetSpecifications> + <NuGetSpecifications Include="DotNetOpenAuth.nuspec"> + <PackageVersion>$(NuGetPackageVersion)</PackageVersion> + </NuGetSpecifications> + + <NuGetPackages Include="@(NuGetSpecifications->'$(DropsRoot)%(FileName).%(PackageVersion).nupkg')" /> </ItemGroup> <PropertyGroup> <_NuGetProperties>@(NuGetProperties)</_NuGetProperties> </PropertyGroup> <ItemGroup> - <NuGetPackages> + <NuGetSpecifications> <Properties>$(_NuGetProperties);Identity=%(FileName);GeneratedAssemblyInfoSourceFile=$(IntermediatePath40)%(FileName).Version.cs</Properties> - </NuGetPackages> + </NuGetSpecifications> </ItemGroup> + <NuGetPack - NuSpec="%(NuGetPackages.Identity)" + NuSpec="%(NuGetSpecifications.Identity)" OutputPackageDirectory="$(DropsRoot)" - Properties="%(NuGetPackages.Properties)" - Symbols="%(NuGetPackages.Symbols)" + Properties="%(NuGetSpecifications.Properties)" + Symbols="%(NuGetSpecifications.Symbols)" ToolPath="$(NuGetToolPath)" /> </Target> |