dependabot-nuget 0.287.0 → 0.288.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bb2d903f08322511a7917fba47df7b66208dbbaca42e52d30a1954f9ef3eaa2
-  data.tar.gz: f19cfed3ad2939c93812727546b53ecec603c712641a6c1d0581469cce72d584
+  metadata.gz: 970779cacdfb8250a46cf1c24ac9fcda325b69b1502c3f0e99b9f1bf80a1add8
+  data.tar.gz: a8c7a1b0aba00354ffdb35a8903e912d60ce00e73521f53b76b5f20458194e2f
 SHA512:
-  metadata.gz: a3fdc15bd985678106cf45f57c6af6dd4be57858f54b50abea6f4521a8aed3ab66b7ca67cb54f9e73dabe536d8c012619bbf049662207211bc92cbb5e938c321
-  data.tar.gz: 3542f489f10b67fe78b3bd55703cc420a58279bf5fb131da4a99be0d99a20fcd7430b124c4b49100929b74f39178b3c7e108e7bb0170baef5f5a91a16dfbd63f
+  metadata.gz: 0ae55b0bfbfa8874ef9b2f9a6864587b13d107e9702319397161dbd70c9df97f638b9e906807966f3a0ca2214fce5760c1b4c58eb5b481c68171a270fadbbded
+  data.tar.gz: bea5ba0649370308fa5a1a6c8d2211708ebdf99d33da6461d38c3a4a10e095b87be83e8ae39b4050fa7ce40ad096fdb349c7bc715971c7e0971ba5eb1f68265d

data/helpers/lib/NuGetUpdater/.gitignore

@@ -4,3 +4,4 @@ bin/
 obj/
 Properties/launchSettings.json
 NuGetUpdater.sln.DotSettings.user
+*.binlog

data/helpers/lib/NuGetUpdater/Directory.Build.targets

@@ -0,0 +1,17 @@
+<Project>
+  <ItemGroup>
+    <!--
+    The NuGetUpdater.Core project needs to reference `Microsoft.Build.*`, et al. packages, but they require some
+    special handling. The documentation explains that:
+
+    https://learn.microsoft.com/en-us/visualstudio/msbuild/find-and-use-msbuild-versions?view=vs-2022#use-nuget-packages-preferred
+
+    The `ExcludeAssets` attribute doesn't do what we'd like through a <ProjectReference> element, so to get around that
+    we're adding the packages to _all_ projects so they all get the `ExcludeAssets` behavior.  For more information see
+    this: https://github.com/dotnet/sdk/issues/42708
+    -->
+    <PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="runtime" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="runtime" PrivateAssets="all" />
+  </ItemGroup>
+</Project>

data/helpers/lib/NuGetUpdater/Directory.Packages.props

@@ -4,19 +4,26 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <MSBuildPackageVersion>17.5.0</MSBuildPackageVersion>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageVersion Include="DiffPlex" Version="1.7.1" />
 
     <PackageVersion Include="GuiLabs.Language.Xml" Version="1.2.93" />
 
-    <PackageVersion Include="Microsoft.Build.Locator" Version="1.6.1" />
-    <PackageVersion Include="Microsoft.Build" Version="17.5.0" ExcludeAssets="Runtime" PrivateAssets="All" />
-    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.5.0" ExcludeAssets="Runtime" PrivateAssets="All" />
+    <PackageVersion Include="Microsoft.Build" Version="$(MSBuildPackageVersion)" />
+    <PackageVersion Include="Microsoft.Build.Framework" Version="$(MSBuildPackageVersion)" />
+    <PackageVersion Include="Microsoft.Build.Locator" Version="1.7.8" />
+    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MSBuildPackageVersion)" />
 
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
 
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
 
+    <PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.386" />
+
     <PackageVersion Include="NuGet.Core" Version="2.14.0-rtm-832" Aliases="CoreV2" />
 
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />

data/helpers/lib/NuGetUpdater/NuGetUpdater.Cli/Commands/DiscoverCommand.cs

@@ -7,6 +7,7 @@ namespace NuGetUpdater.Cli.Commands;
 
 internal static class DiscoverCommand
 {
+    internal static readonly Option<FileInfo> JobPathOption = new("--job-path") { IsRequired = true };
     internal static readonly Option<DirectoryInfo> RepoRootOption = new("--repo-root") { IsRequired = true };
     internal static readonly Option<string> WorkspaceOption = new("--workspace") { IsRequired = true };
     internal static readonly Option<FileInfo> OutputOption = new("--output") { IsRequired = true };
@@ -15,6 +16,7 @@ internal static class DiscoverCommand
     {
         Command command = new("discover", "Generates a report of the workspace dependencies and where they are located.")
         {
+            JobPathOption,
             RepoRootOption,
             WorkspaceOption,
             OutputOption
@@ -22,11 +24,13 @@ internal static class DiscoverCommand
 
         command.TreatUnmatchedTokensAsErrors = true;
 
-        command.SetHandler(async (repoRoot, workspace, outputPath) =>
+        command.SetHandler(async (jobPath, repoRoot, workspace, outputPath) =>
         {
-            var worker = new DiscoveryWorker(new ConsoleLogger());
+            var logger = new ConsoleLogger();
+            var experimentsManager = await ExperimentsManager.FromJobFileAsync(jobPath.FullName, logger);
+            var worker = new DiscoveryWorker(experimentsManager, logger);
             await worker.RunAsync(repoRoot.FullName, workspace, outputPath.FullName);
-        }, RepoRootOption, WorkspaceOption, OutputOption);
+        }, JobPathOption, RepoRootOption, WorkspaceOption, OutputOption);
 
         return command;
     }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Cli/Commands/RunCommand.cs

@@ -35,7 +35,7 @@ internal static class RunCommand
             var apiHandler = new HttpApiHandler(apiUrl.ToString(), jobId);
             var logger = new ConsoleLogger();
             var experimentsManager = await ExperimentsManager.FromJobFileAsync(jobPath.FullName, logger);
-            var discoverWorker = new DiscoveryWorker(logger);
+            var discoverWorker = new DiscoveryWorker(experimentsManager, logger);
             var analyzeWorker = new AnalyzeWorker(logger);
             var updateWorker = new UpdaterWorker(experimentsManager, logger);
             var worker = new RunWorker(apiHandler, discoverWorker, analyzeWorker, updateWorker, logger);

data/helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/EntryPointTests.Discover.cs

@@ -17,12 +17,16 @@ public partial class EntryPointTests
 {
     public class Discover : DiscoveryWorkerTestBase
     {
-        [Fact]
-        public async Task PathWithSpaces()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task PathWithSpaces(bool useDirectDiscovery)
         {
             await RunAsync(path =>
                 [
                     "discover",
+                    "--job-path",
+                    Path.Combine(path, "job.json"),
                     "--repo-root",
                     path,
                     "--workspace",
@@ -30,11 +34,15 @@ public partial class EntryPointTests
                     "--output",
                     Path.Combine(path, DiscoveryWorker.DiscoveryResultFileName),
                 ],
-                packages: [],
+                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery },
+                packages:
+                [
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "1.2.3", "net8.0"),
+                ],
                 initialFiles:
                 [
                     ("path/to/some directory with spaces/project.csproj", """
-                        <Project Sdk="Microsoft.NETSdk">
+                        <Project Sdk="Microsoft.NET.Sdk">
                           <PropertyGroup>
                             <TargetFramework>net8.0</TargetFramework>
                           </PropertyGroup>
@@ -52,8 +60,6 @@ public partial class EntryPointTests
                         {
                             FilePath = "project.csproj",
                             TargetFrameworks = ["net8.0"],
-                            ReferencedProjectPaths = [],
-                            ExpectedDependencyCount = 2,
                             Dependencies = [
                                 new("Some.Package", "1.2.3", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
                             ],
@@ -66,12 +72,16 @@ public partial class EntryPointTests
             );
         }
 
-        [Fact]
-        public async Task WithSolution()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task WithSolution(bool useDirectDiscovery)
         {
             await RunAsync(path =>
                 [
                     "discover",
+                    "--job-path",
+                    Path.Combine(path, "job.json"),
                     "--repo-root",
                     path,
                     "--workspace",
@@ -79,6 +89,7 @@ public partial class EntryPointTests
                     "--output",
                     Path.Combine(path, DiscoveryWorker.DiscoveryResultFileName),
                 ],
+                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery },
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Some.Package", "7.0.1", "net45"),
@@ -141,26 +152,26 @@ public partial class EntryPointTests
                         {
                             FilePath = "path/to/my.csproj",
                             TargetFrameworks = ["net45"],
-                            ReferencedProjectPaths = [],
-                            ExpectedDependencyCount = 2,
                             Dependencies = [
                                 new("Some.Package", "7.0.1", DependencyType.PackagesConfig, TargetFrameworks: ["net45"]),
                             ],
-                            Properties = [
-                                new("TargetFrameworkVersion", "v4.5", "path/to/my.csproj"),
-                            ],
+                            Properties = [],
                         }
                     ]
                 }
             );
         }
 
-        [Fact]
-        public async Task WithProject()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task WithProject(bool useDirectDiscovery)
         {
             await RunAsync(path =>
                 [
                     "discover",
+                    "--job-path",
+                    Path.Combine(path, "job.json"),
                     "--repo-root",
                     path,
                     "--workspace",
@@ -168,6 +179,7 @@ public partial class EntryPointTests
                     "--output",
                     Path.Combine(path, DiscoveryWorker.DiscoveryResultFileName),
                 ],
+                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery },
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Some.Package", "7.0.1", "net45"),
@@ -207,27 +219,27 @@ public partial class EntryPointTests
                         {
                             FilePath = "my.csproj",
                             TargetFrameworks = ["net45"],
-                            ReferencedProjectPaths = [],
-                            ExpectedDependencyCount = 2,
                             Dependencies = [
                                 new("Some.Package", "7.0.1", DependencyType.PackagesConfig, TargetFrameworks: ["net45"])
                             ],
-                            Properties = [
-                                new("TargetFrameworkVersion", "v4.5", "path/to/my.csproj"),
-                            ],
+                            Properties = [],
                         }
                     ]
                 }
             );
         }
 
-        [Fact]
-        public async Task WithDirectory()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task WithDirectory(bool useDirectDiscovery)
         {
             var workspacePath = "path/to/";
             await RunAsync(path =>
                 [
                     "discover",
+                    "--job-path",
+                    Path.Combine(path, "job.json"),
                     "--repo-root",
                     path,
                     "--workspace",
@@ -235,6 +247,7 @@ public partial class EntryPointTests
                     "--output",
                     Path.Combine(path, DiscoveryWorker.DiscoveryResultFileName),
                 ],
+                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery },
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Some.Package", "7.0.1", "net45"),
@@ -274,14 +287,10 @@ public partial class EntryPointTests
                         {
                             FilePath = "my.csproj",
                             TargetFrameworks = ["net45"],
-                            ReferencedProjectPaths = [],
-                            ExpectedDependencyCount = 2,
                             Dependencies = [
                                 new("Some.Package", "7.0.1", DependencyType.PackagesConfig, TargetFrameworks: ["net45"])
                             ],
-                            Properties = [
-                                new("TargetFrameworkVersion", "v4.5", "path/to/my.csproj"),
-                            ],
+                            Properties = [],
                         }
                     ]
                 }
@@ -294,6 +303,8 @@ public partial class EntryPointTests
             await RunAsync(path =>
                 [
                     "discover",
+                    "--job-path",
+                    Path.Combine(path, "job.json"),
                     "--repo-root",
                     path,
                     "--workspace",
@@ -304,27 +315,33 @@ public partial class EntryPointTests
                 new[]
                 {
                     ("path/to/my.csproj", """
-                        <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+                        <Project Sdk="Microsoft.NET.Sdk">
                           <PropertyGroup>
                             <TargetFramework>net8.0</TargetFramework>
+                            <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
                           </PropertyGroup>
                           <ItemGroup>
-                            <PackageReference Include="Newtonsoft.Json" Version="7.0.1" />
+                            <PackageReference Include="Package.A" Version="1.2.3" />
                           </ItemGroup>
-                          <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
                         </Project>
                         """),
                     ("path/Directory.Build.props", """
                         <Project>
-                            <ItemGroup Condition="'$(ManagePackageVersionsCentrally)' == 'true'">
-                              <GlobalPackageReference Include="System.Text.Json" Version="8.0.3" />
-                            </ItemGroup>
                             <ItemGroup Condition="'$(ManagePackageVersionsCentrally)' != 'true'">
-                              <PackageReference Include="System.Text.Json" Version="8.0.3" />
+                              <PackageReference Include="Package.B" Version="4.5.6" />
+                            </ItemGroup>
+                            <ItemGroup Condition="'$(ManagePackageVersionsCentrally)' == 'true'">
+                              <GlobalPackageReference Include="Package.B" Version="7.8.9" />
                             </ItemGroup>
                         </Project>
                         """)
                 },
+                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
+                packages:
+                [
+                    MockNuGetPackage.CreateSimplePackage("Package.A", "1.2.3", "net8.0"),
+                    MockNuGetPackage.CreateSimplePackage("Package.B", "4.5.6", "net8.0"),
+                ],
                 expectedResult: new()
                 {
                     Path = "path/to",
@@ -333,28 +350,19 @@ public partial class EntryPointTests
                         {
                             FilePath = "my.csproj",
                             TargetFrameworks = ["net8.0"],
-                            ReferencedProjectPaths = [],
                             ExpectedDependencyCount = 2,
                             Dependencies = [
-                                new("Newtonsoft.Json", "7.0.1", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
-                                // $(ManagePackageVersionsCentrally) evaluates false by default, we only get a PackageReference
-                                new("System.Text.Json", "8.0.3", DependencyType.PackageReference, TargetFrameworks: ["net8.0"])
+                                new("Package.A", "1.2.3", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
+                                new("Package.B", "4.5.6", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
                             ],
                             Properties = [
+                                new("ManagePackageVersionsCentrally", "false", "path/to/my.csproj"),
                                 new("TargetFramework", "net8.0", "path/to/my.csproj"),
                             ],
-                        },
-                        new()
-                        {
-                            FilePath = "../Directory.Build.props",
-                            ReferencedProjectPaths = [],
-                            ExpectedDependencyCount = 2,
-                            Dependencies = [
-                                new("System.Text.Json", "8.0.3", DependencyType.PackageReference, IsDirect: true),
-                                new("System.Text.Json", "8.0.3", DependencyType.GlobalPackageReference, IsDirect: true)
-                            ],
-                            Properties = [],
                         }
+                    ],
+                    ImportedFiles = [
+                        "Directory.Build.props"
                     ]
                 }
             );
@@ -364,8 +372,10 @@ public partial class EntryPointTests
             Func<string, string[]> getArgs,
             TestFile[] initialFiles,
             ExpectedWorkspaceDiscoveryResult expectedResult,
-            MockNuGetPackage[]? packages = null)
+            MockNuGetPackage[]? packages = null,
+            ExperimentsManager? experimentsManager = null)
         {
+            experimentsManager ??= new ExperimentsManager();
             var actualResult = await RunDiscoveryAsync(initialFiles, async path =>
             {
                 var sb = new StringBuilder();
@@ -378,8 +388,19 @@ public partial class EntryPointTests
 
                 try
                 {
+                    await UpdateWorkerTestBase.MockJobFileInDirectory(path, experimentsManager);
                     await UpdateWorkerTestBase.MockNuGetPackagesInDirectory(packages, path);
                     var args = getArgs(path);
+
+                    // manually pull out the experiments manager for the validate step below
+                    for (int i = 0; i < args.Length - 1; i++)
+                    {
+                        if (args[i] == "--job-path")
+                        {
+                            experimentsManager = await ExperimentsManager.FromJobFileAsync(args[i + 1], new TestLogger());
+                        }
+                    }
+
                     var result = await Program.Main(args);
                     if (result != 0)
                     {
@@ -398,7 +419,7 @@ public partial class EntryPointTests
                 return resultObject!;
             });
 
-            ValidateWorkspaceResult(expectedResult, actualResult);
+            ValidateWorkspaceResult(expectedResult, actualResult, experimentsManager);
         }
     }
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Analyze/AnalyzeWorker.cs

@@ -391,8 +391,8 @@ public partial class AnalyzeWorker : IAnalyzeWorker
 
         var projectFrameworks = projectsWithDependency
             .SelectMany(p => p.TargetFrameworks)
-            .Distinct()
             .Select(NuGetFramework.Parse)
+            .Distinct()
             .ToImmutableArray();
 
         // When updating peer dependencies, we only need to consider top-level dependencies.

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/DependencyDiscovery.props

@@ -0,0 +1,7 @@
+<Project>
+  <!-- The following properties enable target framework and dependency discovery when OS-specific workloads are required -->
+  <PropertyGroup>
+    <DesignTimeBuild>true</DesignTimeBuild>
+    <TargetPlatformVersion Condition=" $(TargetFramework.Contains('-')) ">1.0</TargetPlatformVersion>
+  </PropertyGroup>
+</Project>

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/DependencyDiscovery.targets

@@ -0,0 +1,10 @@
+<Project>
+  <Import Project="DependencyDiscovery.props" />
+
+  <Target Name="_DiscoverDependencies" DependsOnTargets="GenerateBuildDependencyFile;ResolvePackageAssets">
+    <!--
+    The target GenerateBuildDependencyFile is sufficient for projects targeting .NET Standard or .NET Core.
+    The target ResolvePackageAssets is necessary for projects targeting .NET Framework.
+    -->
+  </Target>
+</Project>

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/DiscoveryWorker.cs

@@ -16,6 +16,7 @@ public partial class DiscoveryWorker : IDiscoveryWorker
 {
     public const string DiscoveryResultFileName = "./.dependabot/discovery.json";
 
+    private readonly ExperimentsManager _experimentsManager;
     private readonly ILogger _logger;
     private readonly HashSet<string> _processedProjectPaths = new(StringComparer.OrdinalIgnoreCase); private readonly HashSet<string> _restoredMSBuildSdks = new(StringComparer.OrdinalIgnoreCase);
 
@@ -25,8 +26,9 @@ public partial class DiscoveryWorker : IDiscoveryWorker
         Converters = { new JsonStringEnumConverter() },
     };
 
-    public DiscoveryWorker(ILogger logger)
+    public DiscoveryWorker(ExperimentsManager experimentsManager, ILogger logger)
     {
+        _experimentsManager = experimentsManager;
         _logger = logger;
     }
 
@@ -52,6 +54,7 @@ public partial class DiscoveryWorker : IDiscoveryWorker
                 ErrorDetails = "(" + string.Join("|", NuGetContext.GetPackageSourceUrls(PathHelper.JoinPath(repoRootPath, workspacePath))) + ")",
                 Path = workspacePath,
                 Projects = [],
+                ImportedFiles = [],
             };
         }
 
@@ -60,7 +63,7 @@ public partial class DiscoveryWorker : IDiscoveryWorker
 
     public async Task<WorkspaceDiscoveryResult> RunAsync(string repoRootPath, string workspacePath)
     {
-        MSBuildHelper.RegisterMSBuild(Environment.CurrentDirectory, repoRootPath);
+        MSBuildHelper.RegisterMSBuild(repoRootPath, workspacePath);
 
         // the `workspacePath` variable is relative to a repository root, so a rooted path actually isn't rooted; the
         // easy way to deal with this is to just trim the leading "/" if it exists
@@ -74,7 +77,6 @@ public partial class DiscoveryWorker : IDiscoveryWorker
 
         DotNetToolsJsonDiscoveryResult? dotNetToolsJsonDiscovery = null;
         GlobalJsonDiscoveryResult? globalJsonDiscovery = null;
-        DirectoryPackagesPropsDiscoveryResult? directoryPackagesPropsDiscovery = null;
 
         ImmutableArray<ProjectDiscoveryResult> projectResults = [];
         WorkspaceDiscoveryResult result;
@@ -93,26 +95,30 @@ public partial class DiscoveryWorker : IDiscoveryWorker
 
             // this next line should throw or something
             projectResults = await RunForDirectoryAsnyc(repoRootPath, workspacePath);
-
-            directoryPackagesPropsDiscovery = DirectoryPackagesPropsDiscovery.Discover(repoRootPath, workspacePath, projectResults, _logger);
-
-            if (directoryPackagesPropsDiscovery is not null)
-            {
-                projectResults = projectResults.Remove(projectResults.First(p => p.FilePath.Equals(directoryPackagesPropsDiscovery.FilePath, StringComparison.OrdinalIgnoreCase)));
-            }
         }
         else
         {
             _logger.Log($"Workspace path [{workspacePath}] does not exist.");
         }
 
+        var importedFiles = new HashSet<string>(PathComparer.Instance);
+        foreach (var project in projectResults)
+        {
+            // imported files are relative to the project and need to be converted to be relative to the repo root
+            var repoRootRelativeImportedFiles = project.ImportedFiles
+                .Select(p => Path.Join(Path.GetDirectoryName(project.FilePath) ?? "", p))
+                .Select(p => p.NormalizePathToUnix().NormalizeUnixPathParts())
+                .ToArray();
+            importedFiles.AddRange(repoRootRelativeImportedFiles);
+        }
+
         result = new WorkspaceDiscoveryResult
         {
             Path = initialWorkspacePath,
             DotNetToolsJson = dotNetToolsJsonDiscovery,
             GlobalJson = globalJsonDiscovery,
-            DirectoryPackagesProps = directoryPackagesPropsDiscovery,
             Projects = projectResults.OrderBy(p => p.FilePath).ToImmutableArray(),
+            ImportedFiles = importedFiles.ToImmutableArray(),
         };
 
         _logger.Log("Discovery complete.");
@@ -288,11 +294,9 @@ public partial class DiscoveryWorker : IDiscoveryWorker
             }
             _processedProjectPaths.Add(actualProjectPath);
 
-            var relativeProjectPath = Path.GetRelativePath(workspacePath, actualProjectPath);
-            var packagesConfigDependencies = PackagesConfigDiscovery.Discover(workspacePath, projectPath, _logger)
-                    ?.Dependencies;
-
-            var projectResults = await SdkProjectDiscovery.DiscoverAsync(repoRootPath, workspacePath, actualProjectPath, _logger);
+            var relativeProjectPath = Path.GetRelativePath(workspacePath, actualProjectPath).NormalizePathToUnix();
+            var packagesConfigResult = await PackagesConfigDiscovery.Discover(repoRootPath, workspacePath, actualProjectPath, _logger);
+            var projectResults = await SdkProjectDiscovery.DiscoverAsync(repoRootPath, workspacePath, actualProjectPath, _experimentsManager, _logger);
 
             // Determine if there were unrestored MSBuildSdks
             var msbuildSdks = projectResults.SelectMany(p => p.Dependencies.Where(d => d.Type == DependencyType.MSBuildSdk)).ToImmutableArray();
@@ -301,7 +305,7 @@ public partial class DiscoveryWorker : IDiscoveryWorker
                 // If new SDKs were restored, then we need to rerun SdkProjectDiscovery.
                 if (await TryRestoreMSBuildSdksAsync(repoRootPath, workspacePath, msbuildSdks, _logger))
                 {
-                    projectResults = await SdkProjectDiscovery.DiscoverAsync(repoRootPath, workspacePath, actualProjectPath, _logger);
+                    projectResults = await SdkProjectDiscovery.DiscoverAsync(repoRootPath, workspacePath, actualProjectPath, _experimentsManager, _logger);
                 }
             }
 
@@ -313,9 +317,9 @@ public partial class DiscoveryWorker : IDiscoveryWorker
                 }
 
                 // If we had packages.config dependencies, merge them with the project dependencies
-                if (projectResult.FilePath == relativeProjectPath && packagesConfigDependencies is not null)
+                if (projectResult.FilePath == relativeProjectPath && packagesConfigResult is not null)
                 {
-                    packagesConfigDependencies = packagesConfigDependencies.Value
+                    var packagesConfigDependencies = packagesConfigResult.Dependencies
                         .Select(d => d with { TargetFrameworks = projectResult.TargetFrameworks })
                         .ToImmutableArray();
 
@@ -329,6 +333,19 @@ public partial class DiscoveryWorker : IDiscoveryWorker
                     results[projectResult.FilePath] = projectResult;
                 }
             }
+
+            if (!results.ContainsKey(relativeProjectPath) &&
+                packagesConfigResult is not null &&
+                packagesConfigResult.Dependencies.Length > 0)
+            {
+                // project contained only packages.config dependencies
+                results[relativeProjectPath] = new ProjectDiscoveryResult()
+                {
+                    FilePath = relativeProjectPath,
+                    Dependencies = packagesConfigResult.Dependencies,
+                    TargetFrameworks = packagesConfigResult.TargetFrameworks,
+                };
+            }
         }
 
         return [.. results.Values];

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/PackagesConfigDiscovery.cs

@@ -4,7 +4,7 @@ namespace NuGetUpdater.Core.Discover;
 
 internal static class PackagesConfigDiscovery
 {
-    public static PackagesConfigDiscoveryResult? Discover(string workspacePath, string projectPath, ILogger logger)
+    public static async Task<PackagesConfigDiscoveryResult?> Discover(string repoRootPath, string workspacePath, string projectPath, ILogger logger)
     {
         if (!NuGetHelper.TryGetPackagesConfigFile(projectPath, out var packagesConfigPath))
         {
@@ -20,10 +20,14 @@ internal static class PackagesConfigDiscovery
             .OrderBy(d => d.Name)
             .ToImmutableArray();
 
+        // generate `$(TargetFramework)` via MSBuild
+        var tfms = await MSBuildHelper.GetTargetFrameworkValuesFromProject(repoRootPath, projectPath, logger);
+
         return new()
         {
             FilePath = packagesConfigFile.RelativePath,
-            Dependencies = dependencies,
+            Dependencies = dependencies.Select(d => d with { TargetFrameworks = tfms }).ToImmutableArray(),
+            TargetFrameworks = tfms,
         };
     }
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/PackagesConfigDiscoveryResult.cs

@@ -6,5 +6,6 @@ public sealed record PackagesConfigDiscoveryResult : IDiscoveryResultWithDepende
 {
     public required string FilePath { get; init; }
     public bool IsSuccess { get; init; } = true;
-    public ImmutableArray<Dependency> Dependencies { get; init; }
+    public required ImmutableArray<Dependency> Dependencies { get; init; }
+    public required ImmutableArray<string> TargetFrameworks { get; init; }
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/ProjectDiscoveryResult.cs

@@ -1,4 +1,5 @@
 using System.Collections.Immutable;
+using System.Text.Json.Serialization;
 
 namespace NuGetUpdater.Core.Discover;
 
@@ -10,4 +11,8 @@ public record ProjectDiscoveryResult : IDiscoveryResultWithDependencies
     public ImmutableArray<Property> Properties { get; init; } = [];
     public ImmutableArray<string> TargetFrameworks { get; init; } = [];
     public ImmutableArray<string> ReferencedProjectPaths { get; init; } = [];
+
+    // this is purely for internal record keeping and should not be serialized
+    [JsonIgnore]
+    public ImmutableArray<string> ImportedFiles { get; init; } = [];
 }