Fix up telemetry for package pruning, .NET Framework is no longer enabled by default (#6845) (#6848)

Author: nkolev92

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

@@ -409,13 +409,10 @@ internal static void PopulatePruningEnabledTelemetry(PackageSpec project, Teleme
             {
                 bool isPruningEnabled = framework.PackagesToPrune.Count > 0;
                 bool isNetCoreAppFramework = StringComparer.OrdinalIgnoreCase.Equals(framework.FrameworkName.Framework, FrameworkConstants.FrameworkIdentifiers.NetCoreApp);
-                // All .NETCoreApp, .NET Standard >= 2.0 , and .NET Framework >= 4.6.1 projects are compatible with package pruning.
-                bool isPruningCompatibleFramework = isNetCoreAppFramework ||
+                // .NETCoreApp >= 2.0, .NET Standard >= 2.0 are compatible with package pruning.
+                bool isPruningCompatibleFramework = (isNetCoreAppFramework && framework.FrameworkName.Version.Major >= 2) ||
                     (StringComparer.OrdinalIgnoreCase.Equals(framework.FrameworkName.Framework, FrameworkConstants.FrameworkIdentifiers.NetStandard) &&
-                        framework.FrameworkName.Version.Major >= 2) ||
-                    (project.RestoreMetadata.UsingMicrosoftNETSdk &&
-                        StringComparer.OrdinalIgnoreCase.Equals(framework.FrameworkName.Framework, FrameworkConstants.FrameworkIdentifiers.Net) &&
-                        framework.FrameworkName.Version >= FrameworkConstants.CommonFrameworks.Net461.Version);
+                        framework.FrameworkName.Version.Major >= 2);
 
                 pruningDefault |= isNetCoreAppFramework && framework.FrameworkName.Version.Major >= 10;
 

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

@@ -2679,6 +2679,14 @@ public void PopulatePruningEnabledTelemetry_WithPruningDisabledByDefault_AndVari
                                 },
                         }
                     },
+                    ""net9.0"": {
+                        ""dependencies"": {
+                                ""A"": {
+                                    ""version"": ""[1.0.0,)"",
+                                    ""target"": ""Package"",
+                                },
+                        }
+                    },
                   }
                 }";
 
@@ -2692,7 +2700,7 @@ public void PopulatePruningEnabledTelemetry_WithPruningDisabledByDefault_AndVari
             RestoreCommand.PopulatePruningEnabledTelemetry(projectSpec, testEvent);
             testEvent["Pruning.FrameworksEnabled.Count"].Should().Be(1);
             testEvent["Pruning.DefaultEnabled"].Should().Be(false);
-            testEvent["Pruning.FrameworksUnsupported.Count"].Should().Be(1);
+            testEvent["Pruning.FrameworksUnsupported.Count"].Should().Be(2);
             testEvent["Pruning.FrameworksDisabled.Count"].Should().Be(1);
         }
 

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

@@ -3104,8 +3104,8 @@ await SimpleTestPackageUtility.CreateFolderFeedV3Async(
             projectInformationEvent["UpdatedMSBuildFiles"].Should().Be(false);
             projectInformationEvent["NETSdkVersion"].Should().Be(NuGetVersion.Parse("10.0.100"));
             projectInformationEvent["Pruning.FrameworksEnabled.Count"].Should().Be(0);
-            projectInformationEvent["Pruning.FrameworksDisabled.Count"].Should().Be(1);
-            projectInformationEvent["Pruning.FrameworksUnsupported.Count"].Should().Be(0);
+            projectInformationEvent["Pruning.FrameworksDisabled.Count"].Should().Be(0);
+            projectInformationEvent["Pruning.FrameworksUnsupported.Count"].Should().Be(1);
             projectInformationEvent["Pruning.DefaultEnabled"].Should().Be(false);
             projectInformationEvent["UsesLegacyPackagesDirectory"].Should().Be(false);
         }