Skip to content

Fix package prune data for .NET Core 2.x #50370

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Aug 20, 2025
Merged

Fix package prune data for .NET Core 2.x #50370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2304819
Fix package prune data for .NET Core 2.x
dsplaisted Aug 19, 2025
108de0e
Code review feedback
dsplaisted Aug 20, 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
4 changes: 0 additions & 4 deletions src/Microsoft.CodeAnalysis.NetAnalyzers/src/RulesMissingDocumentation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@

Rule ID | Missing Help Link | Title |
--------|-------------------|-------|
CA1873 | <https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1873> | Avoid potentially expensive logging |
CA1874 | <https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1874> | Use 'Regex.IsMatch' |
CA1875 | <https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1875> | Use 'Regex.Count' |
CA2023 | <https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca2023> | Invalid braces in message template |
Comment on lines -5 to -8
Copy link
Member Author

@dsplaisted dsplaisted Aug 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ViktorHofer We're seeing this file churn when we build locally, is this a change that should be checked in?

Copy link
Contributor

@nkolev92 nkolev92 Aug 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I got the same thing too on my machine, so definitely some line endings that need fixed up.

Copy link
Member

@ViktorHofer ViktorHofer Aug 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I think this needs to get checked-in.

Copy link
Member

@Youssef1313 Youssef1313 Oct 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dsplaisted Was the auto-generation removing these lines? That doesn't look correct to me because at least CA2023 is indeed missing documentation. See #51305

Copy link
Contributor

@xtqqczze xtqqczze Oct 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All these rules are actually missing documentation.

1 change: 0 additions & 1 deletion src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.netcoreapp2.0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ internal static class NETCoreApp20
internal static FrameworkPackages Instance { get; } = new(NetCoreApp20, FrameworkNames.NetCoreApp, NETStandard20.Instance)
{
{ "Microsoft.CSharp", "4.4.0" },
{ "Microsoft.NETCore.App", "2.0.0" },
{ "Microsoft.VisualBasic", "10.2.0" },
{ "Microsoft.Win32.Registry", "4.4.0" },
{ "runtime.any.System.Collections", "4.3.0" },
Expand Down
1 change: 0 additions & 1 deletion src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.netcoreapp2.1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ internal static class NETCoreApp21
internal static FrameworkPackages Instance { get; } = new(NetCoreApp21, FrameworkNames.NetCoreApp, NETCoreApp20.Instance)
{
{ "Microsoft.CSharp", "4.5.0" },
{ "Microsoft.NETCore.App", "2.1.0" },
{ "Microsoft.VisualBasic", "10.3.0" },
{ "Microsoft.Win32.Registry", "4.5.0" },
{ "System.Buffers", "4.6.1" },
Expand Down
6 changes: 1 addition & 5 deletions .../Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.FrameworkReferenceResolution.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<!-- Package pruning is expected to be enable for all TFMs for multi-targeted projects, so still generate the pruning data when RestoreEnablePackagePruning is '' which implies a multi-targeted project. -->
<Target Name="AddPrunePackageReferences" BeforeTargets="CollectPrunePackageReferences"
DependsOnTargets="ProcessFrameworkReferences"
Condition="('$(RestoreEnablePackagePruning)' == 'true' OR '$(RestoreEnablePackagePruning)' == '')
AND (('$(TargetFrameworkIdentifier)' == '.NETCoreApp'
AND '$(TargetFrameworkVersion)' != ''
AND $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '3.0')))
OR ('$(TargetFrameworkIdentifier)' != '.NETCoreApp'))">
Condition="'$(RestoreEnablePackagePruning)' == 'true' OR '$(RestoreEnablePackagePruning)' == ''">
<PropertyGroup>
<PrunePackageDataRoot Condition="'$(PrunePackageDataRoot)' == ''">$(NetCoreRoot)\sdk\$(NETCoreSdkVersion)\PrunePackageData\</PrunePackageDataRoot>
<PrunePackageTargetingPackRoots Condition="'$(PrunePackageTargetingPackRoots)' == ''">$(NetCoreTargetingPackRoot)</PrunePackageTargetingPackRoots>
Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,8 @@ public void PlatformPackagesCanBePruned(bool prunePackages)
[InlineData("net6.0")]
[InlineData("netcoreapp3.1")]
[InlineData("netcoreapp3.0")]
[InlineData("netcoreapp2.1", false)] //TODO: https://github.com/dotnet/sdk/issues/49917
[InlineData("netcoreapp2.0", false)] //TODO: https://github.com/dotnet/sdk/issues/49917
[InlineData("netcoreapp2.1")]
[InlineData("netcoreapp2.0")]
[InlineData("netcoreapp1.1", false)]
[InlineData("netcoreapp1.0", false)]
[InlineData("netstandard2.1")]
Expand Down