From 2d9d13aa38af185612848fe88bd9da8fefd5e73d Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Wed, 25 Sep 2019 15:12:51 -0700
Subject: [PATCH] Further centralize choice to opt out of servicing features
for now - no changes in known frameworks, targeting pack features, et cetera
---
Directory.Build.targets | 9 ++-------
eng/Versions.props | 10 ++++++----
eng/targets/Packaging.targets | 2 +-
eng/targets/ResolveReferences.targets | 4 ++--
4 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 89f3cb733ce..0bbb16aa491 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -58,13 +58,8 @@
<Import Project="eng\Baseline.Designer.props" />
- <PropertyGroup Condition=" '$(IsPackable)' != 'false' AND '$(AspNetCorePatchVersion)' != '0' ">
- <!--
- Build entire repo while we settle the infrastructure; ignore PatchConfig.props.
- Do _not_ do this when stabilizing versions.
- -->
- <IsPackageInThisPatch
- Condition="'$(IsPackageInThisPatch)' == '' AND '$(StabilizePackageVersion)' != 'true'">true</IsPackageInThisPatch>
+ <PropertyGroup
+ Condition=" '$(IsPackable)' != 'false' AND '$(AspNetCorePatchVersion)' != '0' AND '$(DisableServicingFeatures)' != 'true' ">
<IsPackageInThisPatch Condition="'$(IsPackageInThisPatch)' == ''">$(PackagesInPatch.Contains(' $(PackageId);'))</IsPackageInThisPatch>
</PropertyGroup>
diff --git a/eng/Versions.props b/eng/Versions.props
index 5aa6860892f..a0c39b7f4e8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -27,12 +27,14 @@
<!-- Additional assembly attributes are already configured to include the source revision ID. -->
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
<!--
- Until package baselines are updated (see aspnet/AspNetCore#12702), ignore them.
- Do _not_ do this when stabilizing versions.
+ Until package baselines are updated (see aspnet/AspNetCore#12702), ignore them and PatchConfig.props. This also
+ gives us time to build the entire repo and settle the infrastructure. Do _not_ do this when stabilizing versions.
-->
- <IgnorePackageBaselines Condition=" '$(StabilizePackageVersion)' != 'true' ">true</IgnorePackageBaselines>
+ <DisableServicingFeatures
+ Condition=" '$(DisableServicingFeatures)' == '' AND '$(StabilizePackageVersion)' != 'true' ">true</DisableServicingFeatures>
<!-- Servicing builds have different characteristics for the way dependencies, baselines, and versions are handled. -->
- <IsServicingBuild Condition=" '$(PreReleaseVersionLabel)' == 'servicing' ">true</IsServicingBuild>
+ <IsServicingBuild
+ Condition=" '$(DisableServicingFeatures)' != 'true' AND '$(PreReleaseVersionLabel)' == 'servicing' ">true</IsServicingBuild>
<VersionPrefix>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)</VersionPrefix>
<!-- TargetingPackVersionPrefix is used by projects, like .deb and .rpm, which use slightly different version formats. -->
<TargetingPackVersionPrefix>$(VersionPrefix)</TargetingPackVersionPrefix>
diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets
index 0d31c13ea69..fdef1de7a32 100644
--- a/eng/targets/Packaging.targets
+++ b/eng/targets/Packaging.targets
@@ -1,7 +1,7 @@
<Project>
<Target Name="EnsureBaselineIsUpdated"
- Condition="'$(IsServicingBuild)' == 'true' AND '$(IgnorePackageBaselines)' != 'true' AND '$(AspNetCoreBaselineVersion)' != '$(PreviousAspNetCoreReleaseVersion)'"
+ Condition="'$(IsServicingBuild)' == 'true' AND '$(AspNetCoreBaselineVersion)' != '$(PreviousAspNetCoreReleaseVersion)'"
BeforeTargets="BeforeBuild">
<Error Text="The package baseline ($(AspNetCoreBaselineVersion)) is out of date with the latest release of this repo ($(PreviousAspNetCoreReleaseVersion)).
See $(RepoRoot)eng\tools\BaselineGenerator\README.md for instructions on updating this baseline." />
diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets
index 1000b4a1ffa..3471b276f3a 100644
--- a/eng/targets/ResolveReferences.targets
+++ b/eng/targets/ResolveReferences.targets
@@ -36,7 +36,8 @@
-->
<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsServicingBuild)' != 'true' ">true</UseLatestPackageReferences>
<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsImplementationProject)' != 'true' ">true</UseLatestPackageReferences>
- <UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsImplementationProject)' == 'true' AND ( '$(IsServicingBuild)' != 'true' OR '$(IsPackable)' == 'true' ) ">true</UseLatestPackageReferences>
+ <UseLatestPackageReferences
+ Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsImplementationProject)' == 'true' AND '$(IsPackable)' == 'true' ">true</UseLatestPackageReferences>
<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' ">false</UseLatestPackageReferences>
<!--
@@ -45,7 +46,6 @@
* when a project is a test or sample project
We don't use project references between components in servicing builds between compontents to preserve the baseline as much as possible.
-->
- <UseProjectReferences Condition=" '$(UseProjectReferences)' == '' AND '$(IgnorePackageBaselines)' == 'true' ">true</UseProjectReferences>
<UseProjectReferences Condition=" '$(UseProjectReferences)' == '' AND '$(IsServicingBuild)' != 'true' ">true</UseProjectReferences>
<UseProjectReferences Condition=" '$(UseProjectReferences)' == '' AND '$(IsImplementationProject)' != 'true' ">true</UseProjectReferences>
<UseProjectReferences Condition=" '$(UseProjectReferences)' == '' ">false</UseProjectReferences>
--
GitLab