dependabot-nuget 0.216.1 → 0.217.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d59de5c928c4f52da4ed75a1d3d2bfb189d50e094a9ff23feb4b5f30db191e14
-  data.tar.gz: ed47f2dbe31c7ba7e24205ecc9919381395f69b6ceb304c3afa744914c023268
+  metadata.gz: 9aef8000d04789246d90d3a38cf04be9886bb42f0f0fb02c99a27cbbb22bb9e0
+  data.tar.gz: 535031557e7603ac372452fd67e1e5126b116a746a6981fce87773fe4ec46199
 SHA512:
-  metadata.gz: 1b28324853a826812cb34f010bd5e9117f9de0f94f9d6d8bf876f3fd7a26ba46838e9bd504248b66ad55285125cddbb47d9c168ee3998367370a4d351c9eebc2
-  data.tar.gz: 0d0f3e8af3e22bb2db4b8085d2dd8548b5119c120d25a095449e45b73201413cc659f23e7a63db7dcfdfc893bab012c94bc36da273d1ce9e1bc4bb342b92ba4f
+  metadata.gz: 65a99a951e8de3190e0d1c4d585cc2a3f353d1f1ab28eb5b4d8abf670d1d7557a0ed4bd523cca6aa659d238ca4da90e15128aa4ee8cce7b3437a59a45cc61b29
+  data.tar.gz: 5ff84ccc217802a9794fe3855ddadb8ed106fd65a4d0b4ca0d847e3bc47618fb7ca8548696cbd36daa65842d393077f66305e9806efe31309753b90f39078633

data/lib/dependabot/nuget/file_fetcher.rb

@@ -32,6 +32,7 @@ module Dependabot
         fetched_files += packages_config_files
         fetched_files += nuget_config_files
         fetched_files << global_json if global_json
+        fetched_files << dotnet_tools_json if dotnet_tools_json
         fetched_files << packages_props if packages_props
 
         fetched_files = fetched_files.uniq
@@ -221,6 +222,12 @@ module Dependabot
         @global_json ||= fetch_file_if_present("global.json")
       end
 
+      def dotnet_tools_json
+        @dotnet_tools_json ||= fetch_file_if_present(".config/dotnet-tools.json")
+      rescue Dependabot::DependencyFileNotFound
+        nil
+      end
+
       def packages_props
         @packages_props ||= fetch_file_if_present("Packages.props")
       end

data/lib/dependabot/nuget/file_parser/dotnet_tools_json_parser.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "json"
+
+require "dependabot/dependency"
+require "dependabot/nuget/file_parser"
+
+# For details on dotnet-tools.json files see:
+# https://learn.microsoft.com/en-us/dotnet/core/tools/local-tools-how-to-use
+module Dependabot
+  module Nuget
+    class FileParser
+      class DotNetToolsJsonParser
+        require "dependabot/file_parsers/base/dependency_set"
+
+        def initialize(dotnet_tools_json:)
+          @dotnet_tools_json = dotnet_tools_json
+        end
+
+        def dependency_set
+          dependency_set = Dependabot::FileParsers::Base::DependencySet.new
+
+          tools = parsed_dotnet_tools_json.fetch("tools", {})
+
+          raise Dependabot::DependencyFileNotParseable, dotnet_tools_json.path unless tools.is_a?(Hash)
+
+          tools.each do |dependency_name, node|
+            raise Dependabot::DependencyFileNotParseable, dotnet_tools_json.path unless node.is_a?(Hash)
+
+            version = node["version"]
+            dependency_set <<
+              Dependency.new(
+                name: dependency_name,
+                version: version,
+                package_manager: "nuget",
+                requirements: [{
+                  requirement: version,
+                  file: dotnet_tools_json.name,
+                  groups: ["dependencies"],
+                  source: nil
+                }]
+              )
+          end
+
+          dependency_set
+        end
+
+        private
+
+        attr_reader :dotnet_tools_json
+
+        def parsed_dotnet_tools_json
+          @parsed_dotnet_tools_json ||= JSON.parse(dotnet_tools_json.content)
+        rescue JSON::ParserError
+          raise Dependabot::DependencyFileNotParseable, dotnet_tools_json.path
+        end
+      end
+    end
+  end
+end

data/lib/dependabot/nuget/file_parser.rb

@@ -15,6 +15,7 @@ module Dependabot
       require_relative "file_parser/project_file_parser"
       require_relative "file_parser/packages_config_parser"
       require_relative "file_parser/global_json_parser"
+      require_relative "file_parser/dotnet_tools_json_parser"
 
       PACKAGE_CONF_DEPENDENCY_SELECTOR = "packages > packages"
 
@@ -23,6 +24,7 @@ module Dependabot
         dependency_set += project_file_dependencies
         dependency_set += packages_config_dependencies
         dependency_set += global_json_dependencies if global_json
+        dependency_set += dotnet_tools_json_dependencies if dotnet_tools_json
         dependency_set.dependencies
       end
 
@@ -56,6 +58,12 @@ module Dependabot
         GlobalJsonParser.new(global_json: global_json).dependency_set
       end
 
+      def dotnet_tools_json_dependencies
+        return DependencySet.new unless dotnet_tools_json
+
+        DotNetToolsJsonParser.new(dotnet_tools_json: dotnet_tools_json).dependency_set
+      end
+
       def project_file_parser
         @project_file_parser ||=
           ProjectFileParser.new(dependency_files: dependency_files)
@@ -76,7 +84,8 @@ module Dependabot
           project_files -
           packages_config_files -
           nuget_configs -
-          [global_json]
+          [global_json] -
+          [dotnet_tools_json]
       end
 
       def nuget_configs
@@ -87,6 +96,10 @@ module Dependabot
         dependency_files.find { |f| f.name.casecmp("global.json").zero? }
       end
 
+      def dotnet_tools_json
+        dependency_files.find { |f| f.name.casecmp(".config/dotnet-tools.json").zero? }
+      end
+
       def check_required_files
         return if project_files.any? || packages_config_files.any?
 

data/lib/dependabot/nuget/file_updater.rb

@@ -15,6 +15,7 @@ module Dependabot
           %r{^[^/]*\.[a-z]{2}proj$},
           /^packages\.config$/i,
           /^global\.json$/i,
+          /^dotnet-tools\.json$/i,
           /^Directory\.Build\.props$/i,
           /^Directory\.Build\.targets$/i,
           /^Packages\.props$/i
@@ -58,6 +59,10 @@ module Dependabot
         dependency_files.find { |f| f.name.casecmp("global.json").zero? }
       end
 
+      def dotnet_tools_json
+        dependency_files.find { |f| f.name.casecmp(".config/dotnet-tools.json").zero? }
+      end
+
       def check_required_files
         return if project_files.any? || packages_config_files.any?
 
@@ -128,6 +133,13 @@ module Dependabot
                "#{Regexp.escape(dependency.previous_version)}"/x
             ).to_s
           ]
+        elsif requirement.fetch(:file).casecmp(".config/dotnet-tools.json").zero?
+          [
+            dotnet_tools_json.content.match(
+              /"#{Regexp.escape(dependency.name)}"\s*:\s*{\s*"version"\s*:\s*
+               "#{Regexp.escape(dependency.previous_version)}"/xm
+            ).to_s
+          ]
         else
           declaration_finder(dependency, requirement).declaration_strings
         end

data/lib/dependabot/nuget/update_checker/version_finder.rb

@@ -307,11 +307,11 @@ module Dependabot
         end
 
         def version_class
-          Nuget::Version
+          dependency.version_class
         end
 
         def requirement_class
-          Nuget::Requirement
+          dependency.requirement_class
         end
 
         def remove_wrapping_zero_width_chars(string)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.216.1
+  version: 0.217.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-14 00:00:00.000000000 Z
+date: 2023-04-24 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.216.1
+        version: 0.217.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.216.1
+        version: 0.217.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +219,7 @@ files:
 - lib/dependabot/nuget/file_fetcher/import_paths_finder.rb
 - lib/dependabot/nuget/file_fetcher/sln_project_paths_finder.rb
 - lib/dependabot/nuget/file_parser.rb
+- lib/dependabot/nuget/file_parser/dotnet_tools_json_parser.rb
 - lib/dependabot/nuget/file_parser/global_json_parser.rb
 - lib/dependabot/nuget/file_parser/packages_config_parser.rb
 - lib/dependabot/nuget/file_parser/project_file_parser.rb