dependabot-nuget 0.110.4 → 0.110.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34101e4a1b038bc9076ac5b0013a08d323e9167f99bb5e794351e251e7187c81
-  data.tar.gz: 2fa3fe874c0fdb3b59949eca24b3773f42e98b6bb07dbbf1e96c687ba611bbee
+  metadata.gz: a29ae7954bc5e4dbc4e0a6cf5c9727aa8f30fe0e332a616187a0b9fbd0e492fa
+  data.tar.gz: 70bd8354e54a5af3ed18de12adc6e61c102f03af36d4fc2ff81a7960092761cf
 SHA512:
-  metadata.gz: 6cb7e26391de24dad227550d26e1407ed88fcc1ce0aa0fea6dd0701e17a4a264f8a5043b5db2b9ddf2551f6ec7ac2fac8ece4695761a8ee0077704c6ea76e020
-  data.tar.gz: 7455add4bbc54319a354cc40ee4e7dc2bc6cce6e822984a92fee52a0bf787d93a533bde9b2909f9338071808f9762827ab4a6eca9e5f3826c3cbdbad51330c93
+  metadata.gz: af56b31dfa326316f4187952f03149de3c246fb66e10f70b66d37083db6a1e37fce114902d2d341eef488b87e9b0d6ac5b36ebbb527bfc85a2bac712b8c4995b
+  data.tar.gz: 1617e1671cfd6f71b21ac3d190b7d13a95ee820badadc1228111f10de3ec70f5de27b4c677201e5fc205d3c51926f21c4453e5c82a5aa7fe779a6d3296dff4da

data/lib/dependabot/nuget/file_fetcher.rb

@@ -26,7 +26,7 @@ module Dependabot
       def fetch_files
         fetched_files = []
         fetched_files += project_files
-        fetched_files += directory_build_props_files
+        fetched_files += directory_build_files
         fetched_files += imported_property_files
 
         fetched_files += packages_config_files
@@ -94,32 +94,47 @@ module Dependabot
         sln_files.map(&:name)
       end
 
-      def directory_build_props_files
-        return @directory_build_props_files if @directory_build_checked
+      def directory_build_files
+        return @directory_build_files if @directory_build_files_checked
 
-        @directory_build_checked = true
+        @directory_build_files_checked = true
         attempted_paths = []
-        @directory_build_props_files = []
+        @directory_build_files = []
 
         # Don't need to insert "." here, because Directory.Build.props files
         # can only be used by project files (not packages.config ones)
         project_files.map { |f| File.dirname(f.name) }.uniq.map do |dir|
-          possible_paths = dir.split("/").map.with_index do |_, i|
+          possible_paths = dir.split("/").flat_map.with_index do |_, i|
             base = dir.split("/").first(i + 1).join("/")
-            Pathname.new(base + "/Directory.Build.props").cleanpath.to_path
-          end.reverse + ["Directory.Build.props"]
+            possible_build_file_paths(base)
+          end.reverse
+
+          possible_paths += [
+            "Directory.Build.props",
+            "Directory.build.props",
+            "Directory.Build.targets",
+            "Directory.build.targets"
+          ]
 
           possible_paths.each do |path|
             break if attempted_paths.include?(path)
 
             attempted_paths << path
-            @directory_build_props_files << fetch_file_from_host(path)
-          rescue Dependabot::DependencyFileNotFound
-            next
+            file = fetch_file_if_present(path)
+            @directory_build_files << file if file
           end
         end
 
-        @directory_build_props_files
+        @directory_build_files
+      end
+
+      def possible_build_file_paths(base)
+        [
+          Pathname.new(base + "/Directory.Build.props").cleanpath.to_path,
+          Pathname.new(base + "/Directory.build.props").cleanpath.to_path,
+          Pathname.new(base + "/Directory.Build.targets").cleanpath.to_path,
+          Pathname.new(base + "/Directory.build.targets").cleanpath.to_path
+        ]
       end
 
       def sln_project_files
@@ -192,7 +207,9 @@ module Dependabot
       def imported_property_files
         imported_property_files = []
 
-        [*project_files, *directory_build_props_files].each do |proj_file|
+        files = [*project_files, *directory_build_files]
+
+        files.each do |proj_file|
           previously_fetched_files = project_files + imported_property_files
           imported_property_files +=
             fetch_imported_property_files(

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

@@ -25,6 +25,12 @@ module Dependabot
             file: callsite_file
           )
 
+          node_details ||=
+            find_property_in_directory_build_targets(
+              property: property_name,
+              callsite_file: callsite_file
+            )
+
           node_details ||=
             find_property_in_directory_build_props(
               property: property_name,
@@ -89,14 +95,37 @@ module Dependabot
           deep_find_prop_node(property: property, file: file)
         end
 
+        def find_property_in_directory_build_targets(property:, callsite_file:)
+          file = build_targets_file_for_project(callsite_file)
+          return unless file
+
+          deep_find_prop_node(property: property, file: file)
+        end
+
         def find_property_in_directory_build_props(property:, callsite_file:)
-          file = buildfile_for_project(callsite_file)
+          file = build_props_file_for_project(callsite_file)
           return unless file
 
           deep_find_prop_node(property: property, file: file)
         end
 
-        def buildfile_for_project(project_file)
+        def build_targets_file_for_project(project_file)
+          dir = File.dirname(project_file.name)
+
+          # Nuget walks up the directory structure looking for a
+          # Directory.Build.targets file
+          possible_paths = dir.split("/").map.with_index do |_, i|
+            base = dir.split("/").first(i + 1).join("/")
+            Pathname.new(base + "/Directory.Build.targets").cleanpath.to_path
+          end.reverse + ["Directory.Build.targets"]
+
+          path = possible_paths.uniq.
+                 find { |p| dependency_files.find { |f| f.name == p } }
+
+          dependency_files.find { |f| f.name == path }
+        end
+
+        def build_props_file_for_project(project_file)
           dir = File.dirname(project_file.name)
 
           # Nuget walks up the directory structure looking for a
@@ -106,8 +135,9 @@ module Dependabot
             Pathname.new(base + "/Directory.Build.props").cleanpath.to_path
           end.reverse + ["Directory.Build.props"]
 
-          path = possible_paths.uniq.
-                 find { |p| dependency_files.find { |f| f.name == p } }
+          path =
+            possible_paths.uniq.
+            find { |p| dependency_files.find { |f| f.name.casecmp(p).zero? } }
 
           dependency_files.find { |f| f.name == path }
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.110.4
+  version: 0.110.5
 platform: ruby
 authors:
 - Dependabot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.110.4
+        version: 0.110.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.110.4
+        version: 0.110.5
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement