dependabot-nuget 0.287.0 → 0.289.0

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

@@ -1,3 +1,5 @@
+using System.Collections.Immutable;
+using System.Runtime.InteropServices;
 using System.Text.Json;
 
 using NuGetUpdater.Core.Discover;
@@ -9,12 +11,28 @@ namespace NuGetUpdater.Core.Test.Discover;
 public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
 {
     [Theory]
-    [InlineData("src/project.csproj")]
-    [InlineData("src/project.vbproj")]
-    [InlineData("src/project.fsproj")]
-    public async Task TestProjectFiles(string projectPath)
+    [InlineData("src/project.csproj", true)]
+    [InlineData("src/project.csproj", false)]
+    [InlineData("src/project.vbproj", true)]
+    [InlineData("src/project.vbproj", false)]
+    [InlineData("src/project.fsproj", true)]
+    [InlineData("src/project.fsproj", false)]
+    public async Task TestProjectFiles(string projectPath, bool useDirectDiscovery)
     {
+        var expectedDependencies = new List<Dependency>()
+        {
+            new Dependency("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true)
+        };
+        if (useDirectDiscovery && Path.GetExtension(projectPath)! == ".fsproj")
+        {
+            // this package ships with the SDK and is automatically added for F# projects but should be manually added here to make the test consistent
+            // only direct package discovery finds this, though
+            expectedDependencies.Add(new Dependency("FSharp.Core", "9.0.100", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true));
+        }
+
+        var experimentsManager = new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery };
         await TestDiscoveryAsync(
+            experimentsManager: experimentsManager,
             packages:
             [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
@@ -43,26 +61,77 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
                     {
                         FilePath = Path.GetFileName(projectPath),
                         TargetFrameworks = ["net8.0"],
+                        Dependencies = expectedDependencies.ToImmutableArray(),
+                        Properties = [
+                            new("SomePackageVersion", "9.0.1", projectPath),
+                            new("TargetFramework", "net8.0", projectPath),
+                        ],
                         ReferencedProjectPaths = [],
-                        ExpectedDependencyCount = 2,
+                        ImportedFiles = [],
+                        AdditionalFiles = [],
+                    }
+                ]
+            }
+        );
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public async Task FindDependenciesFromSDKProjectsWithDesktopTFM(bool useDirectDiscovery)
+    {
+        var experimentsManager = new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery };
+        await TestDiscoveryAsync(
+            experimentsManager: experimentsManager,
+            packages:
+            [
+                MockNuGetPackage.CreateSimplePackage("Some.Package", "1.2.3", "net472"),
+            ],
+            workspacePath: "src",
+            files:
+            [
+                ("src/project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net472</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="1.2.3" />
+                      </ItemGroup>
+                    </Project>
+                    """)
+            ],
+            expectedResult: new()
+            {
+                Path = "src",
+                Projects = [
+                    new()
+                    {
+                        FilePath = "project.csproj",
+                        TargetFrameworks = ["net472"],
                         Dependencies = [
-                            new("Microsoft.NET.Sdk", null, DependencyType.MSBuildSdk),
-                            new("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true)
+                            new("Some.Package", "1.2.3", DependencyType.PackageReference, TargetFrameworks: ["net472"], IsDirect: true)
                         ],
                         Properties = [
-                            new("SomePackageVersion", "9.0.1", projectPath),
-                            new("TargetFramework", "net8.0", projectPath),
-                        ]
+                            new("TargetFramework", "net472", "src/project.csproj"),
+                        ],
+                        ReferencedProjectPaths = [],
+                        ImportedFiles = [],
+                        AdditionalFiles = [],
                     }
                 ]
             }
         );
     }
 
-    [Fact]
-    public async Task TestDependencyWithTrailingSpacesInAttribute()
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public async Task TestDependencyWithTrailingSpacesInAttribute(bool useDirectDiscovery)
     {
+        var experimentsManager = new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery };
         await TestDiscoveryAsync(
+            experimentsManager: experimentsManager,
             packages:
             [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
@@ -91,16 +160,16 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
                     {
                         FilePath = "project.csproj",
                         TargetFrameworks = ["net8.0"],
-                        ReferencedProjectPaths = [],
-                        ExpectedDependencyCount = 2,
                         Dependencies = [
-                            new("Microsoft.NET.Sdk", null, DependencyType.MSBuildSdk),
                             new("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true)
                         ],
                         Properties = [
                             new("SomePackageVersion", "9.0.1", "src/project.csproj"),
                             new("TargetFramework", "net8.0", "src/project.csproj"),
-                        ]
+                        ],
+                        ReferencedProjectPaths = [],
+                        ImportedFiles = [],
+                        AdditionalFiles = [],
                     }
                 ]
             }
@@ -116,6 +185,7 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
                 MockNuGetPackage.CreateSimplePackage("Some.Package2", "9.0.1", "net8.0"),
             ],
+            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
             workspacePath: "src",
             files: new[]
             {
@@ -141,16 +211,119 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
                         FilePath = "project.csproj",
                         TargetFrameworks = ["net8.0"],
                         ReferencedProjectPaths = [],
-                        ExpectedDependencyCount = 3,
                         Dependencies = [
-                            new("Microsoft.NET.Sdk", null, DependencyType.MSBuildSdk),
                             new("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
                             new("Some.Package2", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
                         ],
                         Properties = [
                             new("SomePackageVersion", "9.0.1", "src/project.csproj"),
                             new("TargetFramework", "net8.0", "src/project.csproj"),
-                        ]
+                        ],
+                        ImportedFiles = [],
+                        AdditionalFiles = [],
+                    }
+                ]
+            }
+        );
+    }
+
+    [LinuxOnlyFact]
+    public async Task TestDependenciesCaseSensitiveProjectPaths()
+    {
+        await TestDiscoveryAsync(
+            packages:
+            [
+                MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
+            ],
+            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
+            workspacePath: "src",
+            files: new[]
+            {
+                ("src/test/project1/project1.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                      </PropertyGroup>
+
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="9.0.1" />
+                      </ItemGroup>
+                    </Project>
+                    """),
+                ("src/TEST/project2/project2.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                      </PropertyGroup>
+
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="9.0.1" />
+                      </ItemGroup>
+                    </Project>
+                    """),
+                // Add solution files
+                ("src/solution.sln", """
+                    Microsoft Visual Studio Solution File, Format Version 12.00
+                    # Visual Studio 14
+                    VisualStudioVersion = 14.0.22705.0
+                    MinimumVisualStudioVersion = 10.0.40219.1
+                    Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "project1", "test\project1\project1.csproj", "{782E0C0A-10D3-444D-9640-263D03D2B20C}"
+                    EndProject
+                    Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "project2", "test\project2\project2.csproj", "{782E0C0A-10D3-444D-9640-263D03D2B20D}"
+                    EndProject
+                    Global
+                      GlobalSection(SolutionConfigurationPlatforms) = preSolution
+                        Debug|Any CPU = Debug|Any CPU
+                        Release|Any CPU = Release|Any CPU
+                      EndGlobalSection
+                      GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                        {782E0C0A-10D3-444D-9640-263D03D2B20C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                        {782E0C0A-10D3-444D-9640-263D03D2B20C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                        {782E0C0A-10D3-444D-9640-263D03D2B20C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                        {782E0C0A-10D3-444D-9640-263D03D2B20C}.Release|Any CPU.Build.0 = Release|Any CPU
+                        {782E0C0A-10D3-444D-9640-263D03D2B20D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                        {782E0C0A-10D3-444D-9640-263D03D2B20D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                        {782E0C0A-10D3-444D-9640-263D03D2B20D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                        {782E0C0A-10D3-444D-9640-263D03D2B20D}.Release|Any CPU.Build.0 = Release|Any CPU
+                      EndGlobalSection
+                      GlobalSection(SolutionProperties) = preSolution
+                        HideSolutionNode = FALSE
+                      EndGlobalSection
+                    EndGlobal
+                    """)
+
+            },
+            expectedResult: new()
+            {
+                Path = "src",
+                Projects = [
+                    new()
+                    {
+                        FilePath = "test/project1/project1.csproj",
+                        TargetFrameworks = ["net8.0"],
+                        ReferencedProjectPaths = [],
+                        Dependencies = [
+                            new("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
+                        ],
+                        Properties = [
+                            new("TargetFramework", "net8.0", "src/test/project1/project1.csproj"),
+                        ],
+                        ImportedFiles = [],
+                        AdditionalFiles = [],
+                    },
+                    new()
+                    {
+                        FilePath = "TEST/project2/project2.csproj",
+                        TargetFrameworks = ["net8.0"],
+                        ReferencedProjectPaths = [],
+                        Dependencies = [
+                            new("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
+                        ],
+                        Properties = [
+                            new("TargetFramework", "net8.0", "src/TEST/project2/project2.csproj"),
+                        ],
+                        ImportedFiles = [],
+                        AdditionalFiles = [],
                     }
                 ]
             }
@@ -166,6 +339,7 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
                 MockNuGetPackage.CreateSimplePackage("Some.Package2", "9.0.1", "net8.0"),
             ],
+            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
             workspacePath: "src",
             files: new[]
             {
@@ -191,26 +365,30 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
                         FilePath = "project.csproj",
                         TargetFrameworks = ["net8.0"],
                         ReferencedProjectPaths = [],
-                        ExpectedDependencyCount = 3,
                         Dependencies = [
-                            new("Microsoft.NET.Sdk", null, DependencyType.MSBuildSdk),
                             new("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
                             new("Some.Package2", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
                         ],
                         Properties = [
                             new("SomePackageVersion", "9.0.1", "src/project.csproj"),
                             new("TargetFramework", "net8.0", "src/project.csproj"),
-                        ]
+                        ],
+                        ImportedFiles = [],
+                        AdditionalFiles = [],
                     }
                 ]
             }
         );
     }
 
-    [Fact]
-    public async Task TestPackageConfig()
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public async Task TestPackageConfig(bool useDirectDiscovery)
     {
+        var experimentsManager = new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery };
         await TestDiscoveryAsync(
+            experimentsManager: experimentsManager,
             packages:
             [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "7.0.1", "net45"),
@@ -250,15 +428,15 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
                     {
                         FilePath = "project.csproj",
                         TargetFrameworks = ["net45"],
-                        ReferencedProjectPaths = [],
-                        ExpectedDependencyCount = 2,
                         Dependencies = [
-                            new("Microsoft.NETFramework.ReferenceAssemblies", "1.0.3", DependencyType.Unknown, TargetFrameworks: ["net45"], IsTransitive: true),
                             new("Some.Package", "7.0.1", DependencyType.PackagesConfig, TargetFrameworks: ["net45"]),
                         ],
-                        Properties = [
-                            new("TargetFrameworkVersion", "v4.5", "src/project.csproj"),
-                        ]
+                        Properties = [],
+                        ReferencedProjectPaths = [],
+                        ImportedFiles = [],
+                        AdditionalFiles = [
+                            "packages.config",
+                        ],
                     }
                 ]
             }
@@ -266,9 +444,10 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
     }
 
     [Fact]
-    public async Task TestProps()
+    public async Task TestProps_DirectDiscovery()
     {
         await TestDiscoveryAsync(
+            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
             packages:
             [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
@@ -304,44 +483,103 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
             expectedResult: new()
             {
                 Path = "src",
-                ExpectedProjectCount = 2,
                 Projects = [
                     new()
                     {
                         FilePath = "project.csproj",
                         TargetFrameworks = ["net8.0"],
+                        Dependencies = [
+                            new("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true)
+                        ],
+                        Properties = [
+                            new("TargetFramework", "net8.0", "src/project.csproj")
+                        ],
                         ReferencedProjectPaths = [],
-                        ExpectedDependencyCount = 2,
+                        ImportedFiles = [
+                            "../Directory.Build.props",
+                            "../Directory.Packages.props",
+                        ],
+                        AdditionalFiles = [],
+                    }
+                ],
+            }
+        );
+    }
+
+    [Fact]
+    public async Task TestProps_NoDirectDiscovery()
+    {
+        await TestDiscoveryAsync(
+            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = false },
+            packages:
+            [
+                MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
+            ],
+            workspacePath: "src",
+            files: new[]
+            {
+                ("src/project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                      </PropertyGroup>
+
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" />
+                      </ItemGroup>
+                    </Project>
+                    """),
+                ("Directory.Build.props", "<Project />"),
+                ("Directory.Packages.props", """
+                    <Project>
+                      <PropertyGroup>
+                        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+                        <SomePackageVersion>9.0.1</SomePackageVersion>
+                      </PropertyGroup>
+
+                      <ItemGroup>
+                        <PackageVersion Include="Some.Package" Version="$(SomePackageVersion)" />
+                      </ItemGroup>
+                    </Project>
+                    """)
+            },
+            expectedResult: new()
+            {
+                Path = "src",
+                Projects = [
+                    new()
+                    {
+                        FilePath = "project.csproj",
+                        TargetFrameworks = ["net8.0"],
                         Dependencies = [
-                            new("Microsoft.NET.Sdk", null, DependencyType.MSBuildSdk),
                             new("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true)
                         ],
                         Properties = [
                             new("ManagePackageVersionsCentrally", "true", "Directory.Packages.props"),
                             new("SomePackageVersion", "9.0.1", "Directory.Packages.props"),
-                            new("TargetFramework", "net8.0", "src/project.csproj"),
-                        ]
+                            new("TargetFramework", "net8.0", "src/project.csproj")
+                        ],
+                        ReferencedProjectPaths = [],
+                        ImportedFiles = [
+                            "../Directory.Build.props",
+                            "../Directory.Packages.props",
+                        ],
+                        AdditionalFiles = [],
                     }
                 ],
-                DirectoryPackagesProps = new()
-                {
-                    FilePath = "../Directory.Packages.props",
-                    Dependencies = [
-                        new("Some.Package", "9.0.1", DependencyType.PackageVersion, IsDirect: true)
-                    ],
-                }
             }
         );
     }
 
     [Fact]
-    public async Task TestRepo()
+    public async Task TestRepo_DirectDiscovery()
     {
         var solutionPath = "solution.sln";
         await TestDiscoveryAsync(
+            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
             packages:
             [
-                MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
+                MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net7.0"),
             ],
             workspacePath: "",
             files: new[]
@@ -429,31 +667,26 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
             expectedResult: new()
             {
                 Path = "",
-                ExpectedProjectCount = 2,
                 Projects = [
                     new()
                     {
                         FilePath = "src/project.csproj",
                         TargetFrameworks = ["net7.0", "net8.0"],
-                        ExpectedDependencyCount = 2,
                         Dependencies = [
-                            new("Microsoft.NET.Sdk", null, DependencyType.MSBuildSdk),
-                            new("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net7.0", "net8.0"], IsDirect: true)
+                            new("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net7.0"], IsDirect: true),
+                            new("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
                         ],
                         Properties = [
-                            new("ManagePackageVersionsCentrally", "true", "Directory.Packages.props"),
-                            new("SomePackageVersion", "9.0.1", "Directory.Packages.props"),
-                            new("TargetFrameworks", "net7.0;net8.0", "src/project.csproj"),
-                        ]
+                            new("TargetFrameworks", "net7.0;net8.0", "src/project.csproj")
+                        ],
+                        ReferencedProjectPaths = [],
+                        ImportedFiles = [
+                            "../Directory.Build.props",
+                            "../Directory.Packages.props",
+                        ],
+                        AdditionalFiles = [],
                     }
                 ],
-                DirectoryPackagesProps = new()
-                {
-                    FilePath = "Directory.Packages.props",
-                    Dependencies = [
-                        new("Some.Package", "9.0.1", DependencyType.PackageVersion, IsDirect: true)
-                    ],
-                },
                 GlobalJson = new()
                 {
                     FilePath = "global.json",
@@ -538,31 +771,27 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
             expectedResult: new()
             {
                 Path = "",
-                ExpectedProjectCount = 2,
                 Projects = [
                     new()
                     {
                         FilePath = "src/project.csproj",
                         TargetFrameworks = ["net7.0", "net8.0"],
-                        ExpectedDependencyCount = 2,
                         Dependencies = [
-                            new("Microsoft.NET.Sdk", null, DependencyType.MSBuildSdk),
                             new("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net7.0", "net8.0"], IsDirect: true)
                         ],
                         Properties = [
                             new("ManagePackageVersionsCentrally", "true", "Directory.Packages.props"),
                             new("SomePackageVersion", "9.0.1", "Directory.Packages.props"),
                             new("TargetFrameworks", "net7.0;net8.0", "src/project.csproj"),
-                        ]
+                        ],
+                        ReferencedProjectPaths = [],
+                        ImportedFiles = [
+                            "../Directory.Build.props",
+                            "../Directory.Packages.props",
+                        ],
+                        AdditionalFiles = [],
                     }
                 ],
-                DirectoryPackagesProps = new()
-                {
-                    FilePath = "Directory.Packages.props",
-                    Dependencies = [
-                        new("Some.Package", "9.0.1", DependencyType.PackageVersion, IsDirect: true)
-                    ],
-                },
             }
         );
     }
@@ -615,39 +844,177 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
             expectedResult: new()
             {
                 Path = "",
-                ExpectedProjectCount = 2,
                 Projects = [
                     new()
+                    {
+                        FilePath = "src/project.csproj",
+                        TargetFrameworks = ["net7.0", "net8.0"],
+                        Dependencies = [
+                            new("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net7.0", "net8.0"], IsDirect: true)
+                        ],
+                        Properties = [
+                            new("ManagePackageVersionsCentrally", "true", "Directory.Packages.props"),
+                            new("SomePackageVersion", "9.0.1", "Directory.Packages.props"),
+                            new("TargetFrameworks", "net7.0;net8.0", "src/project.csproj"),
+                        ],
+                        ReferencedProjectPaths = [],
+                        ImportedFiles = [
+                            "../Directory.Build.props",
+                            "../Directory.Packages.props",
+                        ],
+                        AdditionalFiles = [],
+                    }
+                ],
+            }
+        );
+    }
+
+    [Fact]
+    public async Task TestRepo_NoDirectDiscovery()
+    {
+        var solutionPath = "solution.sln";
+        await TestDiscoveryAsync(
+            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = false },
+            packages:
+            [
+                MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net7.0"),
+            ],
+            workspacePath: "",
+            files: new[]
+            {
+                ("src/project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+                      </PropertyGroup>
+
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" />
+                      </ItemGroup>
+                    </Project>
+                    """),
+                ("Directory.Build.props", "<Project />"),
+                ("Directory.Packages.props", """
+                    <Project>
+                      <PropertyGroup>
+                        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+                        <SomePackageVersion>9.0.1</SomePackageVersion>
+                      </PropertyGroup>
+
+                      <ItemGroup>
+                        <PackageVersion Include="Some.Package" Version="$(SomePackageVersion)" />
+                      </ItemGroup>
+                    </Project>
+                    """),
+                (solutionPath, """
+                    Microsoft Visual Studio Solution File, Format Version 12.00
+                    # Visual Studio 14
+                    VisualStudioVersion = 14.0.22705.0
+                    MinimumVisualStudioVersion = 10.0.40219.1
+                    Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "project", ".\src\project.csproj", "{782E0C0A-10D3-444D-9640-263D03D2B20C}"
+                    EndProject
+                    Global
+                      GlobalSection(SolutionConfigurationPlatforms) = preSolution
+                        Debug|Any CPU = Debug|Any CPU
+                        Release|Any CPU = Release|Any CPU
+                      EndGlobalSection
+                      GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                        {782E0C0A-10D3-444D-9640-263D03D2B20C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                        {782E0C0A-10D3-444D-9640-263D03D2B20C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                        {782E0C0A-10D3-444D-9640-263D03D2B20C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                        {782E0C0A-10D3-444D-9640-263D03D2B20C}.Release|Any CPU.Build.0 = Release|Any CPU
+                      EndGlobalSection
+                      GlobalSection(SolutionProperties) = preSolution
+                        HideSolutionNode = FALSE
+                      EndGlobalSection
+                    EndGlobal
+                    """),
+                ("global.json", """
+                    {
+                      "sdk": {
+                        "version": "6.0.405",
+                        "rollForward": "latestPatch"
+                      },
+                      "msbuild-sdks": {
+                        "My.Custom.Sdk": "5.0.0",
+                        "My.Other.Sdk": "1.0.0-beta"
+                      }
+                    }
+                    """),
+                (".config/dotnet-tools.json", """
+                    {
+                      "version": 1,
+                      "isRoot": true,
+                      "tools": {
+                        "microsoft.botsay": {
+                          "version": "1.0.0",
+                          "commands": [
+                            "botsay"
+                          ]
+                        },
+                        "dotnetsay": {
+                          "version": "2.1.3",
+                          "commands": [
+                            "dotnetsay"
+                          ]
+                        }
+                      }
+                    }
+                    """),
+            },
+            expectedResult: new()
+            {
+                Path = "",
+                Projects = [
+                    new()
+                    {
+                        FilePath = "src/project.csproj",
+                        TargetFrameworks = ["net7.0", "net8.0"],
+                        Dependencies = [
+                            new("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net7.0", "net8.0"], IsDirect: true),
+                        ],
+                        Properties = [
+                            new("ManagePackageVersionsCentrally", "true", "Directory.Packages.props"),
+                            new("SomePackageVersion", "9.0.1", "Directory.Packages.props"),
+                            new("TargetFrameworks", "net7.0;net8.0", "src/project.csproj")
+                        ],
+                        ReferencedProjectPaths = [],
+                        ImportedFiles = [
+                            "../Directory.Build.props",
+                            "../Directory.Packages.props",
+                        ],
+                        AdditionalFiles = [],
+                    }
+                ],
+                GlobalJson = new()
                 {
-                    FilePath = "src/project.csproj",
-                    TargetFrameworks = ["net7.0", "net8.0"],
-                    ExpectedDependencyCount = 2,
+                    FilePath = "global.json",
                     Dependencies = [
-                        new("Microsoft.NET.Sdk", null, DependencyType.MSBuildSdk),
-                        new("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net7.0", "net8.0"], IsDirect: true)
-                    ],
-                    Properties = [
-                        new("ManagePackageVersionsCentrally", "true", "Directory.Packages.props"),
-                        new("SomePackageVersion", "9.0.1", "Directory.Packages.props"),
-                        new("TargetFrameworks", "net7.0;net8.0", "src/project.csproj"),
+                        new("Microsoft.NET.Sdk", "6.0.405", DependencyType.MSBuildSdk),
+                        new("My.Custom.Sdk", "5.0.0", DependencyType.MSBuildSdk),
+                        new("My.Other.Sdk", "1.0.0-beta", DependencyType.MSBuildSdk),
                     ]
-                }
-                ],
-                DirectoryPackagesProps = new()
+                },
+                DotNetToolsJson = new()
                 {
-                    FilePath = "Directory.Packages.props",
+                    FilePath = ".config/dotnet-tools.json",
                     Dependencies = [
-                        new("Some.Package", "9.0.1", DependencyType.PackageVersion, IsDirect: true)
-                    ],
-                },
+                        new("microsoft.botsay", "1.0.0", DependencyType.DotNetTool),
+                        new("dotnetsay", "2.1.3", DependencyType.DotNetTool),
+                    ]
+                }
             }
         );
     }
 
-    [Fact]
-    public async Task NonSupportedProjectExtensionsAreSkipped()
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public async Task NonSupportedProjectExtensionsAreSkipped(bool useDirectDiscovery)
     {
+        var experimentsManager = new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery };
         await TestDiscoveryAsync(
+            experimentsManager: experimentsManager,
             packages:
             [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net8.0"),
@@ -712,15 +1079,15 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
                     {
                         FilePath = "src/supported.csproj",
                         TargetFrameworks = ["net8.0"],
-                        ReferencedProjectPaths = [],
-                        ExpectedDependencyCount = 2,
                         Dependencies = [
-                            new("Microsoft.NET.Sdk", null, DependencyType.MSBuildSdk),
                             new("Some.Package", "1.0.0", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true)
                         ],
                         Properties = [
                             new("TargetFramework", "net8.0", @"src/supported.csproj"),
-                        ]
+                        ],
+                        ReferencedProjectPaths = [],
+                        ImportedFiles = [],
+                        AdditionalFiles = [],
                     }
                 ]
             }
@@ -756,8 +1123,10 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
         Assert.Equal("<some package feed>", errorDetails.GetString());
     }
 
-    [Fact]
-    public async Task ReportsPrivateSourceAuthenticationFailure()
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public async Task ReportsPrivateSourceAuthenticationFailure(bool useDirectDiscovery)
     {
         static (int, string) TestHttpHandler(string uriString)
         {
@@ -789,8 +1158,19 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
                 _ => (401, "{}"),
             };
         }
+        // override various nuget locations
+        using var tempDir = new TemporaryDirectory();
+        using var _ = new TemporaryEnvironment(
+        [
+            ("NUGET_PACKAGES", Path.Combine(tempDir.DirectoryPath, "NUGET_PACKAGES")),
+            ("NUGET_HTTP_CACHE_PATH", Path.Combine(tempDir.DirectoryPath, "NUGET_HTTP_CACHE_PATH")),
+            ("NUGET_SCRATCH", Path.Combine(tempDir.DirectoryPath, "NUGET_SCRATCH")),
+            ("NUGET_PLUGINS_CACHE_PATH", Path.Combine(tempDir.DirectoryPath, "NUGET_PLUGINS_CACHE_PATH")),
+        ]);
         using var http = TestHttpServer.CreateTestStringServer(TestHttpHandler);
+        var experimentsManager = new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery };
         await TestDiscoveryAsync(
+            experimentsManager: experimentsManager,
             workspacePath: "",
             files:
             [