diff --git a/Directory.Build.props b/Directory.Build.props
index 80e6bb14f0057beec2bb5fffce8d21b59f58d374..06d608b84f3e52754cec3488e8c19b9c8356d69f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -183,7 +183,6 @@
<Import Project="eng\Workarounds.props" />
<Import Project="eng\Dependencies.props" />
- <Import Project="eng\PatchConfig.props" />
<Import Project="eng\ProjectReferences.props" />
<Import Project="eng\SharedFramework.Local.props" />
<Import Project="eng\SharedFramework.External.props" />
diff --git a/Directory.Build.targets b/Directory.Build.targets
index b03555c3548d33594d289d96d43034dcb61bbdbd..6066ff7fc62a4fcc3103300e45c0980d4cfee1ba 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -60,10 +60,7 @@
<PropertyGroup
Condition=" '$(IsPackable)' != 'false' AND '$(AspNetCorePatchVersion)' != '0' AND '$(DisableServicingFeatures)' != 'true' ">
- <!-- Remove RID to ensure PackagesInPatch only needs to specify the RID-less package name -->
- <PackageIdWithoutRID>$(PackageId)</PackageIdWithoutRID>
- <PackageIdWithoutRID Condition="'$(RuntimeIdentifier)' != ''">$(PackageId.Replace('.$(RuntimeIdentifier)',''))</PackageIdWithoutRID>
- <IsPackageInThisPatch Condition="'$(IsPackageInThisPatch)' == ''">$(PackagesInPatch.Contains(' $(PackageIdWithoutRID);'))</IsPackageInThisPatch>
+ <IsPackageInThisPatch Condition="'$(IsPackageInThisPatch)' == ''">true</IsPackageInThisPatch>
</PropertyGroup>
<PropertyGroup Condition=" '$(IsPackable)' != 'false' AND '$(IsServicingBuild)' == 'true' ">
diff --git a/docs/PreparingPatchUpdates.md b/docs/PreparingPatchUpdates.md
index ee153b4d031ccfe9165c155dad8c5c6f7b20f74d..5b069cb4b04d6a85ee7f019f30d13e4e1ff976bc 100644
--- 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
index 8f1fe7067534e933295a395c4ce607e71359d921..043082f4ec63c9a06bd98ad74ebd64eff17db050 100644
--- a/docs/ReferenceResolution.md
+++ b/docs/ReferenceResolution.md
@@ -31,7 +31,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
deleted file mode 100644
index cc39ea0a525d521cd5806eb484931613da1e5704..0000000000000000000000000000000000000000
--- a/eng/PatchConfig.props
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-
-This file contains a list of the package IDs which are patching in a given release.
-
-CAUTION: due to limitations in MSBuild, the format of the PackagesInPatch property is picky.
-When adding a new package, make sure the new line ends with a semicolon and starts with a space.
-
-NOTE: Package IDs may be different from the project name. For example Microsoft.DotNet.Web.ProjectTemplates.csproj
-Produces Microsoft.DotNet.Web.ProjectTemplates.$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) package. Also,
-for the sake of simplicity, Microsoft.AspNetCore.App.Runtime.{RID} package IDs will be resolved as
-Microsoft.AspNetCore.App.Runtime in this file; you do not need to append the RIDs when addint it to this file.
-
-Directory.Build.props checks this property using the following condition:
- <IsPackageInThisPatch>$(PackagesInPatch.Contains(' $(PackageId);'))</IsPackageInThisPatch>
--->
-<Project>
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
-
- <PropertyGroup Condition=" '$(VersionPrefix)' == '3.0.1' ">
- <PackagesInPatch>
- Microsoft.Net.Http.Headers;
- Microsoft.AspNetCore.CookiePolicy;
- Microsoft.AspNetCore.DataProtection.EntityFrameworkCore;
- @microsoft/signalr;
- Microsoft.Net.Http.Headers;
- Microsoft.AspNetCore.Http.Abstractions;
- Microsoft.AspNetCore.Http.Features;
- Microsoft.AspNetCore.CookiePolicy;
- Microsoft.AspNetCore.HttpsPolicy;
- Microsoft.AspNetCore.AspNetCoreModuleV2;
- Microsoft.AspNetCore.App.Ref;
- Microsoft.AspNetCore.App.Runtime;
- Microsoft.DotNet.Web.Client.ItemTemplates;
- Microsoft.DotNet.Web.ItemTemplates;
- Microsoft.DotNet.Web.ProjectTemplates.3.0;
- Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0;
- </PackagesInPatch>
- </PropertyGroup>
-</Project>
diff --git a/eng/Versions.props b/eng/Versions.props
index 119e47573d92c03cf1c560fd56c27d607c02c8d4..bafdb7c86b09815617747f68ba3c5fd1ffcf486f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -27,7 +27,7 @@
<!-- 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 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>
diff --git a/src/SignalR/clients/java/signalr/signalr.client.java.javaproj b/src/SignalR/clients/java/signalr/signalr.client.java.javaproj
index c6a61e3233ae174084af9114eba8db910fb44e09..78bf2cc36be6138373ebf52494cd9a8122ea5093 100644
--- a/src/SignalR/clients/java/signalr/signalr.client.java.javaproj
+++ b/src/SignalR/clients/java/signalr/signalr.client.java.javaproj
@@ -2,13 +2,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
-
- <!-- This package ID is only ever used along with eng/PatchConfig.props to determine when to patch the Java client. -->
- <PackageId>java:signalr</PackageId>
-
- <!-- In servicing builds, this will be set to value if the Java client is not configured to be released in the currently building patch. -->
<IsPackable>true</IsPackable>
-
<IsShippingPackage>true</IsShippingPackage>
<!-- Disable gradle daemon on CI since the CI seems to try to wait for the daemon to shut down, which it doesn't do :) -->