dependabot-nuget 0.220.0 → 0.221.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee37330535bf474dcbfe5d3555320fea1d19b3df9304b9e468b2e139c9ba5d7c
-  data.tar.gz: e45223129f4e11afedac2c2755633fa386e4289c75eee5fe1be46e50a6d45ecf
+  metadata.gz: d7d776be775e76a5a58be89d6b097216f3578acffd53e3898a4d9fabea4f7981
+  data.tar.gz: 97cd3e0080fccacbf98e31f9dce05b3732bcc17fe2956ae1728d83f62eee22ae
 SHA512:
-  metadata.gz: 9277939477201b20c8b75afa44d726ae8a3a0666e5f52f96171a9f3160ac3b2ccb1210b89fb05d6cc361c68f3f5e8337f80e706de4e5bcd402af9c0b48e1d743
-  data.tar.gz: e91b5a675968f61bab2dec32b7dec540b7d45ced8af6a757b8a1a35d16e718b634138b2beb3ad8e9d6e669ebc61f2fd4055347178a34fa660ac551fd200d3e1a
+  metadata.gz: 29bd2c29a75911814e34a7497e4b8f761da60f0fbe0126fbb5377bf31764709d0be4e8085561af773b96e5af91782f9bf1caea052a932eafd78328b5e3781218
+  data.tar.gz: b1c1d9567db4ce7ab9f3936aad96e29a9c4d1dfc38a17520409d63923d19f6fda0810a8d3403bc3c17feaedb3179a8e5f6076a4ac15c67fd91fb1e015a51adb2

data/lib/dependabot/nuget/file_fetcher.rb

@@ -2,6 +2,7 @@
 
 require "dependabot/file_fetchers"
 require "dependabot/file_fetchers/base"
+require "set"
 
 module Dependabot
   module Nuget
@@ -56,6 +57,7 @@ module Dependabot
             project_files << csproj_file if csproj_file
             project_files << vbproj_file if vbproj_file
             project_files << fsproj_file if fsproj_file
+            project_files << directory_packages_props_file if directory_packages_props_file
 
             project_files += sln_project_files
             project_files
@@ -203,19 +205,40 @@ module Dependabot
           end
       end
 
+      def directory_packages_props_file
+        @directory_packages_props_file ||=
+          begin
+            file = repo_contents.find { |f| f.name.casecmp?("directory.packages.props") }
+            fetch_file_from_host(file.name) if file
+          end
+      end
+
       def nuget_config_files
         return @nuget_config_files if @nuget_config_files
 
-        candidate_paths =
-          [*project_files.map { |f| File.dirname(f.name) }, "."].uniq
+        @nuget_config_files = []
+        candidate_paths = [*project_files.map { |f| File.dirname(f.name) }, "."].uniq
+        visited_directories = Set.new
+        candidate_paths.each do |dir|
+          search_in_directory_and_parents(dir, visited_directories)
+        end
+        @nuget_config_files
+      end
 
-        @nuget_config_files ||=
-          candidate_paths.filter_map do |dir|
-            file = repo_contents(dir: dir).
-                   find { |f| f.name.casecmp("nuget.config").zero? }
-            file = fetch_file_from_host(File.join(dir, file.name)) if file
+      def search_in_directory_and_parents(dir, visited_directories)
+        loop do
+          break if visited_directories.include?(dir)
+
+          visited_directories << dir
+          file = repo_contents(dir: dir).
+                 find { |f| f.name.casecmp("nuget.config").zero? }
+          if file
+            file = fetch_file_from_host(File.join(dir, file.name))
             file&.tap { |f| f.support_file = true }
+            @nuget_config_files << file
           end
+          dir = File.dirname(dir)
+        end
       end
 
       def global_json

data/lib/dependabot/nuget/file_parser.rb

@@ -70,7 +70,13 @@ module Dependabot
       end
 
       def project_files
-        dependency_files.select { |df| df.name.match?(/\.[a-z]{2}proj$/) }
+        projfile = /\.[a-z]{2}proj$/
+        packageprops = /[Dd]irectory.[Pp]ackages.props/
+
+        dependency_files.select do |df|
+          df.name.match?(projfile) ||
+            df.name.match?(packageprops)
+        end
       end
 
       def packages_config_files

data/lib/dependabot/nuget/file_updater.rb

@@ -46,7 +46,7 @@ module Dependabot
       private
 
       def project_files
-        dependency_files.select { |df| df.name.match?(/\.[a-z]{2}proj$/) }
+        dependency_files.select { |df| df.name.match?(/\.[a-z]{2}proj$|[Dd]irectory.[Pp]ackages.props/) }
       end
 
       def packages_config_files

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.220.0
+  version: 0.221.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-12 00:00:00.000000000 Z
+date: 2023-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.220.0
+        version: 0.221.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.220.0
+        version: 0.221.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: gpgme
   requirement: !ruby/object:Gem::Requirement
@@ -136,34 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.17.1
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.22.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.22.0
-- !ruby/object:Gem::Dependency
-  name: simplecov-console
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: stackprof
   requirement: !ruby/object:Gem::Requirement
@@ -241,7 +213,7 @@ licenses:
 - Nonstandard
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.220.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.221.0
 post_install_message: 
 rdoc_options: []
 require_paths: