Merge branch 'release/2.1' into dev

This commit is contained in:
Ajay Bhargav Baaskaran 2018-04-19 13:16:49 -07:00
commit cb8b0cf472
2 changed files with 6 additions and 2 deletions

View File

@ -25,9 +25,11 @@
<PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsPropertyHelperSourcesPackageVersion)" />
</ItemGroup>
<Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="BuiltProjectOutputGroup;DocumentationProjectOutputGroup">
<Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup;DocumentationProjectOutputGroup">
<PropertyGroup>
<!-- Make sure we create a symbols.nupkg -->
<IncludeSymbols>true</IncludeSymbols>
<NuspecProperties>
id=$(MSBuildProjectName);
version=$(PackageVersion);
@ -49,7 +51,8 @@
MicrosoftExtensionsFileProvidersCompositePackageVersion=$(MicrosoftExtensionsFileProvidersCompositePackageVersion);
MicrosoftDiaSymReaderNativePackageVersion=$(MicrosoftDiaSymReaderNativePackageVersion);
OutputBinary=@(BuiltProjectOutputGroupOutput);
OutputDocumentation=@(DocumentationProjectOutputGroupOutput)
OutputDocumentation=@(DocumentationProjectOutputGroupOutput);
OutputSymbol=@(DebugSymbolsProjectOutputGroupOutput);
</NuspecProperties>
</PropertyGroup>
</Target>

View File

@ -39,5 +39,6 @@
<files>
<file src="$OutputBinary$" target="lib\$targetframework$\" />
<file src="$OutputDocumentation$" target="lib\$targetframework$\" />
<file src="$OutputSymbol$" target="lib\$targetframework$\" />
</files>
</package>