dependabot-nuget 0.297.2 → 0.299.0

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/UpdatedDependencyListTests.cs

@@ -17,6 +17,7 @@ public class UpdatedDependencyListTests
         Directory.CreateDirectory(Path.Combine(temp.DirectoryPath, "src", "a"));
         Directory.CreateDirectory(Path.Combine(temp.DirectoryPath, "src", "b"));
         Directory.CreateDirectory(Path.Combine(temp.DirectoryPath, "src", "c"));
+        Directory.CreateDirectory(Path.Combine(temp.DirectoryPath, ".config"));
 
         File.WriteAllText(Path.Combine(temp.DirectoryPath, "src", "a", "packages.config"), "");
         File.WriteAllText(Path.Combine(temp.DirectoryPath, "src", "b", "packages.config"), "");
@@ -25,6 +26,9 @@ public class UpdatedDependencyListTests
         File.WriteAllText(Path.Combine(temp.DirectoryPath, "src", "b", "project.csproj"), "");
         File.WriteAllText(Path.Combine(temp.DirectoryPath, "src", "c", "project.csproj"), "");
 
+        File.WriteAllText(Path.Combine(temp.DirectoryPath, "global.json"), "");
+        File.WriteAllText(Path.Combine(temp.DirectoryPath, ".config/dotnet-tools.json"), "");
+
         var discovery = new WorkspaceDiscoveryResult()
         {
             Path = "src",
@@ -69,13 +73,55 @@ public class UpdatedDependencyListTests
                     ImportedFiles = [],
                     AdditionalFiles = ["packages.config"],
                 }
-            ]
+            ],
+            GlobalJson = new()
+            {
+                FilePath = "../global.json",
+                Dependencies = [
+                    new("Some.MSBuild.Sdk", "1.0.0", DependencyType.MSBuildSdk)
+                ]
+            },
+            DotNetToolsJson = new()
+            {
+                FilePath = "../.config/dotnet-tools.json",
+                Dependencies = [
+                    new("some-tool", "2.0.0", DependencyType.DotNetTool)
+                ]
+            }
         };
         var updatedDependencyList = RunWorker.GetUpdatedDependencyListFromDiscovery(discovery, pathToContents: temp.DirectoryPath);
         var expectedDependencyList = new UpdatedDependencyList()
         {
             Dependencies =
             [
+                new ReportedDependency()
+                {
+                    Name = "some-tool",
+                    Version = "2.0.0",
+                    Requirements =
+                    [
+                        new ReportedRequirement()
+                        {
+                            Requirement = "2.0.0",
+                            File = "/.config/dotnet-tools.json",
+                            Groups = ["dependencies"],
+                        }
+                    ]
+                },
+                new ReportedDependency()
+                {
+                    Name = "Some.MSBuild.Sdk",
+                    Version = "1.0.0",
+                    Requirements =
+                    [
+                        new ReportedRequirement()
+                        {
+                            Requirement = "1.0.0",
+                            File = "/global.json",
+                            Groups = ["dependencies"],
+                        }
+                    ]
+                },
                 new ReportedDependency()
                 {
                     Name = "Microsoft.Extensions.DependencyModel",
@@ -119,7 +165,7 @@ public class UpdatedDependencyListTests
                     ],
                 },
             ],
-            DependencyFiles = ["/src/a/packages.config", "/src/a/project.csproj", "/src/b/packages.config", "/src/b/project.csproj", "/src/c/packages.config", "/src/c/project.csproj"],
+            DependencyFiles = ["/.config/dotnet-tools.json", "/global.json", "/src/a/packages.config", "/src/a/project.csproj", "/src/b/packages.config", "/src/b/project.csproj", "/src/c/packages.config", "/src/c/project.csproj"],
         };
 
         // doing JSON comparison makes this easier; we don't have to define custom record equality and we get an easy diff

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

@@ -0,0 +1,23 @@
+using System.Text.RegularExpressions;
+
+using Xunit;
+
+using static NuGetUpdater.Core.Utilities.EOLHandling;
+
+namespace NuGetUpdater.Core.Test.Utilities
+{
+    public class EOLHandlingTests
+    {
+        [Theory]
+        [InlineData(EOLType.LF, "\n")]
+        [InlineData(EOLType.CR, "\r")]
+        [InlineData(EOLType.CRLF, "\r\n")]
+        public void ValidateEOLNormalizesFromLF(EOLType eolType, string literal)
+        {
+            var teststring = "this\ris\na\r\nstring\rwith\nmixed\r\nline\rendings\n.";
+            var changed = teststring.SetEOL(eolType);
+            var lineEndings = Regex.Split(changed, "\\S+");
+            Assert.All(lineEndings, lineEnding => lineEnding.Equals(literal));
+        }
+    }
+}

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

@@ -1542,6 +1542,14 @@ public class MSBuildHelperTests : TestBase
             new DependencyNotFound("Some.Package"),
         ];
 
+        yield return
+        [
+            // output
+            """error : Could not resolve SDK "missing-sdk".""",
+            // expectedError
+            new DependencyNotFound("missing-sdk"),
+        ];
+
         yield return
         [
             // output

data/lib/dependabot/nuget/file_fetcher.rb

@@ -26,6 +26,7 @@ module Dependabot
 
       sig { override.returns(T::Array[DependencyFile]) }
       def fetch_files
+        NativeHelpers.normalize_file_names
         NativeHelpers.install_dotnet_sdks
         discovery_json_reader = DiscoveryJsonReader.run_discovery_in_directory(
           repo_contents_path: T.must(repo_contents_path),

data/lib/dependabot/nuget/native_helpers.rb

@@ -286,6 +286,22 @@ module Dependabot
         end
       end
 
+      sig { void }
+      def self.normalize_file_names
+        # environment variables are required and the following will generate an actionable error message if they're not
+        _dependabot_repo_contents_path = ENV.fetch("DEPENDABOT_REPO_CONTENTS_PATH")
+
+        # this environment variable is directly used
+        dependabot_home = ENV.fetch("DEPENDABOT_HOME")
+
+        command = [
+          "pwsh",
+          "#{dependabot_home}/dependabot-updater/bin/normalize-file-names.ps1"
+        ].join(" ")
+        output = SharedHelpers.run_shell_command(command)
+        puts output
+      end
+
       sig { void }
       def self.install_dotnet_sdks
         return unless Dependabot::Experiments.enabled?(:nuget_install_dotnet_sdks)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.297.2
+  version: 0.299.0
 platform: ruby
 authors:
 - Dependabot
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-19 00:00:00.000000000 Z
+date: 2025-02-27 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.297.2
+        version: 0.299.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.297.2
+        version: 0.299.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -375,6 +375,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.PackagesConfig.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Utilities/AssertEx.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Utilities/DiffUtil.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Utilities/EOLHandlingTests.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Utilities/JsonHelperTests.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Utilities/LinuxOnlyAttribute.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Utilities/MSBuildHelperTests.cs
@@ -493,6 +494,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/ConsoleLogger.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/DependencyConflictResolver.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/DotNetPackageCorrelationManager.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/EOLHandling.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/HashSetExtensions.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/ILogger.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/ImmutableArrayExtensions.cs
@@ -535,7 +537,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.297.2
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.299.0
 post_install_message:
 rdoc_options: []
 require_paths: