dependabot-nuget 0.98.2 → 0.98.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f641e81f93be78c9a188e85e7c8b69544d3deeb84b17de9d4b6e0a300a39d47
-  data.tar.gz: 6cf6646e6fd7bd5a039ed25e5b895f97f1f762b961a6f36cac40bb9a8f1619f5
+  metadata.gz: 9161f9efa272c8d0964735606648dc7c0a57c14bd35c9167ef2c43d75d8b7ae5
+  data.tar.gz: f0d76fd06332a119de0cb6345084abaa16c1050af23cd1fa1146a2d90960eccc
 SHA512:
-  metadata.gz: 5045df84a56c4701b811bd3085dee0a76e82532ec54fb8c293b9611106668b480b920ed13dcd0e781f925b2ee325478145fcd69a4a450901e9696bee3cf0e10b
-  data.tar.gz: df087af42b01ca21652173c22452dd95dbe2c66cc06ff8d7b6558c5d54c7f1c560814ffde1816c1ee73b572cccae3a28b0c6d3a8e2fbf86e78e54c87cdb54ddc
+  metadata.gz: 29fe6f68612b4995fa9cd4fc0cc7e1e4f2b20bc6f05869b96b9d8f711b1b23dfa9944f34568beb15cc8136e2ed8863815b3ae936138b3b2b71ef98b42ad8572f
+  data.tar.gz: dae7663ef6334291abe00f9cdec0bfc988df43e341ad910f248391ee34cb172f805855c3798684449cfdd440386e1120014f55225435c8aae1add4a7eac4c158

data/lib/dependabot/nuget/file_fetcher.rb

@@ -31,6 +31,7 @@ module Dependabot
 
         fetched_files += packages_config_files
         fetched_files << nuget_config if nuget_config
+        fetched_files << global_json if global_json
 
         fetched_files = fetched_files.uniq
 
@@ -181,6 +182,10 @@ module Dependabot
           end
       end
 
+      def global_json
+        @global_json ||= fetch_file_if_present("global.json")
+      end
+
       def imported_property_files
         imported_property_files = []
 

data/lib/dependabot/nuget/file_parser.rb

@@ -14,6 +14,7 @@ module Dependabot
       require "dependabot/file_parsers/base/dependency_set"
       require_relative "file_parser/project_file_parser"
       require_relative "file_parser/packages_config_parser"
+      require_relative "file_parser/global_json_parser"
 
       PACKAGE_CONF_DEPENDENCY_SELECTOR = "packages > packages"
 
@@ -21,6 +22,7 @@ module Dependabot
         dependency_set = DependencySet.new
         dependency_set += project_file_dependencies
         dependency_set += packages_config_dependencies
+        dependency_set += global_json_dependencies if global_json
         dependency_set.dependencies
       end
 
@@ -48,6 +50,12 @@ module Dependabot
         dependency_set
       end
 
+      def global_json_dependencies
+        return DependencySet.new unless global_json
+
+        GlobalJsonParser.new(global_json: global_json).dependency_set
+      end
+
       def project_file_parser
         @project_file_parser ||=
           ProjectFileParser.new(dependency_files: dependency_files)
@@ -67,13 +75,17 @@ module Dependabot
         dependency_files -
           project_files -
           packages_config_files -
-          [nuget_config]
+          [nuget_config, global_json]
       end
 
       def nuget_config
         dependency_files.find { |f| f.name.casecmp("nuget.config").zero? }
       end
 
+      def global_json
+        dependency_files.find { |f| f.name.casecmp("global.json").zero? }
+      end
+
       def check_required_files
         return if project_files.any? || packages_config_files.any?
 

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require "json"
+
+require "dependabot/dependency"
+require "dependabot/nuget/file_parser"
+
+# For details on global.json files see:
+# https://docs.microsoft.com/en-us/dotnet/core/tools/global-json
+module Dependabot
+  module Nuget
+    class FileParser
+      class GlobalJsonParser
+        require "dependabot/file_parsers/base/dependency_set"
+
+        def initialize(global_json:)
+          @global_json = global_json
+        end
+
+        def dependency_set
+          dependency_set = Dependabot::FileParsers::Base::DependencySet.new
+
+          project_sdks = JSON.parse(global_json.content).
+                         fetch("msbuild-sdks", {})
+
+          unless project_sdks.is_a?(Hash)
+            raise Dependabot::DependencyFileNotParseable, global_json.path
+          end
+
+          project_sdks.each do |dependency_name, version|
+            dependency_set <<
+              Dependency.new(
+                name: dependency_name,
+                version: version,
+                package_manager: "nuget",
+                requirements: [{
+                  requirement: version,
+                  file: global_json.name,
+                  groups: [],
+                  source: nil
+                }]
+              )
+          end
+
+          dependency_set
+        end
+
+        private
+
+        attr_reader :global_json
+      end
+    end
+  end
+end

data/lib/dependabot/nuget/file_updater.rb

@@ -13,7 +13,8 @@ module Dependabot
       def self.updated_files_regex
         [
           %r{^[^/]*\.[a-z]{2}proj$},
-          /^packages\.config$/i
+          /^packages\.config$/i,
+          /^global\.json$/i
         ]
       end
 
@@ -50,6 +51,10 @@ module Dependabot
         end
       end
 
+      def global_json
+        dependency_files.find { |f| f.name.casecmp("global.json").zero? }
+      end
+
       def check_required_files
         return if project_files.any? || packages_config_files.any?
 
@@ -113,7 +118,16 @@ module Dependabot
       end
 
       def original_declarations(dependency, requirement)
-        declaration_finder(dependency, requirement).declaration_strings
+        if requirement.fetch(:file).casecmp("global.json").zero?
+          [
+            global_json.content.match(
+              /"#{Regexp.escape(dependency.name)}"\s*:\s*
+               "#{Regexp.escape(dependency.previous_version)}"/x
+            ).to_s
+          ]
+        else
+          declaration_finder(dependency, requirement).declaration_strings
+        end
       end
 
       def declaration_finder(dependency, requirement)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.98.2
+  version: 0.98.3
 platform: ruby
 authors:
 - Dependabot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.98.2
+        version: 0.98.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.98.2
+        version: 0.98.3
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +148,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/global_json_parser.rb
 - lib/dependabot/nuget/file_parser/packages_config_parser.rb
 - lib/dependabot/nuget/file_parser/project_file_parser.rb
 - lib/dependabot/nuget/file_parser/property_value_finder.rb