dependabot-nuget 0.352.0 → 0.353.0

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/UpdateHandlers/RefreshVersionUpdatePullRequestHandler.cs

@@ -30,7 +30,7 @@ internal class RefreshVersionUpdatePullRequestHandler : IUpdateHandler
     {
         var repoContentsPath = caseInsensitiveRepoContentsPath ?? originalRepoContentsPath;
         var jobDependencies = job.Dependencies.ToHashSet(StringComparer.OrdinalIgnoreCase);
-        foreach (var directory in job.GetAllDirectories())
+        foreach (var directory in job.GetAllDirectories(repoContentsPath.FullName))
         {
             var discoveryResult = await discoveryWorker.RunAsync(repoContentsPath.FullName, directory);
             logger.ReportDiscovery(discoveryResult);
@@ -81,7 +81,7 @@ internal class RefreshVersionUpdatePullRequestHandler : IUpdateHandler
                 var dependencyName = dependencyUpdatesToPerform.Key;
                 var dependencyInfosToUpdate = dependencyUpdatesToPerform.Value
                     .Where(o => !job.IsDependencyIgnoredByNameOnly(o.Dependency.Name))
-                    .Select(o => (o.ProjectPath, o.Dependency, RunWorker.GetDependencyInfo(job, o.Dependency, allowCooldown: true)))
+                    .Select(o => (o.ProjectPath, o.Dependency, RunWorker.GetDependencyInfo(job, o.Dependency, groupMatchers: [], allowCooldown: true)))
                     .ToArray();
 
                 foreach (var (projectPath, dependency, dependencyInfo) in dependencyInfosToUpdate)

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/PackageReferenceUpdater.cs

@@ -108,7 +108,7 @@ internal static class PackageReferenceUpdater
         return [.. updateOperations];
     }
 
-    private static async Task<(Dictionary<string, HashSet<string>> PackageParents, Dictionary<string, NuGetVersion> PackageVersions)> GetPackageGraphForDependencies(string repoRoot, string projectPath, string targetFramework, ImmutableArray<Dependency> topLevelDependencies, ILogger logger)
+    internal static async Task<(Dictionary<string, HashSet<string>> PackageParents, Dictionary<string, NuGetVersion> PackageVersions)> GetPackageGraphForDependencies(string repoRoot, string projectPath, string targetFramework, ImmutableArray<Dependency> topLevelDependencies, ILogger logger)
     {
         var packageParents = new Dictionary<string, HashSet<string>>(StringComparer.OrdinalIgnoreCase);
         var packageVersions = new Dictionary<string, NuGetVersion>(StringComparer.OrdinalIgnoreCase);
@@ -117,37 +117,34 @@ internal static class PackageReferenceUpdater
         {
             // generate project.assets.json
             var parsedTargetFramework = NuGetFramework.Parse(targetFramework);
-            var tempProject = await MSBuildHelper.CreateTempProjectAsync(tempDir, repoRoot, projectPath, targetFramework, topLevelDependencies, logger, importDependencyTargets: false);
-            var (exitCode, stdOut, stdErr) = await ProcessEx.RunDotnetWithoutMSBuildEnvironmentVariablesAsync(["build", tempProject, "/t:_ReportDependencies"], tempDir.FullName);
+            var tempProject = await MSBuildHelper.CreateTempProjectAsync(tempDir, repoRoot, projectPath, targetFramework, topLevelDependencies, logger, importDependencyTargets: true);
+            var (exitCode, stdOut, stdErr) = await ProcessEx.RunDotnetWithoutMSBuildEnvironmentVariablesAsync(["msbuild", tempProject, "/t:Restore,GenerateBuildDependencyFile"], tempDir.FullName);
             var assetsJsonPath = Path.Join(tempDir.FullName, "obj", "project.assets.json");
             var assetsJsonContent = await File.ReadAllTextAsync(assetsJsonPath);
 
             // build reverse dependency graph
             var assets = JsonDocument.Parse(assetsJsonContent).RootElement;
-            foreach (var tfmObject in assets.GetProperty("targets").EnumerateObject())
+            var tfmObjects = assets.GetProperty("targets").EnumerateObject().ToImmutableArray();
+            if (tfmObjects.Length != 1)
             {
-                var reportedTargetFramework = NuGetFramework.Parse(tfmObject.Name);
-                if (reportedTargetFramework != parsedTargetFramework)
-                {
-                    // not interested in this target framework
-                    continue;
-                }
+                logger.Error($"Expected exactly one target framework group compatible with {targetFramework} but found {tfmObjects.Length}.  Values: {tfmObjects.Select(t => t.Name)}");
+                return (packageParents, packageVersions);
+            }
 
-                foreach (var parentObject in tfmObject.Value.EnumerateObject())
-                {
-                    var parts = parentObject.Name.Split('/');
-                    var parentName = parts[0];
-                    var parentVersion = parts[1];
-                    packageVersions[parentName] = NuGetVersion.Parse(parentVersion);
+            foreach (var parentObject in tfmObjects[0].Value.EnumerateObject())
+            {
+                var parts = parentObject.Name.Split('/');
+                var parentName = parts[0];
+                var parentVersion = parts[1];
+                packageVersions[parentName] = NuGetVersion.Parse(parentVersion);
 
-                    if (parentObject.Value.TryGetProperty("dependencies", out var dependencies))
+                if (parentObject.Value.TryGetProperty("dependencies", out var dependencies))
+                {
+                    foreach (var childObject in dependencies.EnumerateObject())
                     {
-                        foreach (var childObject in dependencies.EnumerateObject())
-                        {
-                            var childName = childObject.Name;
-                            var parentSet = packageParents.GetOrAdd(childName, () => new(StringComparer.OrdinalIgnoreCase));
-                            parentSet.Add(parentName);
-                        }
+                        var childName = childObject.Name;
+                        var parentSet = packageParents.GetOrAdd(childName, () => new(StringComparer.OrdinalIgnoreCase));
+                        parentSet.Add(parentName);
                     }
                 }
             }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/MSBuildHelper.cs

@@ -493,7 +493,7 @@ internal static partial class MSBuildHelper
             var topLevelPackagesNames = packages.Select(p => p.Name).ToHashSet(StringComparer.OrdinalIgnoreCase);
             var tempProjectPath = await CreateTempProjectAsync(tempDirectory, repoRoot, projectPath, targetFramework, packages, logger, importDependencyTargets: false);
 
-            var experimentsManager = new ExperimentsManager() { UseSingleRestore = false }; // single restore is meaningless here
+            var experimentsManager = new ExperimentsManager();
             var projectDiscovery = await SdkProjectDiscovery.DiscoverAsync(repoRoot, tempDirectory.FullName, tempProjectPath, experimentsManager, logger);
             var allDependencies = projectDiscovery
                 .Where(p => p.FilePath == Path.GetFileName(tempProjectPath))
@@ -545,6 +545,37 @@ internal static partial class MSBuildHelper
         return targets;
     }
 
+    internal static async Task<ImmutableArray<string>> GetProjectTargetFrameworksAsync(string projectPath, ILogger logger)
+    {
+        var extension = Path.GetExtension(projectPath)?.ToLowerInvariant();
+        if (extension == ".sln" || extension == ".slnx")
+        {
+            // solution files don't specify target frameworks, so we can skip the process invocation
+            return [];
+        }
+
+        var projectDirectory = Path.GetDirectoryName(projectPath)!;
+        var args = new[]
+        {
+            "msbuild",
+            projectPath,
+            "-getProperty:TargetFrameworks"
+        };
+
+        var (exitCode, stdOut, stdErr) = await ProcessEx.RunDotnetWithoutMSBuildEnvironmentVariablesAsync(args, projectDirectory);
+        if (exitCode != 0)
+        {
+            logger.Warn($"Unable to determine target frameworks for project [{projectPath}]:\nSTDOUT:\n{stdOut}\nSTDERR:\n{stdErr}\n");
+            return [];
+        }
+
+        var tfms = Regex.Replace(stdOut, "@[\r\n\t ]", "")
+            .Split(';', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
+            .OrderBy(t => t)
+            .ToImmutableArray();
+        return tfms;
+    }
+
     internal static string? GetMissingFile(string output)
     {
         var missingFilePatterns = new[]
@@ -571,6 +602,7 @@ internal static partial class MSBuildHelper
         ThrowOnTimeout(output);
         ThrowOnBadResponse(output);
         ThrowOnUnparseableFile(output);
+        ThrowOnMultipleProjectsForPackagesConfig(output);
     }
 
     private static void ThrowOnUnauthenticatedFeed(string stdout)
@@ -704,6 +736,14 @@ internal static partial class MSBuildHelper
         }
     }
 
+    private static void ThrowOnMultipleProjectsForPackagesConfig(string output)
+    {
+        if (output.Contains("Found multiple project files for "))
+        {
+            throw new Exception("Multiple project files found for single packages.config");
+        }
+    }
+
     internal static bool TryGetGlobalJsonPath(string repoRootPath, string workspacePath, [NotNullWhen(returnValue: true)] out string? globalJsonPath)
     {
         globalJsonPath = PathHelper.GetFileInDirectoryOrParent(workspacePath, repoRootPath, "global.json", caseSensitive: false);

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/PathHelper.cs

@@ -1,4 +1,6 @@
+using System.Collections.Immutable;
 using System.Runtime.InteropServices;
+using System.Text;
 using System.Text.RegularExpressions;
 
 namespace NuGetUpdater.Core;
@@ -248,4 +250,95 @@ internal static class PathHelper
 
         return candidateFilePath.StartsWith(directoryPath);
     }
+
+    public static ImmutableArray<string> GetMatchingDirectoriesUnder(string rootDirectory, string searchPattern, bool caseSensitive)
+    {
+        // translate pattern to regex
+        searchPattern = searchPattern.Replace("\\", "/"); // unix-style paths make things easier
+        searchPattern = searchPattern.TrimStart('/'); // pattern shouldn't be rooted
+        if (searchPattern == string.Empty)
+        {
+            searchPattern = "/"; // special case repo root
+        }
+
+        var pb = new StringBuilder();
+        pb.Append('^');
+        var appendAnchor = true;
+        for (int i = 0; i < searchPattern.Length; i++)
+        {
+            // special case recursive wildcard
+            if (searchPattern[i..] == "/**/*")
+            {
+                pb.Append("($|/.*$)"); // capture just this directory and every subdirectory
+                appendAnchor = false;
+                break;
+            }
+
+            var c = searchPattern[i];
+            switch (c)
+            {
+                case '*':
+                    // could be single level or multi-level
+                    var isRecursiveMatch = i < searchPattern.Length - 2
+                        && searchPattern[i + 1] == '*'
+                        && searchPattern[i + 2] == '/';
+                    if (isRecursiveMatch)
+                    {
+                        // match anything
+                        pb.Append(".*");
+                        i += 2; // consume the extra characters
+                    }
+                    else
+                    {
+                        // only match up to a directory separator
+                        pb.Append("[^/]*");
+                    }
+                    break;
+                case '?':
+                    pb.Append(".");
+                    break;
+                case '/':
+                    pb.Append("/");
+                    break;
+                default:
+                    if ("+()^$.{}[]|\\".Contains(c))
+                    {
+                        pb.Append('\\');
+                    }
+                    pb.Append(c);
+                    break;
+            }
+        }
+
+        if (appendAnchor)
+        {
+            pb.Append('$');
+        }
+
+        var pattern = new Regex(pb.ToString(), caseSensitive ? RegexOptions.IgnoreCase : RegexOptions.None);
+
+        // find all directories
+        var allDirectories = Directory.EnumerateDirectories(rootDirectory, "*", SearchOption.AllDirectories)
+            .Select(d => Path.GetRelativePath(rootDirectory, d).NormalizePathToUnix())
+            .ToImmutableArray();
+
+        // filter
+        var matchingDirectories = allDirectories.Where(pattern.IsMatch)
+            .OrderBy(d => d, caseSensitive ? StringComparer.Ordinal : StringComparer.OrdinalIgnoreCase)
+            .Select(d => d.EnsurePrefix("/")) // paths must appear rooted from here on out
+            .ToImmutableArray();
+
+        // special case some well-known directories that are hard to generate patterns for
+        switch (searchPattern)
+        {
+            case "/":
+            case ".":
+            case "/.":
+            case "**/*":
+                matchingDirectories = [.. matchingDirectories.Prepend("/")];
+                break;
+        }
+
+        return matchingDirectories;
+    }
 }

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

@@ -61,13 +61,10 @@ public partial class DiscoveryWorkerTests
             );
         }
 
-        [Theory]
-        [InlineData(true)]
-        [InlineData(false)]
-        public async Task DiscoveryIsMergedWithPackageReferences(bool useSingleRestore)
+        [Fact]
+        public async Task DiscoveryIsMergedWithPackageReferences()
         {
             await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseSingleRestore = useSingleRestore },
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Package.A", "1.0.0", "net46"),

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

@@ -626,7 +626,7 @@ public partial class DiscoveryWorkerTests
                     ("src/project.csproj", """
                         <Project Sdk="Microsoft.NET.Sdk">
                           <PropertyGroup>
-                            <TargetFrameworks>net8.0-ios;net8.0-android;net8.0-macos;net8.0-maccatalyst;net8.0-windows</TargetFrameworks>
+                            <TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-macos;net8.0-windows</TargetFrameworks>
                           </PropertyGroup>
                           <ItemGroup>
                             <PackageReference Include="Some.Package" Version="1.2.3" />
@@ -645,7 +645,7 @@ public partial class DiscoveryWorkerTests
                                 new("Some.Package", "1.2.3", DependencyType.PackageReference, TargetFrameworks: ["net8.0-android", "net8.0-ios", "net8.0-maccatalyst", "net8.0-macos", "net8.0-windows"], IsDirect: true),
                             ],
                             Properties = [
-                                new("TargetFrameworks", "net8.0-ios;net8.0-android;net8.0-macos;net8.0-maccatalyst;net8.0-windows", @"src/project.csproj"),
+                                new("TargetFrameworks", "net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-macos;net8.0-windows", @"src/project.csproj"),
                             ],
                             TargetFrameworks = ["net8.0-android", "net8.0-ios", "net8.0-maccatalyst", "net8.0-macos", "net8.0-windows"],
                             ReferencedProjectPaths = [],
@@ -737,7 +737,7 @@ public partial class DiscoveryWorkerTests
 
             // 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.
+            // the real SDK, we fake some required targets in the same shape as the real SDK.
             await TestDiscoveryAsync(
                 packages: [],
                 workspacePath: "",
@@ -764,6 +764,14 @@ public partial class DiscoveryWorkerTests
                             <Reference Include="@(RuntimeCopyLocalItems)" />
                           </ItemGroup>
 
+                          <Target Name="ResolveProjectReferences">
+                            <!-- this target needs to exist for discovery to work -->
+                          </Target>
+
+                          <Target Name="Restore">
+                            <!-- this target needs to exist for discovery to work -->
+                          </Target>
+
                           <Target Name="_HandlePackageFileConflicts">
                             <!-- this target needs to exist for discovery to work -->
                             <ItemGroup>
@@ -775,21 +783,25 @@ public partial class DiscoveryWorkerTests
                             </ItemGroup>
                           </Target>
 
-                          <Target Name="ResolveAssemblyReferences" DependsOnTargets="_HandlePackageFileConflicts">
+                          <Target Name="ResolvePackageAssets">
                             <!-- this target needs to exist for discovery to work -->
                           </Target>
 
-                          <Target Name="GenerateBuildDependencyFile">
+                          <Target Name="ResolveFrameworkReferences" DependsOnTargets="ResolvePackageAssets">
+                            <!-- this target needs to exist for discovery to work -->
+                          </Target>
+
+                          <Target Name="ResolveRuntimePackAssets" DependsOnTargets="ResolveFrameworkReferences">
+                            <!-- this target needs to exist for discovery to work -->
+                          </Target>
+
+                          <Target Name="GenerateBuildDependencyFile" DependsOnTargets="_HandlePackageFileConflicts;ResolveRuntimePackAssets">
                             <!-- this target needs to exist for discovery to work -->
                             <ItemGroup>
                               <!-- this removal is what removes the regular package reference from the project -->
                               <RuntimeCopyLocalItems Remove="TestOnlyAssembly.dll" />
                             </ItemGroup>
                           </Target>
-
-                          <Target Name="ResolvePackageAssets">
-                            <!-- this target needs to exist for discovery to work -->
-                          </Target>
                         </Project>
                         """)
                 ],

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

@@ -1,6 +1,8 @@
 using System.Collections.Immutable;
 using System.Text.Json;
 
+using Microsoft.Build.Evaluation;
+
 using NuGetUpdater.Core.Discover;
 using NuGetUpdater.Core.Run.ApiModel;
 using NuGetUpdater.Core.Test.Utilities;
@@ -164,13 +166,10 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
         );
     }
 
-    [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public async Task TestDependenciesSeparatedBySemicolon(bool useSingleRestore)
+    [Fact]
+    public async Task TestDependenciesSeparatedBySemicolon()
     {
         await TestDiscoveryAsync(
-            experimentsManager: new ExperimentsManager() { UseSingleRestore = useSingleRestore },
             packages:
             [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
@@ -369,13 +368,10 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
         );
     }
 
-    [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public async Task TestPackageConfig(bool useSingleRestore)
+    [Fact]
+    public async Task TestPackageConfig()
     {
         await TestDiscoveryAsync(
-            experimentsManager: new ExperimentsManager() { UseSingleRestore = useSingleRestore },
             packages:
             [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "7.0.1", "net45"),
@@ -492,14 +488,11 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
         );
     }
 
-    [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public async Task TestRepo(bool useSingleRestore)
+    [Fact]
+    public async Task TestRepo()
     {
         var solutionPath = "solution.sln";
         await TestDiscoveryAsync(
-            experimentsManager: new ExperimentsManager() { UseSingleRestore = useSingleRestore },
             packages:
             [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net7.0"),
@@ -625,13 +618,10 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
         );
     }
 
-    [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public async Task TestRepo_Sln(bool useSingleRestore)
+    [Fact]
+    public async Task TestRepo_Sln()
     {
         await TestDiscoveryAsync(
-            experimentsManager: new ExperimentsManager() { UseSingleRestore = useSingleRestore },
             packages: [
                 MockNuGetPackage.CreateSimplePackage("Package.A", "1.2.3", "net8.0"),
                 MockNuGetPackage.CreateSimplePackage("Package.B", "4.5.6", "net8.0"),
@@ -721,14 +711,11 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
         );
     }
 
-    [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public async Task TestRepo_Slnx(bool useSingleRestore)
+    [Fact]
+    public async Task TestRepo_Slnx()
     {
         var solutionPath = "solution.slnx";
         await TestDiscoveryAsync(
-            experimentsManager: new ExperimentsManager() { UseSingleRestore = useSingleRestore },
             packages:
             [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net7.0"),
@@ -864,77 +851,6 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
         );
     }
 
-    [Fact]
-    public async Task TestDirsProj_CasingMismatchIsResolved()
-    {
-        var dirsProjPath = "dirs.proj";
-        await TestDiscoveryAsync(
-            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>
-                """),
-            // Introduce a casing difference in the project reference
-            (dirsProjPath, """
-                <Project>
-                  <ItemGroup>
-                    <ProjectReference Include="SRC/PROJECT.CSPROJ" />
-                  </ItemGroup>
-                </Project>
-                """)
-            },
-            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("TargetFrameworks", "net7.0;net8.0", "src/project.csproj"),
-                        ],
-                        ReferencedProjectPaths = [],
-                        ImportedFiles = [
-                            "../Directory.Build.props",
-                            "../Directory.Packages.props",
-                        ],
-                        AdditionalFiles = [],
-                    }
-                ],
-            }
-        );
-    }
-
     [Fact]
     public async Task NonSupportedProjectExtensionsAreSkipped()
     {
@@ -1619,20 +1535,23 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
         );
     }
 
-    [Theory]
-    [InlineData(@"..\project2\project2.csproj")] // relative
-    [InlineData(@"$(MSBuildThisFileDirectory)..\project2\project2.csproj")] // absolute
-    public async Task ExpandEntryPoints(string projectReferencePath)
+    [Fact]
+    public async Task ExpandEntryPoints()
     {
         using var tempDir = await TemporaryDirectory.CreateWithContentsAsync(
+            ("src/dirs.proj", """
+                <Project>
+                  <ItemGroup>
+                    <ProjectFile Include="project1\project1.csproj" /><!-- relative -->
+                    <ProjectFile Include="$(MSBuildThisFileDirectory)project2\project2.csproj" /><!-- absolute -->
+                  </ItemGroup>
+                </Project>
+                """),
             ("src/project1/project1.csproj", $"""
                 <Project Sdk="Microsoft.NET.Sdk">
                   <PropertyGroup>
                     <TargetFramework>net9.0</TargetFramework>
                   </PropertyGroup>
-                  <ItemGroup>
-                    <ProjectReference Include="{projectReferencePath}" />
-                  </ItemGroup>
                 </Project>
                 """),
             ("src/project2/project2.csproj", """
@@ -1643,7 +1562,7 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
                 </Project>
                 """)
         );
-        var actualEntryPoints = (await DiscoveryWorker.ExpandEntryPointsIntoProjectsAsync([Path.Combine(tempDir.DirectoryPath, "src/project1/project1.csproj")], new ExperimentsManager()))
+        var actualEntryPoints = (await DiscoveryWorker.ExpandEntryPointsIntoProjectsAsync([Path.Combine(tempDir.DirectoryPath, "src/dirs.proj")], new ExperimentsManager()))
             .Select(p => p.NormalizePathToUnix())
             .ToArray();
         var expectedEntryPoints = new[]

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

@@ -580,63 +580,12 @@ public class SdkProjectDiscoveryTests : DiscoveryWorkerTestBase
         );
     }
 
-    [Fact]
-    public async Task ExistingPackageIncompatibilityShouldNotPreventRestore()
-    {
-        // Package.A tries to pull in a transitive dependency of Transitive.Package/2.0.0 but that package is explicitly pinned at 1.0.0
-        // Normally this would cause a restore failure which means discovery would also fail
-        // This test ensures we can still run discovery
-        await TestDiscoverAsync(
-            useSingleRestore: false,
-            packages: [
-                MockNuGetPackage.CreateSimplePackage("Package.A", "1.0.0", "net8.0", [(null, [("Transitive.Package", "2.0.0")])]),
-                MockNuGetPackage.CreateSimplePackage("Transitive.Package", "1.0.0", "net8.0"),
-                MockNuGetPackage.CreateSimplePackage("Transitive.Package", "2.0.0", "net8.0"),
-            ],
-            startingDirectory: "src",
-            projectPath: "src/library.csproj",
-            files: [
-                ("src/library.csproj", """
-                    <Project Sdk="Microsoft.NET.Sdk">
-                      <PropertyGroup>
-                        <TargetFramework>net8.0</TargetFramework>
-                      </PropertyGroup>
-                      <ItemGroup>
-                        <PackageReference Include="Package.A" Version="1.0.0" />
-                        <PackageReference Include="Transitive.Package" Version="1.0.0" />
-                      </ItemGroup>
-                    </Project>
-                    """)
-            ],
-            expectedProjects: [
-                new()
-                {
-                    FilePath = "library.csproj",
-                    Dependencies =
-                    [
-                        new("Package.A", "1.0.0", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
-                        new("Transitive.Package", "1.0.0", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true)
-                    ],
-                    ImportedFiles = [],
-                    Properties =
-                    [
-                        new("TargetFramework", "net8.0", "src/library.csproj"),
-                    ],
-                    TargetFrameworks = ["net8.0"],
-                    ReferencedProjectPaths = [],
-                    AdditionalFiles = [],
-                }
-            ]
-        );
-    }
-
     [Fact]
     public async Task DependenciesCanBeDiscoveredWithoutCompiling_FromProjectWithSingleTfm()
     {
         using var tempDir = new TemporaryDirectory();
         var errorSentinelPath = Path.Combine(tempDir.DirectoryPath, "error-sentinel.txt");
         await TestDiscoverAsync(
-            useSingleRestore: true,
             startingDirectory: "src",
             packages: [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net8.0"),
@@ -691,7 +640,6 @@ public class SdkProjectDiscoveryTests : DiscoveryWorkerTestBase
         using var tempDir = new TemporaryDirectory();
         var errorSentinelPath = Path.Combine(tempDir.DirectoryPath, "error-sentinel.txt");
         await TestDiscoverAsync(
-            useSingleRestore: true,
             startingDirectory: "src",
             packages: [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net8.0"),
@@ -747,19 +695,6 @@ public class SdkProjectDiscoveryTests : DiscoveryWorkerTestBase
         ImmutableArray<ExpectedSdkProjectDiscoveryResult> expectedProjects,
         MockNuGetPackage[]? packages = null
     )
-    {
-        await TestDiscoverAsync(useSingleRestore: true, startingDirectory, projectPath, files, expectedProjects, packages);
-        await TestDiscoverAsync(useSingleRestore: false, startingDirectory, projectPath, files, expectedProjects, packages);
-    }
-
-    private static async Task TestDiscoverAsync(
-        bool useSingleRestore,
-        string startingDirectory,
-        string projectPath,
-        TestFile[] files,
-        ImmutableArray<ExpectedSdkProjectDiscoveryResult> expectedProjects,
-        MockNuGetPackage[]? packages = null
-    )
     {
         using var testDirectory = await TemporaryDirectory.CreateWithContentsAsync(files);
 
@@ -767,7 +702,7 @@ public class SdkProjectDiscoveryTests : DiscoveryWorkerTestBase
 
         var logger = new TestLogger();
         var fullProjectPath = Path.Combine(testDirectory.DirectoryPath, projectPath);
-        var experimentsManager = new ExperimentsManager() { UseSingleRestore = useSingleRestore };
+        var experimentsManager = new ExperimentsManager();
         var projectDiscovery = await SdkProjectDiscovery.DiscoverAsync(testDirectory.DirectoryPath, Path.GetDirectoryName(fullProjectPath)!, fullProjectPath, experimentsManager, logger);
         ValidateProjectResults(expectedProjects, projectDiscovery);
     }