Remove PatchConfig.props; ship everything

- part of dotnet/aspnetcore-internal#3024
dotnet · Nov 19, 2019 · 17edae6 · 17edae6
1 parent c939f0e
commit 17edae6
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 26 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -78,7 +78,6 @@
  </ItemGroup>
 
  <Import Project="eng\Dependencies.props" />
- <Import Project="eng\PatchConfig.props" />
  <Import Project="eng\ProjectReferences.props" />
  <Import Project="eng\targets\Csharp.Refs.props" Condition="'$(IsReferenceAssemblyProject)' == 'true'" />
  <Import Project="eng\targets\Npm.Common.props" Condition="'$(MSBuildProjectExtension)' == '.npmproj'" />

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -8,7 +8,7 @@
  <Import Project="eng\Baseline.Designer.props" />
 
  <PropertyGroup Condition=" '$(IsPackable)' != 'false' AND '$(IsServicingBuild)' == 'true' ">
- <IsPackageInThisPatch Condition="'$(IsPackageInThisPatch)' == ''">$(PackagesInPatch.Contains(' $(PackageId);'))</IsPackageInThisPatch>
+ <IsPackageInThisPatch Condition="'$(IsPackageInThisPatch)' == ''">true</IsPackageInThisPatch>
  <!-- Suppress creation of .nupkg for servicing builds. -->
  <IsPackable Condition=" '$(IsPackageInThisPatch)' != 'true' ">false</IsPackable>
  </PropertyGroup>

diff --git a/docs/PreparingPatchUpdates.md b/docs/PreparingPatchUpdates.md
@@ -12,5 +12,3 @@ In order to prepare this repo to build a new servicing update, the following cha
 
 * Update the package baselines. This is used to ensure packages keep a consistent set of dependencies between releases.
  See [eng/tools/BaselineGenerator/](/eng/tools/BaselineGenerator/README.md) for instructions on how to run this tool.
-
-* Update the list of packages in [eng/PatchConfig.props](/eng/PatchConfig.props) to list which packages should be patching in this release.
diff --git a/docs/ReferenceResolution.md b/docs/ReferenceResolution.md
@@ -30,7 +30,6 @@ The requirements that led to this system are:
 
 * [eng/Baseline.xml](/eng/Baseline.xml) - this contains the 'baseline' of the latest servicing release for this branch. It should be modified and used to update the generated file, Baseline.Designer.props.
 * [eng/Dependencies.props](/eng/Dependencies.props) - contains a list of all package references that might be used in the repo.
-* [eng/PatchConfig.props](/eng/PatchConfig.props) - lists which assemblies or packages are patching in the current build.
 * [eng/ProjectReferences.props](/eng/ProjectReferences.props) - lists which assemblies or packages might be available to be referenced as a local project.
 * [eng/Versions.props](/eng/Versions.props) - contains a list of versions which may be updated by automation. This is used by MSBuild to restore and build.
 * [eng/Version.Details.xml](/eng/Version.Details.xml) - used by automation to update dependencies variables in other files.

diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -20,7 +20,7 @@
  <AssemblyVersion Condition="'$(IsReferenceAssemblyProject)' == 'true'">$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
  <ExperimentalVersionPrefix>0.1.$(PatchVersion)</ExperimentalVersionPrefix>
  <!--
- Until package baselines are updated (see aspnet/AspNetCore#12702), ignore them and PatchConfig.props. This also
+ Until package baselines are updated (see aspnet/AspNetCore#12702), ignore them. This also
  gives us time to build the entire repo and settle the infrastructure. Do _not_ do this when stabilizing versions.
  -->
  <DisableServicingFeatures Condition=" '$(DisableServicingFeatures)' == '' AND '$(StabilizePackageVersion)' != 'true' ">true</DisableServicingFeatures>