Fix tests now that package pruning is enabled by default

dotnet · Jan 29, 2025 · 10e515d · 10e515d
1 parent d4d0438
commit 10e515d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 23 deletions.
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.cs b/src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.cs
@@ -77,11 +77,6 @@ public static FrameworkPackages[] GetFrameworkPackages(NuGetFramework framework,
     {
         var frameworkPackages = new List<FrameworkPackages>();
 
-        if (frameworkReferences.Length == 0)
-        {
-            frameworkReferences = [DefaultFrameworkKey];
-        }
-
         foreach (var frameworkReference in frameworkReferences)
         {
             var frameworkKey = GetFrameworkKey(frameworkReference);

diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs
@@ -116,6 +116,10 @@ public void CompileConflictsAreNotRemovedFromRuntimeDepsAssets()
 
             testProject.PackageReferences.Add(new TestPackageReference("Microsoft.AspNetCore.Mvc.Razor", "2.1.0"));
 
+            //  This test relies on a package that would be pruned.  This doesn't seem to be a customer scenario, it looks like it was
+            //  an easier way to test that files that were removed 
+            testProject.AdditionalProperties["RestoreEnablePackagePruning"] = "false";
+
             var testAsset = _testAssetsManager.CreateTestProject(testProject);
 
             var buildCommand = new BuildCommand(testAsset);

diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs
@@ -78,12 +78,6 @@ public void compose_dependencies()
                "fluentassertions.json/4.12.0/lib/netstandard1.3/FluentAssertions.Json.dll"
                };
 
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // https://github.com/dotnet/core-setup/issues/2716 - an unintended native shim is getting published to the runtime store
-                files_on_disk.Add($"runtime.{_runtimeRid}.runtime.native.system.security.cryptography/1.0.1/runtimes/{_runtimeRid}/native/System.Security.Cryptography.Native{FileConstants.DynamicLibSuffix}");
-            }
-
             storeDirectory.Should().OnlyHaveFiles(files_on_disk);
         }
 
@@ -114,12 +108,6 @@ public void compose_dependencies_noopt()
                "fluentassertions.json/4.12.0/lib/netstandard1.3/FluentAssertions.Json.dll"
                };
 
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // https://github.com/dotnet/core-setup/issues/2716 - an unintended native shim is getting published to the runtime store
-                files_on_disk.Add($"runtime.{_runtimeRid}.runtime.native.system.security.cryptography/1.0.1/runtimes/{_runtimeRid}/native/System.Security.Cryptography.Native{FileConstants.DynamicLibSuffix}");
-            }
-
             storeDirectory.Should().OnlyHaveFiles(files_on_disk);
         }
 
@@ -157,12 +145,6 @@ public void compose_multifile()
                "fluentassertions.json/4.12.0/lib/netstandard1.3/FluentAssertions.Json.dll",
                };
 
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // https://github.com/dotnet/core-setup/issues/2716 - an unintended native shim is getting published to the runtime store
-                files_on_disk.Add($"runtime.{_runtimeRid}.runtime.native.system.security.cryptography/1.0.1/runtimes/{_runtimeRid}/native/System.Security.Cryptography.Native{FileConstants.DynamicLibSuffix}");
-            }
-
             storeDirectory.Should().OnlyHaveFiles(files_on_disk);
 
             var knownpackage = new HashSet<PackageIdentity>

diff --git a/test/dotnet-list-package.Tests/GivenDotnetListPackage.cs b/test/dotnet-list-package.Tests/GivenDotnetListPackage.cs
@@ -179,6 +179,10 @@ public static void Main(string[] args)
             };
 
             testProject.PackageReferences.Add(new TestPackageReference("NewtonSoft.Json", "9.0.1"));
+
+            //  Disable package pruning so that there are still transitive dependencies to test the command
+            testProject.AdditionalProperties["RestoreEnablePackagePruning"] = "false";
+
             var testAsset = _testAssetsManager.CreateTestProject(testProject);
             var projectDirectory = Path.Combine(testAsset.Path, testProject.Name);