fix nupkg generation

This commit is contained in:
Bryan Thornbury 2016-07-15 15:55:34 -07:00
parent 3f52e83daf
commit 2455528b2e

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Layout" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" DefaultTargets="Layout" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="SetupGenerateNugetPackagesInputsOutputs" <Target Name="SetupProjectsToPack"
DependsOnTargets="Init"> DependsOnTargets="Init">
<PropertyGroup> <PropertyGroup>
<NupkgVersionSuffix>$(CommitCount)</NupkgVersionSuffix> <NupkgVersionSuffix>$(CommitCount)</NupkgVersionSuffix>
@ -47,10 +47,14 @@
<ProjectName>Microsoft.Extensions.Testing.Abstractions</ProjectName> <ProjectName>Microsoft.Extensions.Testing.Abstractions</ProjectName>
<Version>$(SdkNugetVersion)</Version> <Version>$(SdkNugetVersion)</Version>
</ProjectsToPack> </ProjectsToPack>
</ItemGroup>
</Target>
<ProjectPackTargetInputs Include="$(PackagingBuildBasePath)/src/%(ProjectsToPack.ProjectName)/**/netstandard*/%(ProjectName).dll" /> <Target Name="SetupGenerateNugetPackagesInputsOutputs"
DependsOnTargets="SetupProjectsToPack">
<ItemGroup>
<ProjectPackTargetInputs Include="$(PackagingBuildBasePath)/src/%(ProjectsToPack.ProjectName)/**/netstandard*/%(ProjectsToPack.ProjectName).dll" />
<ProjectPackTargetOutputs Include="$(NupkgOutputDirectory)/%(ProjectsToPack.ProjectName).%(ProjectsToPack.Version).nupkg" /> <ProjectPackTargetOutputs Include="$(NupkgOutputDirectory)/%(ProjectsToPack.ProjectName).%(ProjectsToPack.Version).nupkg" />
</ItemGroup> </ItemGroup>
</Target> </Target>
@ -70,7 +74,7 @@
<Target Name="BuildProjectsForNuGetPackages" <Target Name="BuildProjectsForNuGetPackages"
DependsOnTargets="Init; DependsOnTargets="Init;
SetupGenerateNugetPackagesInputsOutputs" SetupProjectsToPack"
Condition=" '$(OS)' == 'Windows_NT' "> Condition=" '$(OS)' == 'Windows_NT' ">
<MakeDir Directories="$(PackagingBuildBasePath)" /> <MakeDir Directories="$(PackagingBuildBasePath)" />