Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from nuget/nuget.client #46642

Merged
merged 26 commits into from
Feb 11, 2025
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ad2a717
Update dependencies from https://github.com/nuget/nuget.client build …
dotnet-maestro[bot] Feb 7, 2025
c9ab796
Merge branch 'main' into darc-main-a359a59f-2f74-425f-b291-3ec07e1d52f1
jgonz120 Feb 8, 2025
69d8432
Update dependencies from https://github.com/nuget/nuget.client build …
dotnet-maestro[bot] Feb 8, 2025
257c97c
Merge branch 'main' into darc-main-a359a59f-2f74-425f-b291-3ec07e1d52f1
jgonz120 Feb 9, 2025
235b180
Removed nuget.client patch
premun Feb 9, 2025
007e15a
Fix CRLF
premun Feb 6, 2025
b62362e
Fix tests now that package pruning is enabled by default
dsplaisted Jan 29, 2025
82becc8
Revert removal of workaround
dsplaisted Jan 29, 2025
23657f7
Add NU1510 to NoWarn property
ellahathaway Feb 6, 2025
ee52c90
Add NU1511 to NoWarn property
ViktorHofer Feb 7, 2025
24e0bfb
Revert "Add NU1511 to NoWarn property"
ViktorHofer Feb 10, 2025
77926a1
Revert "Add NU1510 to NoWarn property"
ViktorHofer Feb 10, 2025
4d6db1d
Add patches
ViktorHofer Feb 10, 2025
31418b6
Add missing patch for razor
ViktorHofer Feb 10, 2025
50a7914
Update nuget.nuget-client patch
ViktorHofer Feb 10, 2025
35f0e14
Add runtime patch
ViktorHofer Feb 10, 2025
7a3991b
Merge branch 'main' into darc-main-a359a59f-2f74-425f-b291-3ec07e1d52f1
ViktorHofer Feb 10, 2025
363fb6c
Delete src/SourceBuild/patches/sdk/0001-React-to-NuGet-package-prunin…
ViktorHofer Feb 10, 2025
0bbe294
Update runtime patch
ViktorHofer Feb 10, 2025
5cd497b
Aktualisieren von 0002-React-to-NuGet-package-pruning-warnings.patch
ViktorHofer Feb 10, 2025
39a64f6
Update runtime patch
ViktorHofer Feb 11, 2025
f3c3365
Merge branch 'main' into darc-main-a359a59f-2f74-425f-b291-3ec07e1d52f1
ViktorHofer Feb 11, 2025
98d3e9d
Remove aspnetcore patch
ViktorHofer Feb 11, 2025
192fc4e
Remove razor patch
ViktorHofer Feb 11, 2025
450790b
Remove SBRP patch
ViktorHofer Feb 11, 2025
ab392b9
Revert "Remove razor patch"
ViktorHofer Feb 11, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@
*.verified.txt text eol=lf working-tree-encoding=UTF-8
*.verified.xml text eol=lf working-tree-encoding=UTF-8
*.verified.json text eol=lf working-tree-encoding=UTF-8

src/SourceBuild/patches/**/*.patch text eol=lf
68 changes: 34 additions & 34 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -167,74 +167,74 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6908aead3a8b313798c381d5e435e9e6068301a7</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.14.0-preview.1.11">
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.14.0-preview.1.27">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
<Sha>38f10f632d8d1ffca92ae9f7a0c9e10a92451973</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.14.0-preview.1.11">
<Dependency Name="NuGet.Build.Tasks" Version="6.14.0-preview.1.27">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
<Sha>38f10f632d8d1ffca92ae9f7a0c9e10a92451973</Sha>
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.14.0-preview.1.11">
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.14.0-preview.1.27">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
<Sha>38f10f632d8d1ffca92ae9f7a0c9e10a92451973</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.14.0-preview.1.11">
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.14.0-preview.1.27">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
<Sha>38f10f632d8d1ffca92ae9f7a0c9e10a92451973</Sha>
</Dependency>
<Dependency Name="NuGet.Commands" Version="6.14.0-preview.1.11">
<Dependency Name="NuGet.Commands" Version="6.14.0-preview.1.27">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
<Sha>38f10f632d8d1ffca92ae9f7a0c9e10a92451973</Sha>
</Dependency>
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.14.0-preview.1.11">
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.14.0-preview.1.27">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
<Sha>38f10f632d8d1ffca92ae9f7a0c9e10a92451973</Sha>
</Dependency>
<Dependency Name="NuGet.Common" Version="6.14.0-preview.1.11">
<Dependency Name="NuGet.Common" Version="6.14.0-preview.1.27">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
<Sha>38f10f632d8d1ffca92ae9f7a0c9e10a92451973</Sha>
</Dependency>
<Dependency Name="NuGet.Configuration" Version="6.14.0-preview.1.11">
<Dependency Name="NuGet.Configuration" Version="6.14.0-preview.1.27">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
<Sha>38f10f632d8d1ffca92ae9f7a0c9e10a92451973</Sha>
</Dependency>
<Dependency Name="NuGet.Credentials" Version="6.14.0-preview.1.11">
<Dependency Name="NuGet.Credentials" Version="6.14.0-preview.1.27">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
<Sha>38f10f632d8d1ffca92ae9f7a0c9e10a92451973</Sha>
</Dependency>
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.14.0-preview.1.11">
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.14.0-preview.1.27">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
<Sha>38f10f632d8d1ffca92ae9f7a0c9e10a92451973</Sha>
</Dependency>
<Dependency Name="NuGet.Frameworks" Version="6.14.0-preview.1.11">
<Dependency Name="NuGet.Frameworks" Version="6.14.0-preview.1.27">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
<Sha>38f10f632d8d1ffca92ae9f7a0c9e10a92451973</Sha>
</Dependency>
<Dependency Name="NuGet.LibraryModel" Version="6.14.0-preview.1.11">
<Dependency Name="NuGet.LibraryModel" Version="6.14.0-preview.1.27">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
<Sha>38f10f632d8d1ffca92ae9f7a0c9e10a92451973</Sha>
</Dependency>
<Dependency Name="NuGet.ProjectModel" Version="6.14.0-preview.1.11">
<Dependency Name="NuGet.ProjectModel" Version="6.14.0-preview.1.27">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
<Sha>38f10f632d8d1ffca92ae9f7a0c9e10a92451973</Sha>
</Dependency>
<Dependency Name="NuGet.Protocol" Version="6.14.0-preview.1.11">
<Dependency Name="NuGet.Protocol" Version="6.14.0-preview.1.27">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
<Sha>38f10f632d8d1ffca92ae9f7a0c9e10a92451973</Sha>
</Dependency>
<Dependency Name="NuGet.Packaging" Version="6.14.0-preview.1.11">
<Dependency Name="NuGet.Packaging" Version="6.14.0-preview.1.27">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
<Sha>38f10f632d8d1ffca92ae9f7a0c9e10a92451973</Sha>
</Dependency>
<Dependency Name="NuGet.Versioning" Version="6.14.0-preview.1.11">
<Dependency Name="NuGet.Versioning" Version="6.14.0-preview.1.27">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
<Sha>38f10f632d8d1ffca92ae9f7a0c9e10a92451973</Sha>
</Dependency>
<Dependency Name="NuGet.Localization" Version="6.14.0-preview.1.11">
<Dependency Name="NuGet.Localization" Version="6.14.0-preview.1.27">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
<Sha>38f10f632d8d1ffca92ae9f7a0c9e10a92451973</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.14.0-preview-25107-01">
<Uri>https://github.com/microsoft/vstest</Uri>
Expand Down
24 changes: 12 additions & 12 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -145,18 +145,18 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/nuget/nuget.client -->
<NuGetBuildTasksPackageVersion>6.14.0-preview.1.11</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksConsolePackageVersion>6.14.0-preview.1.11</NuGetBuildTasksConsolePackageVersion>
<NuGetLocalizationPackageVersion>6.14.0-preview.1.11</NuGetLocalizationPackageVersion>
<NuGetBuildTasksPackPackageVersion>6.14.0-preview.1.11</NuGetBuildTasksPackPackageVersion>
<NuGetCommandLineXPlatPackageVersion>6.14.0-preview.1.11</NuGetCommandLineXPlatPackageVersion>
<NuGetProjectModelPackageVersion>6.14.0-preview.1.11</NuGetProjectModelPackageVersion>
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.14.0-preview.1.11</MicrosoftBuildNuGetSdkResolverPackageVersion>
<NuGetCommonPackageVersion>6.14.0-preview.1.11</NuGetCommonPackageVersion>
<NuGetConfigurationPackageVersion>6.14.0-preview.1.11</NuGetConfigurationPackageVersion>
<NuGetFrameworksPackageVersion>6.14.0-preview.1.11</NuGetFrameworksPackageVersion>
<NuGetPackagingPackageVersion>6.14.0-preview.1.11</NuGetPackagingPackageVersion>
<NuGetVersioningPackageVersion>6.14.0-preview.1.11</NuGetVersioningPackageVersion>
<NuGetBuildTasksPackageVersion>6.14.0-preview.1.27</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksConsolePackageVersion>6.14.0-preview.1.27</NuGetBuildTasksConsolePackageVersion>
<NuGetLocalizationPackageVersion>6.14.0-preview.1.27</NuGetLocalizationPackageVersion>
<NuGetBuildTasksPackPackageVersion>6.14.0-preview.1.27</NuGetBuildTasksPackPackageVersion>
<NuGetCommandLineXPlatPackageVersion>6.14.0-preview.1.27</NuGetCommandLineXPlatPackageVersion>
<NuGetProjectModelPackageVersion>6.14.0-preview.1.27</NuGetProjectModelPackageVersion>
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.14.0-preview.1.27</MicrosoftBuildNuGetSdkResolverPackageVersion>
<NuGetCommonPackageVersion>6.14.0-preview.1.27</NuGetCommonPackageVersion>
<NuGetConfigurationPackageVersion>6.14.0-preview.1.27</NuGetConfigurationPackageVersion>
<NuGetFrameworksPackageVersion>6.14.0-preview.1.27</NuGetFrameworksPackageVersion>
<NuGetPackagingPackageVersion>6.14.0-preview.1.27</NuGetPackagingPackageVersion>
<NuGetVersioningPackageVersion>6.14.0-preview.1.27</NuGetVersioningPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/Microsoft/vstest -->
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
From 2f580edd82d872d165b86b07ee0eeb073cb49acd Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 10 Feb 2025 15:06:49 +0100
Subject: [PATCH] React to NuGet package pruning warnings

Backport: https://github.com/dotnet/aspnetcore/pull/60297

---
.../Server/src/Microsoft.AspNetCore.Components.Server.csproj | 2 +-
src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj | 2 +-
src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj
index f690416b2b..92bd983063 100644
--- a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj
+++ b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj
@@ -22,7 +22,7 @@
<Reference Include="Microsoft.Extensions.Caching.Memory" />
<Reference Include="Microsoft.Extensions.Logging" />
<!-- Required for S.T.J source generation -->
- <Reference Include="System.Text.Json" PrivateAssets="All" />
+ <Reference Include="System.Text.Json" PrivateAssets="All" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />

<Compile Include="$(SharedSourceRoot)ValueStopwatch\*.cs" />
<Compile Include="$(SharedSourceRoot)LinkerFlags.cs" LinkBase="Shared" />
diff --git a/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj b/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj
index b670eccaa5..3a9a992b5a 100644
--- a/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj
+++ b/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj
@@ -28,7 +28,7 @@

<ItemGroup>
<Reference Include="System.IdentityModel.Tokens.Jwt" />
- <Reference Include="System.Text.Json" />
+ <Reference Include="System.Text.Json" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
<Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
<Reference Include="Microsoft.Extensions.Configuration" />
<Reference Include="Microsoft.Extensions.Configuration.Binder" />
diff --git a/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj b/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj
index b2ca66d8f7..b9b1b99952 100644
--- a/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj
+++ b/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj
@@ -29,7 +29,7 @@

<ItemGroup>
<Reference Include="Newtonsoft.Json" />
- <Reference Include="System.Text.Json" />
+ <Reference Include="System.Text.Json" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
<Reference Include="Microsoft.Extensions.Configuration.UserSecrets" />
</ItemGroup>

Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
From 33ac19502896addb6693d606ca6e7351ec6610ec Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 10 Feb 2025 15:00:47 +0100
Subject: [PATCH] React to NuGet package pruning warnings

Backport: https://github.com/dotnet/fsharp/pull/18304

---
eng/Versions.props | 1 -
src/fsc/fsc.targets | 9 ++++++---
2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 3b36ad6a7..ce0f5f5ac 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -87,7 +87,6 @@
<SystemReflectionMetadataVersion>$(SystemPackageVersionVersion)</SystemReflectionMetadataVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemThreadingTasksDataflow>$(SystemPackageVersionVersion)</SystemThreadingTasksDataflow>
- <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
<MicrosoftDiaSymReaderPortablePdbVersion>1.6.0</MicrosoftDiaSymReaderPortablePdbVersion>
<!-- Versions for package groups -->
<RoslynVersion>4.11.0-2.24264.2</RoslynVersion>
diff --git a/src/fsc/fsc.targets b/src/fsc/fsc.targets
index 1c67ceb39..dc80ab5c4 100644
--- a/src/fsc/fsc.targets
+++ b/src/fsc/fsc.targets
@@ -45,13 +45,16 @@
</ItemGroup>

<ItemGroup>
+ <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
+ <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
+ <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
+ </ItemGroup>
+
+ <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" />
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
- <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
- <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
- <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
</ItemGroup>

</Project>
--
2.47.1.windows.2

Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
From 4457db44e5129e7777abb1ad2262d60fab8d0a9b Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 10 Feb 2025 15:04:23 +0100
Subject: [PATCH] React to NuGet package pruning warnings

Backport: https://github.com/NuGet/NuGet.Client/pull/6261

---
src/NuGet.Core/NuGet.Common/NuGet.Common.csproj | 2 +-
src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj | 2 +-
.../NuGet.PackageManagement/NuGet.PackageManagement.csproj | 2 +-
src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj | 2 +-
src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj
index 75ed5accd..c1815cb84 100644
--- a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj
+++ b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj
@@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
- <PackageReference Include="System.Collections.Immutable" />
+ <PackageReference Include="System.Collections.Immutable" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
</ItemGroup>

<ItemGroup>
diff --git a/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj b/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj
index c20604eb9..21db96e44 100644
--- a/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj
+++ b/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj
@@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
- <PackageReference Include="System.Collections.Immutable" />
+ <PackageReference Include="System.Collections.Immutable" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
</ItemGroup>

<ItemGroup>
diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
index fd1bd0cd7..9111aac80 100644
--- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
+++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
@@ -22,7 +22,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Web.Xdt" />
- <PackageReference Include="Microsoft.CSharp" />
+ <PackageReference Include="Microsoft.CSharp" Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == '$(NETFXTargetFramework)' ">
diff --git a/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj b/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj
index 1a140570e..df0f64c7d 100644
--- a/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj
+++ b/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj
@@ -66,7 +66,7 @@
This package is a dependency of System.Security.Cryptography.Pkcs
When it is upgraded to a newer version, try deleting the below PackageReference
-->
- <PackageReference Include="System.Formats.Asn1" Condition=" '$(TargetFramework)' != '$(NETFXTargetFramework)'" />
+ <PackageReference Include="System.Formats.Asn1" Condition="'$(TargetFramework)' != '$(NETFXTargetFramework)' and '$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
</ItemGroup>

<ItemGroup>
diff --git a/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj b/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj
index bec334cd4..43308010a 100644
--- a/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj
+++ b/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj
@@ -20,7 +20,7 @@
</ItemGroup>

<ItemGroup>
- <PackageReference Include="System.Collections.Immutable" />
+ <PackageReference Include="System.Collections.Immutable" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
</ItemGroup>

<ItemGroup>
Loading
Loading