Skip to content
代码片段 群组 项目
未验证 提交 7891c831 编辑于 作者: Doug Bunting's avatar Doug Bunting 提交者: GitHub
浏览文件

Stop paying attention to PatchConfig.props (#16748)

- remove references to PatchConfig.props
- delete the file itself
上级 aff6ee3c
No related branches found
No related tags found
无相关合并请求
...@@ -183,7 +183,6 @@ ...@@ -183,7 +183,6 @@
<Import Project="eng\Workarounds.props" /> <Import Project="eng\Workarounds.props" />
<Import Project="eng\Dependencies.props" /> <Import Project="eng\Dependencies.props" />
<Import Project="eng\PatchConfig.props" />
<Import Project="eng\ProjectReferences.props" /> <Import Project="eng\ProjectReferences.props" />
<Import Project="eng\SharedFramework.Local.props" /> <Import Project="eng\SharedFramework.Local.props" />
<Import Project="eng\SharedFramework.External.props" /> <Import Project="eng\SharedFramework.External.props" />
......
...@@ -60,10 +60,7 @@ ...@@ -60,10 +60,7 @@
<PropertyGroup <PropertyGroup
Condition=" '$(IsPackable)' != 'false' AND '$(AspNetCorePatchVersion)' != '0' AND '$(DisableServicingFeatures)' != 'true' "> Condition=" '$(IsPackable)' != 'false' AND '$(AspNetCorePatchVersion)' != '0' AND '$(DisableServicingFeatures)' != 'true' ">
<!-- Remove RID to ensure PackagesInPatch only needs to specify the RID-less package name --> <IsPackageInThisPatch Condition="'$(IsPackageInThisPatch)' == ''">true</IsPackageInThisPatch>
<PackageIdWithoutRID>$(PackageId)</PackageIdWithoutRID>
<PackageIdWithoutRID Condition="'$(RuntimeIdentifier)' != ''">$(PackageId.Replace('.$(RuntimeIdentifier)',''))</PackageIdWithoutRID>
<IsPackageInThisPatch Condition="'$(IsPackageInThisPatch)' == ''">$(PackagesInPatch.Contains(' $(PackageIdWithoutRID);'))</IsPackageInThisPatch>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(IsPackable)' != 'false' AND '$(IsServicingBuild)' == 'true' "> <PropertyGroup Condition=" '$(IsPackable)' != 'false' AND '$(IsServicingBuild)' == 'true' ">
......
...@@ -12,5 +12,3 @@ In order to prepare this repo to build a new servicing update, the following cha ...@@ -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. * 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. 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.
...@@ -31,7 +31,6 @@ The requirements that led to this system are: ...@@ -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/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/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/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/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. * [eng/Version.Details.xml](/eng/Version.Details.xml) - used by automation to update dependencies variables in other files.
......
<!--
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>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<!-- Additional assembly attributes are already configured to include the source revision ID. --> <!-- Additional assembly attributes are already configured to include the source revision ID. -->
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion> <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. 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> <DisableServicingFeatures Condition=" '$(DisableServicingFeatures)' == '' AND '$(StabilizePackageVersion)' != 'true' ">true</DisableServicingFeatures>
......
...@@ -2,13 +2,7 @@ ...@@ -2,13 +2,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
<PropertyGroup> <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> <IsPackable>true</IsPackable>
<IsShippingPackage>true</IsShippingPackage> <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 :) --> <!-- 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% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册