dependabot-nuget 0.287.0 → 0.288.0

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Utilities/PathHelperTests.cs

@@ -23,7 +23,7 @@ public class PathHelperTests
     [Fact]
     public void VerifyResolveCaseInsensitivePath()
     {
-        var temp = new TemporaryDirectory();
+        using var temp = new TemporaryDirectory();
         Directory.CreateDirectory(Path.Combine(temp.DirectoryPath, "src", "a"));
         File.WriteAllText(Path.Combine(temp.DirectoryPath, "src", "a", "packages.config"), "");
 
@@ -31,6 +31,7 @@ public class PathHelperTests
 
         var resolvedPath = PathHelper.ResolveCaseInsensitivePathInsideRepoRoot(Path.Combine(repoRootPath, "A", "PACKAGES.CONFIG"), repoRootPath);
 
-        Assert.Equal(Path.Combine(temp.DirectoryPath, "src", "a", "packages.config"), resolvedPath);
+        var expected = Path.Combine(temp.DirectoryPath, "src", "a", "packages.config").NormalizePathToUnix();
+        Assert.Equal(expected, resolvedPath);
     }
 }

data/lib/dependabot/nuget/file_parser.rb

@@ -34,7 +34,8 @@ module Dependabot
           discovery_json_path = NativeDiscoveryJsonReader.create_discovery_file_path_from_dependency_files(
             dependency_files
           )
-          NativeHelpers.run_nuget_discover_tool(repo_root: T.must(repo_contents_path),
+          NativeHelpers.run_nuget_discover_tool(job_path: job_file_path,
+                                                repo_root: T.must(repo_contents_path),
                                                 workspace_path: workspace_path,
                                                 output_path: discovery_json_path,
                                                 credentials: credentials)
@@ -58,6 +59,11 @@ module Dependabot
 
       private
 
+      sig { returns(String) }
+      def job_file_path
+        ENV.fetch("DEPENDABOT_JOB_PATH")
+      end
+
       sig { returns(T::Array[Dependabot::DependencyFile]) }
       def proj_files
         projfile = /\.proj$/

data/lib/dependabot/nuget/native_discovery/native_discovery_json_reader.rb

@@ -159,9 +159,6 @@ module Dependabot
         workspace_result.projects.each do |project|
           dependency_set += project.dependency_set
         end
-        if workspace_result.directory_packages_props
-          dependency_set += T.must(workspace_result.directory_packages_props).dependency_set
-        end
         if workspace_result.dotnet_tools_json
           dependency_set += T.must(workspace_result.dotnet_tools_json).dependency_set
         end

data/lib/dependabot/nuget/native_discovery/native_workspace_discovery.rb

@@ -2,7 +2,6 @@
 # frozen_string_literal: true
 
 require "dependabot/nuget/native_discovery/native_dependency_file_discovery"
-require "dependabot/nuget/native_discovery/native_directory_packages_props_discovery"
 require "dependabot/nuget/native_discovery/native_project_discovery"
 require "dependabot/nuget/native_helpers"
 require "sorbet-runtime"
@@ -21,9 +20,7 @@ module Dependabot
         projects = T.let(json.fetch("Projects"), T::Array[T::Hash[String, T.untyped]]).filter_map do |project|
           NativeProjectDiscovery.from_json(project, path)
         end
-        directory_packages_props = NativeDirectoryPackagesPropsDiscovery
-                                   .from_json(T.let(json.fetch("DirectoryPackagesProps"),
-                                                    T.nilable(T::Hash[String, T.untyped])), path)
+        imported_files = T.let(json.fetch("ImportedFiles"), T::Array[String])
         global_json = NativeDependencyFileDiscovery
                       .from_json(T.let(json.fetch("GlobalJson"), T.nilable(T::Hash[String, T.untyped])), path)
         dotnet_tools_json = NativeDependencyFileDiscovery
@@ -32,7 +29,7 @@ module Dependabot
 
         NativeWorkspaceDiscovery.new(path: path,
                                      projects: projects,
-                                     directory_packages_props: directory_packages_props,
+                                     imported_files: imported_files,
                                      global_json: global_json,
                                      dotnet_tools_json: dotnet_tools_json)
       end
@@ -40,14 +37,14 @@ module Dependabot
       sig do
         params(path: String,
                projects: T::Array[NativeProjectDiscovery],
-               directory_packages_props: T.nilable(NativeDirectoryPackagesPropsDiscovery),
+               imported_files: T::Array[String],
                global_json: T.nilable(NativeDependencyFileDiscovery),
                dotnet_tools_json: T.nilable(NativeDependencyFileDiscovery)).void
       end
-      def initialize(path:, projects:, directory_packages_props:, global_json:, dotnet_tools_json:)
+      def initialize(path:, projects:, imported_files:, global_json:, dotnet_tools_json:)
         @path = path
         @projects = projects
-        @directory_packages_props = directory_packages_props
+        @imported_files = imported_files
         @global_json = global_json
         @dotnet_tools_json = dotnet_tools_json
       end
@@ -58,8 +55,8 @@ module Dependabot
       sig { returns(T::Array[NativeProjectDiscovery]) }
       attr_reader :projects
 
-      sig { returns(T.nilable(NativeDirectoryPackagesPropsDiscovery)) }
-      attr_reader :directory_packages_props
+      sig { returns(T::Array[String]) }
+      attr_reader :imported_files
 
       sig { returns(T.nilable(NativeDependencyFileDiscovery)) }
       attr_reader :global_json

data/lib/dependabot/nuget/native_helpers.rb

@@ -54,13 +54,20 @@ module Dependabot
       end
 
       sig do
-        params(repo_root: String, workspace_path: String, output_path: String).returns([String, String])
+        params(
+          job_path: String,
+          repo_root: String,
+          workspace_path: String,
+          output_path: String
+        ).returns([String, String])
       end
-      def self.get_nuget_discover_tool_command(repo_root:, workspace_path:, output_path:)
+      def self.get_nuget_discover_tool_command(job_path:, repo_root:, workspace_path:, output_path:)
         exe_path = File.join(native_helpers_root, "NuGetUpdater", "NuGetUpdater.Cli")
         command_parts = [
           exe_path,
           "discover",
+          "--job-path",
+          job_path,
           "--repo-root",
           repo_root,
           "--workspace",
@@ -87,14 +94,16 @@ module Dependabot
 
       sig do
         params(
+          job_path: String,
           repo_root: String,
           workspace_path: String,
           output_path: String,
           credentials: T::Array[Dependabot::Credential]
         ).void
       end
-      def self.run_nuget_discover_tool(repo_root:, workspace_path:, output_path:, credentials:)
-        (command, fingerprint) = get_nuget_discover_tool_command(repo_root: repo_root,
+      def self.run_nuget_discover_tool(job_path:, repo_root:, workspace_path:, output_path:, credentials:)
+        (command, fingerprint) = get_nuget_discover_tool_command(job_path: job_path,
+                                                                 repo_root: repo_root,
                                                                  workspace_path: workspace_path,
                                                                  output_path: output_path)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.287.0
+  version: 0.288.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-19 00:00:00.000000000 Z
+date: 2024-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.287.0
+        version: 0.288.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.287.0
+        version: 0.288.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -266,6 +266,7 @@ files:
 - helpers/lib/NuGetUpdater/.editorconfig
 - helpers/lib/NuGetUpdater/.gitignore
 - helpers/lib/NuGetUpdater/Directory.Build.props
+- helpers/lib/NuGetUpdater/Directory.Build.targets
 - helpers/lib/NuGetUpdater/Directory.Common.props
 - helpers/lib/NuGetUpdater/Directory.Packages.props
 - helpers/lib/NuGetUpdater/NuGetProjects/Directory.Build.props
@@ -321,6 +322,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.Project.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/ExpectedDiscoveryResults.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/SdkProjectDiscoveryTests.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Files/DotNetToolsJsonBuildFileTests.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Files/GlobalJsonBuildFileTests.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Files/PackagesConfigBuildFileTests.cs
@@ -376,9 +378,9 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Clone/IGitCommandHandler.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Clone/ShellGitCommandHandler.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Dependency.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/DependencyDiscovery.props
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/DependencyDiscovery.targets
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/DependencyType.cs
-- helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/DirectoryPackagesPropsDiscovery.cs
-- helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/DirectoryPackagesPropsDiscoveryResult.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/DiscoveryWorker.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/DotNetToolsJsonDiscovery.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/DotNetToolsJsonDiscoveryResult.cs
@@ -433,6 +435,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/IApiHandler.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/RunResult.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/RunWorker.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/TargetFrameworkReporter.targets
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/UpdateNotPossibleException.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/BindingRedirectManager.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/BindingRedirectResolver.cs
@@ -447,6 +450,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/UpdaterWorker.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/WebApplicationTargetsConditionPatcher.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/XmlFilePreAndPostProcessor.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/CollectionExtensions.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/ConsoleLogger.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/DependencyConflictResolver.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/HashSetExtensions.cs
@@ -455,6 +459,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/JsonHelper.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/MSBuildHelper.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/NuGetHelper.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/PathComparer.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/PathHelper.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/ProcessExtensions.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/XmlExtensions.cs
@@ -482,7 +487,6 @@ files:
 - lib/dependabot/nuget/metadata_finder.rb
 - lib/dependabot/nuget/native_discovery/native_dependency_details.rb
 - lib/dependabot/nuget/native_discovery/native_dependency_file_discovery.rb
-- lib/dependabot/nuget/native_discovery/native_directory_packages_props_discovery.rb
 - lib/dependabot/nuget/native_discovery/native_discovery_json_reader.rb
 - lib/dependabot/nuget/native_discovery/native_evaluation_details.rb
 - lib/dependabot/nuget/native_discovery/native_project_discovery.rb
@@ -511,7 +515,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.287.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.288.0
 post_install_message: 
 rdoc_options: []
 require_paths:

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

@@ -1,69 +0,0 @@
-using System.Collections.Immutable;
-
-namespace NuGetUpdater.Core.Discover;
-
-internal static class DirectoryPackagesPropsDiscovery
-{
-    public static DirectoryPackagesPropsDiscoveryResult? Discover(string repoRootPath, string workspacePath, ImmutableArray<ProjectDiscoveryResult> projectResults, ILogger logger)
-    {
-        var projectResult = projectResults.FirstOrDefault(
-            p => p.Properties.FirstOrDefault(prop => prop.Name.Equals("ManagePackageVersionsCentrally", StringComparison.OrdinalIgnoreCase)) is Property property
-                && string.Equals(property.Value, "true", StringComparison.OrdinalIgnoreCase));
-        if (projectResult is null)
-        {
-            logger.Log("  Central Package Management is not enabled.");
-            return null;
-        }
-
-        var projectFilePath = Path.GetFullPath(projectResult.FilePath, workspacePath);
-        if (!MSBuildHelper.TryGetDirectoryPackagesPropsPath(repoRootPath, projectFilePath, out var directoryPackagesPropsPath))
-        {
-            logger.Log("  No Directory.Packages.props file found.");
-            return null;
-        }
-
-        var relativeDirectoryPackagesPropsPath = Path.GetRelativePath(workspacePath, directoryPackagesPropsPath);
-        var directoryPackagesPropsFile = projectResults.FirstOrDefault(p => p.FilePath.Equals(relativeDirectoryPackagesPropsPath, StringComparison.OrdinalIgnoreCase));
-        if (directoryPackagesPropsFile is null)
-        {
-            logger.Log($"  No project file found for [{relativeDirectoryPackagesPropsPath}].");
-            return null;
-        }
-
-        logger.Log($"  Discovered [{directoryPackagesPropsFile.FilePath}] file.");
-
-        var isTransitivePinningEnabled = projectResult.Properties.FirstOrDefault(prop => prop.Name.Equals("EnableTransitivePinning", StringComparison.OrdinalIgnoreCase)) is Property property
-            && string.Equals(property.Value, "true", StringComparison.OrdinalIgnoreCase);
-        var properties = projectResult.Properties.ToImmutableDictionary(p => p.Name, StringComparer.OrdinalIgnoreCase);
-        var dependencies = GetDependencies(workspacePath, directoryPackagesPropsPath, properties)
-            .OrderBy(d => d.Name)
-            .ToImmutableArray();
-
-        return new()
-        {
-            FilePath = directoryPackagesPropsFile.FilePath,
-            IsTransitivePinningEnabled = isTransitivePinningEnabled,
-            Dependencies = dependencies,
-        };
-    }
-
-    private static IEnumerable<Dependency> GetDependencies(string workspacePath, string directoryPackagesPropsPath, ImmutableDictionary<string, Property> properties)
-    {
-        var dependencies = ProjectBuildFile.Open(workspacePath, directoryPackagesPropsPath).GetDependencies();
-        return dependencies.Select(d =>
-        {
-            if (d.Version == null)
-            {
-                return d;
-            }
-
-            var evaluation = MSBuildHelper.GetEvaluatedValue(d.Version, properties);
-            return d with
-            {
-                Version = evaluation.EvaluatedValue,
-                EvaluationResult = evaluation,
-                IsDirect = true,
-            };
-        });
-    }
-}

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

@@ -1,11 +0,0 @@
-using System.Collections.Immutable;
-
-namespace NuGetUpdater.Core.Discover;
-
-public sealed record DirectoryPackagesPropsDiscoveryResult : IDiscoveryResultWithDependencies
-{
-    public required string FilePath { get; init; }
-    public bool IsSuccess { get; init; } = true;
-    public bool IsTransitivePinningEnabled { get; init; }
-    public ImmutableArray<Dependency> Dependencies { get; init; }
-}

data/lib/dependabot/nuget/native_discovery/native_directory_packages_props_discovery.rb

@@ -1,44 +0,0 @@
-# typed: strong
-# frozen_string_literal: true
-
-require "dependabot/nuget/native_discovery/native_dependency_details"
-require "sorbet-runtime"
-
-module Dependabot
-  module Nuget
-    class NativeDirectoryPackagesPropsDiscovery < NativeDependencyFileDiscovery
-      extend T::Sig
-
-      sig do
-        override.params(json: T.nilable(T::Hash[String, T.untyped]),
-                        directory: String).returns(T.nilable(NativeDirectoryPackagesPropsDiscovery))
-      end
-      def self.from_json(json, directory)
-        return nil if json.nil?
-
-        file_path = File.join(directory, T.let(json.fetch("FilePath"), String))
-        is_transitive_pinning_enabled = T.let(json.fetch("IsTransitivePinningEnabled"), T::Boolean)
-        dependencies = T.let(json.fetch("Dependencies"), T::Array[T::Hash[String, T.untyped]]).map do |dep|
-          NativeDependencyDetails.from_json(dep)
-        end
-
-        NativeDirectoryPackagesPropsDiscovery.new(file_path: file_path,
-                                                  is_transitive_pinning_enabled: is_transitive_pinning_enabled,
-                                                  dependencies: dependencies)
-      end
-
-      sig do
-        params(file_path: String,
-               is_transitive_pinning_enabled: T::Boolean,
-               dependencies: T::Array[NativeDependencyDetails]).void
-      end
-      def initialize(file_path:, is_transitive_pinning_enabled:, dependencies:)
-        super(file_path: file_path, dependencies: dependencies)
-        @is_transitive_pinning_enabled = is_transitive_pinning_enabled
-      end
-
-      sig { returns(T::Boolean) }
-      attr_reader :is_transitive_pinning_enabled
-    end
-  end
-end