huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge in 'release/2.2' changes

This commit is contained in:
dotnet-bot 2019-06-14 19:51:28 +00:00
parent 39c7419b72 0460bc3ff8
commit 2b771cd4f4
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Directory.Build.targets
View File

@ -11,6 +11,9 @@
<!-- Always include framework metapackages in patch updates. -->
<IsPackageInThisPatch Condition="'$(IsFrameworkMetapackage)' == 'true' OR '$(IsSharedSourcePackage)' == 'true' ">true</IsPackageInThisPatch>
<IsPackageInThisPatch Condition="'$(IsPackageInThisPatch)' == ''">$(PackagesInPatch.Contains(' $(PackageId);'))</IsPackageInThisPatch>
<!-- ANCM always builds every patch as we don't push temporary nuget packages anymore and that ANCM itself is a global singleton -->
<IsPackageInThisPatch Condition="'$(IsANCMPackage)' == 'true'">true</IsPackageInThisPatch>
</PropertyGroup>
<PropertyGroup Condition=" '$(IsPackable)' != 'false' AND '$(IsServicingBuild)' == 'true' ">

1
src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj
View File

@ -11,6 +11,7 @@
<NoPackageAnalysis>true</NoPackageAnalysis>
<PackageDescription>ASP.NET Core Module</PackageDescription>
<IsPackable Condition="'$(OS)' != 'Windows_NT'">false</IsPackable>
<IsANCMPackage>true</IsANCMPackage>
</PropertyGroup>
<ItemGroup Condition="'$(OS)' == 'Windows_NT'">

1
src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj
View File

@ -11,6 +11,7 @@
<NoPackageAnalysis>true</NoPackageAnalysis>
<PackageDescription>ASP.NET Core Module</PackageDescription>
<IsPackable Condition="'$(OS)' != 'Windows_NT'">false</IsPackable>
<IsANCMPackage>true</IsANCMPackage>
</PropertyGroup>
<ItemGroup Condition="'$(OS)' == 'Windows_NT'">