Merge branch 'release/2.1' into dev

This commit is contained in:
Nate McMaster 2018-03-23 16:35:00 -07:00
commit 8b423a7452
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 0 additions and 2 deletions

View File

@ -4,7 +4,6 @@
<NuspecFile Condition=" ! Exists($(NuspecFile))" />
<Serviceable Condition=" '$(Serviceable)' == '' ">true</Serviceable>
<PackageArtifactCategory>ship</PackageArtifactCategory>
<AssemblySigningCertName>Microsoft</AssemblySigningCertName>
<IncludeSymbols>false</IncludeSymbols>
<IncludeSource>false</IncludeSource>

View File

@ -6,7 +6,6 @@
<DefineConstants>$(DefineConstants);XPLAT</DefineConstants>
<PackageTags>aspnet;cli</PackageTags>
<PackageArtifactCategory>shipoob</PackageArtifactCategory>
<AssemblySigningCertName>Microsoft</AssemblySigningCertName>
</PropertyGroup>