diff options
| author | dotnet-bot <dotnet-bot@microsoft.com> | 2019-06-14 23:30:02 +0300 |
|---|---|---|
| committer | dotnet-bot <dotnet-bot@microsoft.com> | 2019-06-14 23:30:02 +0300 |
| commit | 7b0f67689b8ac7115b8e972a965a03471d751760 (patch) | |
| tree | 31be030f09378c2901475c5cf1d53873b5c470b9 | |
| parent | 800f3803256081ab3e44ac6e4c4b2713856d1c30 (diff) | |
| parent | f74ca433b42bb48c2b12a83ae5530dc374c5b04f (diff) | |
Merge in 'release/2.1' changesv2.1.12
| -rw-r--r-- | Directory.Build.targets | 3 | ||||
| -rw-r--r-- | src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1.pkgproj | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Directory.Build.targets b/Directory.Build.targets index b0f161d1ed..e1781e0c06 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -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' "> diff --git a/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1.pkgproj b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1.pkgproj index 29f79f80b0..7117d89f55 100644 --- a/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1.pkgproj +++ b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1.pkgproj @@ -10,6 +10,7 @@ <ContentTargetFolders>content</ContentTargetFolders> <NoPackageAnalysis>true</NoPackageAnalysis> <PackageDescription>ASP.NET Core Module</PackageDescription> + <IsANCMPackage>true</IsANCMPackage> </PropertyGroup> <ItemGroup Condition="'$(OS)' == 'Windows_NT'"> |