|
| 1 | +From ccc70ac49e1fc406b488e2c5347c6933073b2c67 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Viktor Hofer < [email protected]> |
| 3 | +Date: Fri, 14 Feb 2025 16:11:41 +0100 |
| 4 | +Subject: [PATCH] React to NuGet package pruning warnings |
| 5 | + |
| 6 | +Backport: https://github.com/dotnet/aspnetcore/pull/60395 |
| 7 | + |
| 8 | +--- |
| 9 | + ...Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj | 1 - |
| 10 | + ...icrosoft.AspNetCore.Components.WebAssembly.DevServer.csproj | 1 - |
| 11 | + .../JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj | 2 +- |
| 12 | + .../src/Microsoft.Extensions.Logging.AzureAppServices.csproj | 2 +- |
| 13 | + .../Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj | 3 --- |
| 14 | + .../src/Microsoft.AspNetCore.SignalR.Client.Core.csproj | 2 +- |
| 15 | + src/Testing/src/Microsoft.AspNetCore.InternalTesting.csproj | 2 +- |
| 16 | + src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj | 2 +- |
| 17 | + .../src/Microsoft.dotnet-openapi.csproj | 2 -- |
| 18 | + src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj | 2 -- |
| 19 | + 10 files changed, 5 insertions(+), 14 deletions(-) |
| 20 | + |
| 21 | +diff --git a/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj |
| 22 | +index fe1c0f19275e..dbc464028962 100644 |
| 23 | +--- a/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj |
| 24 | ++++ b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj |
| 25 | +@@ -13,7 +13,6 @@ |
| 26 | + <ItemGroup> |
| 27 | + <Reference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" /> |
| 28 | + <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" /> |
| 29 | +- <Reference Include="System.Text.Json" /> |
| 30 | + </ItemGroup> |
| 31 | + |
| 32 | + <ItemGroup> |
| 33 | +diff --git a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj |
| 34 | +index b24c6bd6ac9e..a320af38fa9c 100644 |
| 35 | +--- a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj |
| 36 | ++++ b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj |
| 37 | +@@ -21,7 +21,6 @@ |
| 38 | + <ItemGroup> |
| 39 | + <Reference Include="Microsoft.AspNetCore" /> |
| 40 | + <Reference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" /> |
| 41 | +- <Reference Include="System.Text.Json" /> |
| 42 | + |
| 43 | + <PackageReference Include="Microsoft.DotNet.Build.Tasks.Templating" PrivateAssets="All" Version="$(MicrosoftDotNetBuildTasksTemplatingVersion)" IsImplicitlyDefined="true" AllowExplicitReference="true" /> |
| 44 | + </ItemGroup> |
| 45 | +diff --git a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj |
| 46 | +index 57cc0737ff21..f4027ea5fd71 100644 |
| 47 | +--- a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj |
| 48 | ++++ b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj |
| 49 | +@@ -22,7 +22,7 @@ |
| 50 | + </ItemGroup> |
| 51 | + |
| 52 | + <ItemGroup> |
| 53 | +- <Reference Include="Microsoft.CSharp" /> |
| 54 | ++ <Reference Include="Microsoft.CSharp" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> |
| 55 | + <Reference Include="Newtonsoft.Json" /> |
| 56 | + </ItemGroup> |
| 57 | + |
| 58 | +diff --git a/src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj b/src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj |
| 59 | +index 8c75d85a4ff9..d3e91be03049 100644 |
| 60 | +--- a/src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj |
| 61 | ++++ b/src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj |
| 62 | +@@ -18,7 +18,7 @@ |
| 63 | + <Reference Include="Microsoft.Extensions.Logging.Abstractions" /> |
| 64 | + <Reference Include="Microsoft.Extensions.Logging.Configuration" /> |
| 65 | + <Reference Include="Microsoft.Extensions.Logging" /> |
| 66 | +- <Reference Include="System.ValueTuple" /> |
| 67 | ++ <Reference Include="System.ValueTuple" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> |
| 68 | + </ItemGroup> |
| 69 | + |
| 70 | + <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)' OR '$(MSBuildRestoreSessionId)' == ''"> |
| 71 | +diff --git a/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj |
| 72 | +index a3c025d7cb99..c6beee133ff7 100644 |
| 73 | +--- a/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj |
| 74 | ++++ b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj |
| 75 | +@@ -70,9 +70,6 @@ |
| 76 | + |
| 77 | + <Reference Include="Microsoft.NETCore.Windows.ApiSets" /> |
| 78 | + <Reference Include="Microsoft.Web.Administration" /> |
| 79 | +- <Reference Include="System.Net.Http" /> |
| 80 | +- <Reference Include="System.Security.Cryptography.X509Certificates" /> |
| 81 | +- <Reference Include="System.Security.Principal.Windows" /> |
| 82 | + <Reference Include="System.ServiceProcess.ServiceController" /> |
| 83 | + </ItemGroup> |
| 84 | + |
| 85 | +diff --git a/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj b/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj |
| 86 | +index 16c662419d25..93470d863615 100644 |
| 87 | +--- a/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj |
| 88 | ++++ b/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj |
| 89 | +@@ -33,7 +33,7 @@ |
| 90 | + <Reference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" /> |
| 91 | + <Reference Include="Microsoft.Extensions.DependencyInjection" /> |
| 92 | + <Reference Include="Microsoft.Extensions.Logging" /> |
| 93 | +- <Reference Include="System.Threading.Channels" /> |
| 94 | ++ <Reference Include="System.Threading.Channels" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> |
| 95 | + </ItemGroup> |
| 96 | + |
| 97 | + <ItemGroup Condition="'$(TargetFramework)' != '$(DefaultNetCoreTargetFramework)'"> |
| 98 | +diff --git a/src/Testing/src/Microsoft.AspNetCore.InternalTesting.csproj b/src/Testing/src/Microsoft.AspNetCore.InternalTesting.csproj |
| 99 | +index b791c1e90861..179d80bbba73 100644 |
| 100 | +--- a/src/Testing/src/Microsoft.AspNetCore.InternalTesting.csproj |
| 101 | ++++ b/src/Testing/src/Microsoft.AspNetCore.InternalTesting.csproj |
| 102 | +@@ -28,7 +28,7 @@ |
| 103 | + <Reference Include="Microsoft.Extensions.Logging" /> |
| 104 | + <Reference Include="Serilog.Extensions.Logging" /> |
| 105 | + <Reference Include="Serilog.Sinks.File" /> |
| 106 | +- <Reference Include="System.ValueTuple" /> |
| 107 | ++ <Reference Include="System.ValueTuple" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> |
| 108 | + |
| 109 | + <!-- |
| 110 | + This intentionally does not reference 'xunit', 'xunit.core', or any runner packages. |
| 111 | +diff --git a/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj b/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj |
| 112 | +index 4e2a913cc920..a5b5cd12beb8 100644 |
| 113 | +--- a/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj |
| 114 | ++++ b/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj |
| 115 | +@@ -19,7 +19,7 @@ |
| 116 | + <Reference Include="Microsoft.Extensions.Hosting.Abstractions" /> |
| 117 | + </ItemGroup> |
| 118 | + |
| 119 | +- <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'"> |
| 120 | ++ <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> |
| 121 | + <Reference Include="System.Diagnostics.DiagnosticSource" /> |
| 122 | + </ItemGroup> |
| 123 | + |
| 124 | +diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj b/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj |
| 125 | +index 3dda9082146e..8c9bcb4585b3 100644 |
| 126 | +--- a/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj |
| 127 | ++++ b/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj |
| 128 | +@@ -17,8 +17,6 @@ |
| 129 | + <ItemGroup> |
| 130 | + <Reference Include="Microsoft.Build" ExcludeAssets="runtime" /> |
| 131 | + <Reference Include="Microsoft.Build.Locator" /> |
| 132 | +- <Reference Include="System.Private.Uri" /> |
| 133 | +- <Reference Include="System.Text.Json" /> |
| 134 | + </ItemGroup> |
| 135 | + |
| 136 | + <ItemGroup> |
| 137 | +diff --git a/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj b/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj |
| 138 | +index 8d0f2d89aad7..9ecfc17f9ef3 100644 |
| 139 | +--- a/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj |
| 140 | ++++ b/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj |
| 141 | +@@ -16,9 +16,7 @@ |
| 142 | + <ItemGroup> |
| 143 | + <Reference Include="Microsoft.Data.SqlClient" /> |
| 144 | + <Reference Include="Azure.Identity" /> |
| 145 | +- <Reference Include="System.Private.Uri" /> |
| 146 | + <Reference Include="System.Runtime.Caching" /> |
| 147 | +- <Reference Include="System.Text.Json" /> |
| 148 | + </ItemGroup> |
| 149 | + |
| 150 | + </Project> |
0 commit comments