diff options
| author | Will Godbe <wigodbe@microsoft.com> | 2021-02-20 01:30:45 +0300 |
|---|---|---|
| committer | Will Godbe <wigodbe@microsoft.com> | 2021-02-20 01:30:45 +0300 |
| commit | 013de6365b4cdac816833296f4dae0f6a955a4d5 (patch) | |
| tree | decea659b5b6d36514ae9c61e5e45473519e77f2 | |
| parent | 2e56411fe66eec8421e741ba02454b77e09b7719 (diff) | |
Merged PR 13067: Try setting metadata for S.T.E.Wv2.1.26
| -rw-r--r-- | build/external-dependencies.props | 2 | ||||
| -rw-r--r-- | eng/PatchConfig.props | 3 | ||||
| -rw-r--r-- | src/Razor/Razor.Design/test/testassets/Directory.Build.props | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 7e80a4cef6..dd32d960f1 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -207,7 +207,7 @@ <ExternalDependency Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" /> <ExternalDependency Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" /> <ExternalDependency Include="System.ServiceProcess.ServiceController" Version="$(SystemServiceProcessServiceControllerPackageVersion)" /> - <ExternalDependency Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" /> + <ExternalDependency Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" AppMetapackage="true" AllMetapackage="true" MetapackageVersionRangeType="Minimum" /> <ExternalDependency Include="System.Threading.Channels" Version="$(SystemThreadingChannelsPackageVersion)" /> <ExternalDependency Include="System.Threading.Tasks.Dataflow" Version="$(SystemThreadingTasksDataflowPackageVersion)" /> <ExternalDependency Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsPackageVersion)" /> diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 80f1ba3859..708e392de6 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -92,9 +92,6 @@ Later on, this will be checked using this condition: <PackagesInPatch> @aspnet/signalr; @aspnet/signalr-protocol-msgpack; - Microsoft.AspNetCore.WebUtilities; - Microsoft.AspNetCore.Http.Abstractions; - Microsoft.AspNetCore.Html.Abstractions; </PackagesInPatch> </PropertyGroup> </Project> diff --git a/src/Razor/Razor.Design/test/testassets/Directory.Build.props b/src/Razor/Razor.Design/test/testassets/Directory.Build.props index 08f97a7b3a..96496c0d28 100644 --- a/src/Razor/Razor.Design/test/testassets/Directory.Build.props +++ b/src/Razor/Razor.Design/test/testassets/Directory.Build.props @@ -28,7 +28,6 @@ <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.dll"/> <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Runtime.dll"/> <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/> - <Reference Include="$(BinariesRoot)\System.Text.Encodings.Web.dll"/> </ItemGroup> <Import Project="After.Directory.Build.props" Condition="Exists('After.Directory.Build.props')" /> |