dependabot-nuget 0.321.3 → 0.322.1

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.Project.cs

@@ -7,10 +7,9 @@ public partial class DiscoveryWorkerTests
     public class Projects : DiscoveryWorkerTestBase
     {
         [Fact]
-        public async Task TargetFrameworksAreHonoredInConditions_DirectDiscovery()
+        public async Task TargetFrameworksAreHonoredInConditions()
         {
             await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Package.A", "1.0.0", "net7.0"),
@@ -70,74 +69,9 @@ public partial class DiscoveryWorkerTests
         }
 
         [Fact]
-        public async Task TargetFrameworksAreHonoredInConditions_TemporaryProjectDiscovery()
+        public async Task WithDirectoryBuildPropsAndTargets()
         {
             await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = false },
-                packages:
-                [
-                    MockNuGetPackage.CreateSimplePackage("Package.A", "1.0.0", "net7.0"),
-                    MockNuGetPackage.CreateSimplePackage("Package.B", "2.0.0", "net7.0"),
-                ],
-                workspacePath: "",
-                files: [
-                    ("myproj.csproj", """
-                        <Project Sdk="Microsoft.NET.Sdk">
-                          <PropertyGroup>
-                            <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
-                          </PropertyGroup>
-                          <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
-                            <PackageReference Include="Package.A" />
-                            <PackageReference Include="Package.B" />
-                          </ItemGroup>
-                        </Project>
-                        """),
-                    ("Directory.Build.props", "<Project />"),
-                    ("Directory.Packages.props", """
-                        <Project>
-                          <PropertyGroup>
-                            <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-                          </PropertyGroup>
-                          <ItemGroup>
-                            <PackageVersion Include="Package.A" Version="1.0.0" />
-                            <PackageVersion Include="Package.B" Version="2.0.0" />
-                          </ItemGroup>
-                        </Project>
-                        """),
-                ],
-                expectedResult: new()
-                {
-                    Path = "",
-                    Projects = [
-                        new()
-                        {
-                            FilePath = "myproj.csproj",
-                            Dependencies = [
-                                new("Package.A", "1.0.0", DependencyType.PackageReference, TargetFrameworks: ["net7.0", "net8.0"], IsDirect: true),
-                                new("Package.B", "2.0.0", DependencyType.PackageReference, TargetFrameworks: ["net7.0", "net8.0"], IsDirect: true),
-                            ],
-                            Properties = [
-                                new("ManagePackageVersionsCentrally", "true", "Directory.Packages.props"),
-                                new("TargetFrameworks", "net7.0;net8.0", "myproj.csproj"),
-                            ],
-                            TargetFrameworks = ["net7.0", "net8.0"],
-                            ReferencedProjectPaths = [],
-                            ImportedFiles = [
-                                "Directory.Build.props",
-                                "Directory.Packages.props",
-                            ],
-                            AdditionalFiles = [],
-                        },
-                    ],
-                }
-            );
-        }
-
-        [Fact]
-        public async Task WithDirectoryBuildPropsAndTargets_DirectDiscovery()
-        {
-            await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Package.A", "1.2.3", "net8.0"),
@@ -204,80 +138,9 @@ public partial class DiscoveryWorkerTests
         }
 
         [Fact]
-        public async Task WithDirectoryBuildPropsAndTargets_TemporaryProjectDiscovery()
-        {
-            await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = false },
-                packages:
-                [
-                    MockNuGetPackage.CreateSimplePackage("Package.A", "1.2.3", "net8.0"),
-                    MockNuGetPackage.CreateSimplePackage("Package.B", "4.5.6", "net8.0"),
-                ],
-                workspacePath: "",
-                files: [
-                    ("project.csproj", """
-                        <Project Sdk="Microsoft.NET.Sdk">
-                          <PropertyGroup>
-                            <OutputType>Exe</OutputType>
-                            <TargetFramework>net8.0</TargetFramework>
-                            <ImplicitUsings>enable</ImplicitUsings>
-                            <Nullable>enable</Nullable>
-                          </PropertyGroup>
-                        </Project>
-                        """),
-                    ("Directory.Build.props", """
-                        <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-                          <ItemGroup>
-                            <PackageReference Include="Package.A" Version="1.2.3" />
-                          </ItemGroup>
-                        </Project>
-                        """),
-                    ("Directory.Build.targets", """
-                        <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-                          <ItemGroup>
-                            <PackageReference Include="Package.B" Version="4.5.6">
-                              <PrivateAssets>all</PrivateAssets>
-                              <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-                            </PackageReference>
-                          </ItemGroup>
-                        </Project>
-                        """),
-                ],
-                expectedResult: new()
-                {
-                    Path = "",
-                    Projects = [
-                        new()
-                        {
-                            FilePath = "project.csproj",
-                            Dependencies = [
-                                new("Package.A", "1.2.3", DependencyType.PackageReference, TargetFrameworks: ["net8.0"]),
-                                new("Package.B", "4.5.6", DependencyType.PackageReference, TargetFrameworks: ["net8.0"]),
-                            ],
-                            Properties = [
-                                new("ImplicitUsings", "enable", "project.csproj"),
-                                new("Nullable", "enable", "project.csproj"),
-                                new("OutputType", "Exe", "project.csproj"),
-                                new("TargetFramework", "net8.0", "project.csproj"),
-                            ],
-                            TargetFrameworks = ["net8.0"],
-                            ReferencedProjectPaths = [],
-                            ImportedFiles = [
-                                "Directory.Build.props",
-                                "Directory.Build.targets"
-                            ],
-                            AdditionalFiles = [],
-                        }
-                    ],
-                }
-            );
-        }
-
-        [Fact]
-        public async Task WithGlobalPackageReference_DirectDiscovery()
+        public async Task WithGlobalPackageReference()
         {
             await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Global.Package", "1.2.3", "net8.0"),
@@ -328,64 +191,9 @@ public partial class DiscoveryWorkerTests
         }
 
         [Fact]
-        public async Task WithGlobalPackageReference_TemporaryProjectDiscovery()
+        public async Task WithPackagesProps()
         {
             await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = false },
-                packages:
-                [
-                    MockNuGetPackage.CreateSimplePackage("Global.Package", "1.2.3", "net8.0"),
-                ],
-                workspacePath: "",
-                files:
-                [
-                    ("project.csproj", """
-                        <Project Sdk="Microsoft.NET.Sdk">
-                          <PropertyGroup>
-                            <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-                            <TargetFramework>net8.0</TargetFramework>
-                          </PropertyGroup>
-                        </Project>
-                        """),
-                    ("Directory.Packages.props", """
-                        <Project>
-                          <ItemGroup>
-                            <GlobalPackageReference Include="Global.Package" Version="1.2.3" />
-                          </ItemGroup>
-                        </Project>
-                        """),
-                ],
-                expectedResult: new()
-                {
-                    Path = "",
-                    Projects = [
-                        new()
-                        {
-                            FilePath = "project.csproj",
-                            Dependencies = [
-                                new("Global.Package", "1.2.3", DependencyType.GlobalPackageReference, TargetFrameworks: ["net8.0"]),
-                            ],
-                            Properties = [
-                                new("ManagePackageVersionsCentrally", "true", "project.csproj"),
-                                new("TargetFramework", "net8.0", "project.csproj"),
-                            ],
-                            TargetFrameworks = ["net8.0"],
-                            ReferencedProjectPaths = [],
-                            ImportedFiles = [
-                                "Directory.Packages.props"
-                            ],
-                            AdditionalFiles = [],
-                        },
-                    ],
-                }
-            );
-        }
-
-        [Fact]
-        public async Task WithPackagesProps_DirectDiscovery()
-        {
-            await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
                 packages:
                 [
                     MockNuGetPackage.CentralPackageVersionsPackage,
@@ -451,80 +259,9 @@ public partial class DiscoveryWorkerTests
         }
 
         [Fact]
-        public async Task WithPackagesProps_TemporaryProjectDiscovery()
-        {
-            await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = false },
-                packages:
-                [
-                    MockNuGetPackage.CentralPackageVersionsPackage,
-                    MockNuGetPackage.CreateSimplePackage("Package.A", "1.2.3", "net7.0"),
-                    MockNuGetPackage.CreateSimplePackage("Package.B", "4.5.6", "net7.0"),
-                    MockNuGetPackage.CreateSimplePackage("Global.Package", "7.8.9", "net7.0"),
-                ],
-                workspacePath: "",
-                files: [
-                    ("myproj.csproj", """
-                        <Project Sdk="Microsoft.NET.Sdk">
-                          <PropertyGroup>
-                            <TargetFramework>net7.0</TargetFramework>
-                          </PropertyGroup>
-                          <ItemGroup>
-                            <PackageReference Include="Package.A" Version="1.2.3" />
-                            <PackageReference Include="Package.B" />
-                          </ItemGroup>
-                        </Project>
-                        """),
-                    ("Packages.props", """
-                        <Project Sdk="Microsoft.NET.Sdk">
-                          <ItemGroup>
-                            <GlobalPackageReference Include="Global.Package" Version="7.8.9" />
-                            <PackageReference Update="@(GlobalPackageReference)" PrivateAssets="Build" />
-                            <PackageReference Update="Package.B" Version="4.5.6" />
-                          </ItemGroup>
-                        </Project>
-                        """),
-                    ("Directory.Build.targets", """
-                        <Project>
-                          <!-- this forces `Packages.props` to be imported -->
-                          <Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.1.3" />
-                        </Project>
-                        """),
-                ],
-                expectedResult: new()
-                {
-                    Path = "",
-                    Projects = [
-                        new()
-                        {
-                            FilePath = "myproj.csproj",
-                            ExpectedDependencyCount = 4,
-                            Dependencies = [
-                                new("Package.A", "1.2.3", DependencyType.PackageReference, TargetFrameworks: ["net7.0"], IsDirect: true),
-                                new("Package.B", "4.5.6", DependencyType.PackageReference, TargetFrameworks: ["net7.0"], IsDirect: true),
-                                new("Global.Package", "7.8.9", DependencyType.GlobalPackageReference, TargetFrameworks: ["net7.0"]),
-                            ],
-                            Properties = [
-                                new("TargetFramework", "net7.0", "myproj.csproj"),
-                            ],
-                            TargetFrameworks = ["net7.0"],
-                            ReferencedProjectPaths = [],
-                            ImportedFiles = [
-                                "Directory.Build.targets",
-                                "Packages.props",
-                            ],
-                            AdditionalFiles = [],
-                        },
-                    ],
-                }
-            );
-        }
-
-        [Fact]
-        public async Task ReturnsDependenciesThatCannotBeEvaluated_DirectDiscovery()
+        public async Task ReturnsDependenciesThatCannotBeEvaluated()
         {
             await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Package.A", "1.2.3", "net8.0"),
@@ -569,58 +306,9 @@ public partial class DiscoveryWorkerTests
         }
 
         [Fact]
-        public async Task ReturnsDependenciesThatCannotBeEvaluated_TemporaryProjectDiscovery()
+        public async Task TargetFrameworkCanBeResolvedFromImplicitlyImportedFile()
         {
             await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = false },
-                packages:
-                [
-                    MockNuGetPackage.CreateSimplePackage("Package.A", "1.2.3", "net8.0"),
-                    MockNuGetPackage.CreateSimplePackage("Package.B", "4.5.6", "net8.0"),
-                ],
-                workspacePath: "",
-                files: [
-                    ("myproj.csproj", """
-                        <Project Sdk="Microsoft.NET.Sdk">
-                          <PropertyGroup>
-                            <TargetFramework>net8.0</TargetFramework>
-                          </PropertyGroup>
-                          <ItemGroup>
-                            <PackageReference Include="Package.A" Version="1.2.3" />
-                            <PackageReference Include="Package.B" Version="$(ThisPropertyCannotBeResolved)" />
-                          </ItemGroup>
-                        </Project>
-                        """)
-                ],
-                expectedResult: new()
-                {
-                    Path = "",
-                    Projects = [
-                        new()
-                        {
-                            FilePath = "myproj.csproj",
-                            ExpectedDependencyCount = 2,
-                            Dependencies = [
-                                new("Package.A", "1.2.3", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
-                            ],
-                            Properties = [
-                                new("TargetFramework", "net8.0", "myproj.csproj"),
-                            ],
-                            TargetFrameworks = ["net8.0"],
-                            ReferencedProjectPaths = [],
-                            ImportedFiles = [],
-                            AdditionalFiles = [],
-                        }
-                    ],
-                }
-            );
-        }
-
-        [Fact]
-        public async Task TargetFrameworkCanBeResolvedFromImplicitlyImportedFile_DirectDiscovery()
-        {
-            await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Package.A", "1.2.3", "net8.0"),
@@ -671,68 +359,9 @@ public partial class DiscoveryWorkerTests
         }
 
         [Fact]
-        public async Task TargetFrameworkCanBeResolvedFromImplicitlyImportedFile_TemporaryProjectDiscovery()
-        {
-            await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = false },
-                packages:
-                [
-                    MockNuGetPackage.CreateSimplePackage("Package.A", "1.2.3", "net8.0"),
-                ],
-                workspacePath: "",
-                files: [
-                    ("myproj.csproj", """
-                        <Project Sdk="Microsoft.NET.Sdk">
-                          <PropertyGroup>
-                            <TargetFramework>$(SomeTfm)</TargetFramework>
-                          </PropertyGroup>
-                          <ItemGroup>
-                            <PackageReference Include="Package.A" Version="1.2.3" />
-                          </ItemGroup>
-                        </Project>
-                        """),
-                    ("Directory.Build.props", """
-                        <Project>
-                          <PropertyGroup>
-                            <SomeTfm>net8.0</SomeTfm>
-                          </PropertyGroup>
-                        </Project>
-                        """)
-                ],
-                expectedResult: new()
-                {
-                    Path = "",
-                    Projects = [
-                        new()
-                        {
-                            FilePath = "myproj.csproj",
-                            Dependencies = [
-                                new("Package.A", "1.2.3", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
-                            ],
-                            Properties = [
-                                new("SomeTfm", "net8.0", "Directory.Build.props"),
-                                new("TargetFramework", "$(SomeTfm)", "myproj.csproj"),
-                            ],
-                            TargetFrameworks = ["net8.0"],
-                            ReferencedProjectPaths = [],
-                            ImportedFiles = [
-                                "Directory.Build.props"
-                            ],
-                            AdditionalFiles = [],
-                        }
-                    ],
-                }
-            );
-        }
-
-        [Theory]
-        [InlineData(true)]
-        [InlineData(false)]
-
-        public async Task NoDependenciesReturnedIfNoTargetFrameworkCanBeResolved(bool useDirectDiscovery)
+        public async Task NoDependenciesReturnedIfNoTargetFrameworkCanBeResolved()
         {
             await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery },
                 packages: [],
                 workspacePath: "",
                 files: [
@@ -759,7 +388,6 @@ public partial class DiscoveryWorkerTests
         public async Task WildcardVersionNumberIsResolved()
         {
             await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Some.Package", "1.2.3", "net8.0"),
@@ -801,10 +429,9 @@ public partial class DiscoveryWorkerTests
         }
 
         [Fact]
-        public async Task DiscoverReportsTransitivePackageVersionsWithFourPartsForMultipleTargetFrameworks_DirectDiscovery()
+        public async Task DiscoverReportsTransitivePackageVersionsWithFourPartsForMultipleTargetFrameworks()
         {
             await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
                 packages:
                 [
                     new("Some.Package", "1.2.3.4", Files: [("lib/net7.0/Some.Package.dll", Array.Empty<byte>()), ("lib/net8.0/Some.Package.dll", Array.Empty<byte>())], DependencyGroups: [(null, [("Transitive.Dependency", "5.6.7.8")])]),
@@ -849,58 +476,9 @@ public partial class DiscoveryWorkerTests
         }
 
         [Fact]
-        public async Task DiscoverReportsTransitivePackageVersionsWithFourPartsForMultipleTargetFrameworks_TemporaryProjectDiscovery()
+        public async Task DiscoverReportsPackagesThroughProjectReferenceElements()
         {
             await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = false },
-                packages:
-                [
-                    new("Some.Package", "1.2.3.4", Files: [("lib/net7.0/Some.Package.dll", Array.Empty<byte>()), ("lib/net8.0/Some.Package.dll", Array.Empty<byte>())], DependencyGroups: [(null, [("Transitive.Dependency", "5.6.7.8")])]),
-                    new("Transitive.Dependency", "5.6.7.8", Files: [("lib/net7.0/Transitive.Dependency.dll", Array.Empty<byte>()), ("lib/net8.0/Transitive.Dependency.dll", Array.Empty<byte>())]),
-                ],
-                workspacePath: "",
-                files:
-                [
-                    ("myproj.csproj", """
-                        <Project Sdk="Microsoft.NET.Sdk">
-                          <PropertyGroup>
-                            <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
-                          </PropertyGroup>
-                          <ItemGroup>
-                            <PackageReference Include="Some.Package" Version="1.2.3.4" />
-                          </ItemGroup>
-                        </Project>
-                        """)
-                ],
-                expectedResult: new()
-                {
-                    Path = "",
-                    Projects = [
-                        new()
-                        {
-                            FilePath = "myproj.csproj",
-                            Dependencies = [
-                                new("Some.Package", "1.2.3.4", DependencyType.PackageReference, TargetFrameworks: ["net7.0", "net8.0"], IsDirect: true),
-                                new("Transitive.Dependency", "5.6.7.8", DependencyType.Unknown, TargetFrameworks: ["net7.0", "net8.0"], IsTransitive: true),
-                            ],
-                            Properties = [
-                                new("TargetFrameworks", "net7.0;net8.0", "myproj.csproj"),
-                            ],
-                            TargetFrameworks = ["net7.0", "net8.0"],
-                            ReferencedProjectPaths = [],
-                            ImportedFiles = [],
-                            AdditionalFiles = [],
-                        }
-                    ],
-                }
-            );
-        }
-
-        [Fact]
-        public async Task DiscoverReportsPackagesThroughProjectReferenceElements_DirectDiscovery()
-        {
-            await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Package.A", "1.2.3", "net8.0"),
@@ -973,82 +551,6 @@ public partial class DiscoveryWorkerTests
             );
         }
 
-        [Fact]
-        public async Task DiscoverReportsPackagesThroughProjectReferenceElements_TemporaryProjectDiscovery()
-        {
-            await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = false },
-                packages:
-                [
-                    MockNuGetPackage.CreateSimplePackage("Package.A", "1.2.3", "net8.0"),
-                    MockNuGetPackage.CreateSimplePackage("Package.B", "4.5.6", "net8.0"),
-                ],
-                workspacePath: "test",
-                files:
-                [
-                    ("test/unit-tests.csproj", """
-                        <Project Sdk="Microsoft.NET.Sdk">
-                          <PropertyGroup>
-                            <TargetFramework>net8.0</TargetFramework>
-                          </PropertyGroup>
-                          <ItemGroup>
-                            <ProjectReference Include="..\src\helpers.csproj" />
-                          </ItemGroup>
-                          <ItemGroup>
-                            <PackageReference Include="Package.A" Version="1.2.3" />
-                          </ItemGroup>
-                        </Project>
-                        """),
-                    ("src/helpers.csproj", """
-                        <Project Sdk="Microsoft.NET.Sdk">
-                          <PropertyGroup>
-                            <TargetFramework>net8.0</TargetFramework>
-                          </PropertyGroup>
-                          <ItemGroup>
-                            <PackageReference Include="Package.B" Version="4.5.6" />
-                          </ItemGroup>
-                        </Project>
-                        """)
-                ],
-                expectedResult: new()
-                {
-                    Path = "test",
-                    Projects = [
-                        new()
-                        {
-                            FilePath = "unit-tests.csproj",
-                            Dependencies = [
-                                new("Package.A", "1.2.3", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true)
-                            ],
-                            ReferencedProjectPaths = [
-                                "../src/helpers.csproj",
-                            ],
-                            Properties = [
-                                new("TargetFramework", "net8.0", @"test/unit-tests.csproj"),
-                            ],
-                            TargetFrameworks = ["net8.0"],
-                            ImportedFiles = [],
-                            AdditionalFiles = [],
-                        },
-                        new()
-                        {
-                            FilePath = "../src/helpers.csproj",
-                            Dependencies = [
-                                new("Package.B", "4.5.6", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true)
-                            ],
-                            Properties = [
-                                new("TargetFramework", "net8.0", @"src/helpers.csproj"),
-                            ],
-                            TargetFrameworks = ["net8.0"],
-                            ReferencedProjectPaths = [],
-                            ImportedFiles = [],
-                            AdditionalFiles = [],
-                        }
-                    ]
-                }
-            );
-        }
-
         [Fact]
         public async Task DiscoverReportsPackagesThroughSolutionFilesNotInTheSameDirectoryTreeAsTheProjects()
         {
@@ -1118,7 +620,6 @@ public partial class DiscoveryWorkerTests
         public async Task WindowsSpecificProjectAndWindowsSpecificDependency()
         {
             await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
                 packages: [
                     MockNuGetPackage.CreateSimplePackage("Some.Os.Package", "1.2.3", "net6.0-windows7.0")
                 ],
@@ -1159,10 +660,9 @@ public partial class DiscoveryWorkerTests
         }
 
         [Fact]
-        public async Task DiscoveryWithTargetPlaformVersion_DirectDiscovery()
+        public async Task DiscoveryWithTargetPlaformVersion()
         {
             await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Some.Package", "1.2.3", "net8.0"),
@@ -1205,58 +705,9 @@ public partial class DiscoveryWorkerTests
         }
 
         [Fact]
-        public async Task DiscoveryWithTargetPlaformVersion_TemporaryProjectDiscovery()
-        {
-            await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = false },
-                packages:
-                [
-                    MockNuGetPackage.CreateSimplePackage("Some.Package", "1.2.3", "net8.0"),
-                ],
-                workspacePath: "src",
-                files:
-                [
-                    ("src/project.csproj", """
-                        <Project Sdk="Microsoft.NET.Sdk">
-                          <PropertyGroup>
-                            <TargetFrameworks>net8.0-ios;net8.0-android;net8.0-macos;net8.0-maccatalyst</TargetFrameworks>
-                          </PropertyGroup>
-                          <ItemGroup>
-                            <PackageReference Include="Some.Package" Version="1.2.3" />
-                          </ItemGroup>
-                        </Project>
-                        """),
-                ],
-                expectedResult: new()
-                {
-                    Path = "src",
-                    Projects = [
-                        new()
-                        {
-                            FilePath = "project.csproj",
-                            Dependencies = [
-                                new("Some.Package", "1.2.3", DependencyType.PackageReference, TargetFrameworks: ["net8.0-android", "net8.0-ios", "net8.0-maccatalyst", "net8.0-macos"], IsDirect: true)
-                            ],
-                            Properties = [
-                                new("TargetFrameworks", "net8.0-ios;net8.0-android;net8.0-macos;net8.0-maccatalyst", @"src/project.csproj"),
-                            ],
-                            TargetFrameworks = ["net8.0-android", "net8.0-ios", "net8.0-maccatalyst", "net8.0-macos"],
-                            ReferencedProjectPaths = [],
-                            ImportedFiles = [],
-                            AdditionalFiles = [],
-                        }
-                    ]
-                }
-            );
-        }
-
-        [Theory]
-        [InlineData(true)]
-        [InlineData(false)]
-        public async Task PackageLockJsonFileIsReported(bool useDirectDiscovery)
+        public async Task PackageLockJsonFileIsReported()
         {
             await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery },
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Some.Package", "1.2.3", "net8.0"),
@@ -1328,14 +779,14 @@ public partial class DiscoveryWorkerTests
                         }
                     }
                 }
-                """);
+                """, TestContext.Current.CancellationToken);
             using var tempEnvironment = new TemporaryEnvironment([("DOTNET_PACKAGE_CORRELATION_FILE_PATH", packageCorrelationFile)]);
 
             // The SDK package handling is detected in a very specific circumstance; an assembly being removed from the
             // `@(References)` item group in the `_HandlePackageFileConflicts` target.  Since we don't want to involve
             // the real SDK, we fake some required targets.
             await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { InstallDotnetSdks = true, UseDirectDiscovery = true },
+                experimentsManager: new ExperimentsManager() { InstallDotnetSdks = true },
                 packages: [],
                 workspacePath: "",
                 files:
@@ -1421,7 +872,6 @@ public partial class DiscoveryWorkerTests
             // can't resolve the transitive dependencies; only the VS project system can, so there are some manual steps to allow
             // dependency discovery.
             await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
                 packages: [
                     MockNuGetPackage.CreateSimplePackage("Some.Dependency", "1.0.0", "net48", [(null, [("Some.Transitive.Dependency", "2.0.0")])]),
                     MockNuGetPackage.CreateSimplePackage("Some.Transitive.Dependency", "2.0.0", "net48"),