Skip to content

Commit 7891c83

Browse files
authored
Stop paying attention to PatchConfig.props (#16748)
- remove references to PatchConfig.props - delete the file itself
1 parent aff6ee3 commit 7891c83

File tree

7 files changed

+2
-56
lines changed

7 files changed

+2
-56
lines changed

Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@
183183

184184
<Import Project="eng\Workarounds.props" />
185185
<Import Project="eng\Dependencies.props" />
186-
<Import Project="eng\PatchConfig.props" />
187186
<Import Project="eng\ProjectReferences.props" />
188187
<Import Project="eng\SharedFramework.Local.props" />
189188
<Import Project="eng\SharedFramework.External.props" />

Directory.Build.targets

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,7 @@
6060

6161
<PropertyGroup
6262
Condition=" '$(IsPackable)' != 'false' AND '$(AspNetCorePatchVersion)' != '0' AND '$(DisableServicingFeatures)' != 'true' ">
63-
<!-- Remove RID to ensure PackagesInPatch only needs to specify the RID-less package name -->
64-
<PackageIdWithoutRID>$(PackageId)</PackageIdWithoutRID>
65-
<PackageIdWithoutRID Condition="'$(RuntimeIdentifier)' != ''">$(PackageId.Replace('.$(RuntimeIdentifier)',''))</PackageIdWithoutRID>
66-
<IsPackageInThisPatch Condition="'$(IsPackageInThisPatch)' == ''">$(PackagesInPatch.Contains(' $(PackageIdWithoutRID);'))</IsPackageInThisPatch>
63+
<IsPackageInThisPatch Condition="'$(IsPackageInThisPatch)' == ''">true</IsPackageInThisPatch>
6764
</PropertyGroup>
6865

6966
<PropertyGroup Condition=" '$(IsPackable)' != 'false' AND '$(IsServicingBuild)' == 'true' ">

docs/PreparingPatchUpdates.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,3 @@ In order to prepare this repo to build a new servicing update, the following cha
1212

1313
* Update the package baselines. This is used to ensure packages keep a consistent set of dependencies between releases.
1414
See [eng/tools/BaselineGenerator/](/eng/tools/BaselineGenerator/README.md) for instructions on how to run this tool.
15-
16-
* Update the list of packages in [eng/PatchConfig.props](/eng/PatchConfig.props) to list which packages should be patching in this release.

docs/ReferenceResolution.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ The requirements that led to this system are:
3131

3232
* [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.
3333
* [eng/Dependencies.props](/eng/Dependencies.props) - contains a list of all package references that might be used in the repo.
34-
* [eng/PatchConfig.props](/eng/PatchConfig.props) - lists which assemblies or packages are patching in the current build.
3534
* [eng/ProjectReferences.props](/eng/ProjectReferences.props) - lists which assemblies or packages might be available to be referenced as a local project.
3635
* [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.
3736
* [eng/Version.Details.xml](/eng/Version.Details.xml) - used by automation to update dependencies variables in other files.

eng/PatchConfig.props

Lines changed: 0 additions & 41 deletions
This file was deleted.

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<!-- Additional assembly attributes are already configured to include the source revision ID. -->
2828
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
2929
<!--
30-
Until package baselines are updated (see aspnet/AspNetCore#12702), ignore them and PatchConfig.props. This also
30+
Until package baselines are updated (see aspnet/AspNetCore#12702), ignore them. This also
3131
gives us time to build the entire repo and settle the infrastructure. Do _not_ do this when stabilizing versions.
3232
-->
3333
<DisableServicingFeatures Condition=" '$(DisableServicingFeatures)' == '' AND '$(StabilizePackageVersion)' != 'true' ">true</DisableServicingFeatures>

src/SignalR/clients/java/signalr/signalr.client.java.javaproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
33

44
<PropertyGroup>
5-
6-
<!-- This package ID is only ever used along with eng/PatchConfig.props to determine when to patch the Java client. -->
7-
<PackageId>java:signalr</PackageId>
8-
9-
<!-- In servicing builds, this will be set to value if the Java client is not configured to be released in the currently building patch. -->
105
<IsPackable>true</IsPackable>
11-
126
<IsShippingPackage>true</IsShippingPackage>
137

148
<!-- Disable gradle daemon on CI since the CI seems to try to wait for the daemon to shut down, which it doesn't do :) -->

0 commit comments

Comments
 (0)