Merge branch 'release/2.1' into dev
This commit is contained in:
commit
8b423a7452
|
|
@ -4,7 +4,6 @@
|
||||||
<NuspecFile Condition=" ! Exists($(NuspecFile))" />
|
<NuspecFile Condition=" ! Exists($(NuspecFile))" />
|
||||||
<Serviceable Condition=" '$(Serviceable)' == '' ">true</Serviceable>
|
<Serviceable Condition=" '$(Serviceable)' == '' ">true</Serviceable>
|
||||||
|
|
||||||
<PackageArtifactCategory>ship</PackageArtifactCategory>
|
|
||||||
<AssemblySigningCertName>Microsoft</AssemblySigningCertName>
|
<AssemblySigningCertName>Microsoft</AssemblySigningCertName>
|
||||||
<IncludeSymbols>false</IncludeSymbols>
|
<IncludeSymbols>false</IncludeSymbols>
|
||||||
<IncludeSource>false</IncludeSource>
|
<IncludeSource>false</IncludeSource>
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@
|
||||||
<DefineConstants>$(DefineConstants);XPLAT</DefineConstants>
|
<DefineConstants>$(DefineConstants);XPLAT</DefineConstants>
|
||||||
<PackageTags>aspnet;cli</PackageTags>
|
<PackageTags>aspnet;cli</PackageTags>
|
||||||
|
|
||||||
<PackageArtifactCategory>shipoob</PackageArtifactCategory>
|
|
||||||
<AssemblySigningCertName>Microsoft</AssemblySigningCertName>
|
<AssemblySigningCertName>Microsoft</AssemblySigningCertName>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue