Skip to content

Commit 2e0dcc2

Browse files
authored
Fix up telemetry for package pruning, .NET Framework is no longer enabled by default (#6845)
1 parent d17f4fc commit 2e0dcc2

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

src/NuGet.Core/NuGet.Commands/RestoreCommand/RestoreCommand.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -409,13 +409,10 @@ internal static void PopulatePruningEnabledTelemetry(PackageSpec project, Teleme
409409
{
410410
bool isPruningEnabled = framework.PackagesToPrune.Count > 0;
411411
bool isNetCoreAppFramework = StringComparer.OrdinalIgnoreCase.Equals(framework.FrameworkName.Framework, FrameworkConstants.FrameworkIdentifiers.NetCoreApp);
412-
// All .NETCoreApp, .NET Standard >= 2.0 , and .NET Framework >= 4.6.1 projects are compatible with package pruning.
413-
bool isPruningCompatibleFramework = isNetCoreAppFramework ||
412+
// .NETCoreApp >= 2.0, .NET Standard >= 2.0 are compatible with package pruning.
413+
bool isPruningCompatibleFramework = (isNetCoreAppFramework && framework.FrameworkName.Version.Major >= 2) ||
414414
(StringComparer.OrdinalIgnoreCase.Equals(framework.FrameworkName.Framework, FrameworkConstants.FrameworkIdentifiers.NetStandard) &&
415-
framework.FrameworkName.Version.Major >= 2) ||
416-
(project.RestoreMetadata.UsingMicrosoftNETSdk &&
417-
StringComparer.OrdinalIgnoreCase.Equals(framework.FrameworkName.Framework, FrameworkConstants.FrameworkIdentifiers.Net) &&
418-
framework.FrameworkName.Version >= FrameworkConstants.CommonFrameworks.Net461.Version);
415+
framework.FrameworkName.Version.Major >= 2);
419416

420417
pruningDefault |= isNetCoreAppFramework && framework.FrameworkName.Version.Major >= 10;
421418

test/NuGet.Core.FuncTests/NuGet.Commands.FuncTest/RestoreCommand_PrunePackageReference.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2679,6 +2679,14 @@ public void PopulatePruningEnabledTelemetry_WithPruningDisabledByDefault_AndVari
26792679
},
26802680
}
26812681
},
2682+
""net9.0"": {
2683+
""dependencies"": {
2684+
""A"": {
2685+
""version"": ""[1.0.0,)"",
2686+
""target"": ""Package"",
2687+
},
2688+
}
2689+
},
26822690
}
26832691
}";
26842692

@@ -2692,7 +2700,7 @@ public void PopulatePruningEnabledTelemetry_WithPruningDisabledByDefault_AndVari
26922700
RestoreCommand.PopulatePruningEnabledTelemetry(projectSpec, testEvent);
26932701
testEvent["Pruning.FrameworksEnabled.Count"].Should().Be(1);
26942702
testEvent["Pruning.DefaultEnabled"].Should().Be(false);
2695-
testEvent["Pruning.FrameworksUnsupported.Count"].Should().Be(1);
2703+
testEvent["Pruning.FrameworksUnsupported.Count"].Should().Be(2);
26962704
testEvent["Pruning.FrameworksDisabled.Count"].Should().Be(1);
26972705
}
26982706

test/NuGet.Core.Tests/NuGet.Commands.Test/RestoreCommandTests/RestoreCommandTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3104,8 +3104,8 @@ await SimpleTestPackageUtility.CreateFolderFeedV3Async(
31043104
projectInformationEvent["UpdatedMSBuildFiles"].Should().Be(false);
31053105
projectInformationEvent["NETSdkVersion"].Should().Be(NuGetVersion.Parse("10.0.100"));
31063106
projectInformationEvent["Pruning.FrameworksEnabled.Count"].Should().Be(0);
3107-
projectInformationEvent["Pruning.FrameworksDisabled.Count"].Should().Be(1);
3108-
projectInformationEvent["Pruning.FrameworksUnsupported.Count"].Should().Be(0);
3107+
projectInformationEvent["Pruning.FrameworksDisabled.Count"].Should().Be(0);
3108+
projectInformationEvent["Pruning.FrameworksUnsupported.Count"].Should().Be(1);
31093109
projectInformationEvent["Pruning.DefaultEnabled"].Should().Be(false);
31103110
projectInformationEvent["UsesLegacyPackagesDirectory"].Should().Be(false);
31113111
}

0 commit comments

Comments
 (0)