diff --git a/Directory.Build.props b/Directory.Build.props index 80e6bb14f0..06d608b84f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -183,7 +183,6 @@ - diff --git a/Directory.Build.targets b/Directory.Build.targets index b03555c354..6066ff7fc6 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -60,10 +60,7 @@ - - $(PackageId) - $(PackageId.Replace('.$(RuntimeIdentifier)','')) - $(PackagesInPatch.Contains(' $(PackageIdWithoutRID);')) + true diff --git a/docs/PreparingPatchUpdates.md b/docs/PreparingPatchUpdates.md index ee153b4d03..5b069cb4b0 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 8f1fe70675..043082f4ec 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 cc39ea0a52..0000000000 --- a/eng/PatchConfig.props +++ /dev/null @@ -1,41 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - 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; - - - diff --git a/eng/Versions.props b/eng/Versions.props index 119e47573d..bafdb7c86b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ false true diff --git a/src/SignalR/clients/java/signalr/signalr.client.java.javaproj b/src/SignalR/clients/java/signalr/signalr.client.java.javaproj index c6a61e3233..78bf2cc36b 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 @@ - - - java:signalr - - true - true