Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2679,6 +2679,14 @@ public void PopulatePruningEnabledTelemetry_WithPruningDisabledByDefault_AndVari
},
}
},
""net9.0"": {
""dependencies"": {
""A"": {
""version"": ""[1.0.0,)"",
""target"": ""Package"",
},
}
},
}
}";

Expand All @@ -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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down