dependabot-nuget 0.279.0 → 0.281.0

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

@@ -483,7 +483,7 @@ public class MSBuildHelperTests : TestBase
             {
                 new Dependency("Some.Other.Package", "1.2.0", DependencyType.PackageReference),
             };
-            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflicts(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new Logger(true));
+            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflicts(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new TestLogger());
             Assert.NotNull(resolvedDependencies);
             Assert.Equal(2, resolvedDependencies.Length);
             Assert.Equal("Some.Package", resolvedDependencies[0].Name);
@@ -533,7 +533,7 @@ public class MSBuildHelperTests : TestBase
                 new Dependency("CS-Script.Core", "2.0.0", DependencyType.PackageReference),
             };
 
-            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new Logger(true));
+            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new TestLogger());
             Assert.NotNull(resolvedDependencies);
             Assert.Equal(3, resolvedDependencies.Length);
             Assert.Equal("CS-Script.Core", resolvedDependencies[0].Name);
@@ -578,7 +578,7 @@ public class MSBuildHelperTests : TestBase
                 new Dependency("Microsoft.Bcl.AsyncInterfaces", "1.1.1", DependencyType.Unknown)
             };
 
-            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new Logger(true));
+            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new TestLogger());
             Assert.NotNull(resolvedDependencies);
             Assert.Single(resolvedDependencies);
             Assert.Equal("Azure.Core", resolvedDependencies[0].Name);
@@ -621,7 +621,7 @@ public class MSBuildHelperTests : TestBase
                 new Dependency("Newtonsoft.Json", "13.0.1", DependencyType.Unknown)
             };
 
-            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new Logger(true));
+            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new TestLogger());
             Assert.NotNull(resolvedDependencies);
             Assert.Equal(2, resolvedDependencies.Length);
             Assert.Equal("Newtonsoft.Json.Bson", resolvedDependencies[0].Name);
@@ -671,7 +671,7 @@ public class MSBuildHelperTests : TestBase
                 new Dependency("Microsoft.CodeAnalysis.Common", "4.10.0", DependencyType.PackageReference)
             };
 
-            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new Logger(true));
+            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new TestLogger());
             Assert.NotNull(resolvedDependencies);
             Assert.Equal(3, resolvedDependencies.Length);
             Assert.Equal("Microsoft.CodeAnalysis.Compilers", resolvedDependencies[0].Name);
@@ -723,7 +723,7 @@ public class MSBuildHelperTests : TestBase
                 new Dependency("Microsoft.CodeAnalysis.Common", "4.10.0", DependencyType.PackageReference)
             };
 
-            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new Logger(true));
+            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new TestLogger());
             Assert.NotNull(resolvedDependencies);
             Assert.Equal(4, resolvedDependencies.Length);
             Assert.Equal("Microsoft.CodeAnalysis.Compilers", resolvedDependencies[0].Name);
@@ -779,7 +779,7 @@ public class MSBuildHelperTests : TestBase
                 new Dependency("Newtonsoft.Json", "13.0.1", DependencyType.Unknown)
             };
 
-            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new Logger(true));
+            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new TestLogger());
             Assert.NotNull(resolvedDependencies);
             Assert.Equal(5, resolvedDependencies.Length);
             Assert.Equal("Microsoft.CodeAnalysis.Compilers", resolvedDependencies[0].Name);
@@ -838,7 +838,7 @@ public class MSBuildHelperTests : TestBase
                 new Dependency("Buildalyzer", "7.0.1", DependencyType.PackageReference),
             };
 
-            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new Logger(true));
+            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new TestLogger());
             Assert.NotNull(resolvedDependencies);
             Assert.Equal(4, resolvedDependencies.Length);
             Assert.Equal("Buildalyzer", resolvedDependencies[0].Name);
@@ -895,7 +895,7 @@ public class MSBuildHelperTests : TestBase
                 new Dependency("Azure.Core", "1.22.0", DependencyType.PackageReference)
             };
 
-            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new Logger(true));
+            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new TestLogger());
             Assert.NotNull(resolvedDependencies);
             Assert.Equal(4, resolvedDependencies.Length);
             Assert.Equal("System.Collections.Immutable", resolvedDependencies[0].Name);
@@ -952,7 +952,7 @@ public class MSBuildHelperTests : TestBase
                 new Dependency("Azure.Core", "1.22.0", DependencyType.PackageReference)
             };
 
-            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new Logger(true));
+            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new TestLogger());
             Assert.NotNull(resolvedDependencies);
             Assert.Equal(5, resolvedDependencies.Length);
             Assert.Equal("System.Collections.Immutable", resolvedDependencies[0].Name);
@@ -1007,7 +1007,7 @@ public class MSBuildHelperTests : TestBase
                 new Dependency("AutoMapper.Collection", "10.0.0", DependencyType.PackageReference)
             };
 
-            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new Logger(true));
+            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new TestLogger());
             Assert.NotNull(resolvedDependencies);
             Assert.Equal(3, resolvedDependencies.Length);
             Assert.Equal("AutoMapper.Extensions.Microsoft.DependencyInjection", resolvedDependencies[0].Name);
@@ -1054,7 +1054,7 @@ public class MSBuildHelperTests : TestBase
                 new Dependency("Microsoft.Extensions.Caching.Memory", "8.0.0", DependencyType.PackageReference)
             };
 
-            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new Logger(true));
+            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new TestLogger());
             Assert.NotNull(resolvedDependencies);
             Assert.Equal(2, resolvedDependencies.Length);
             Assert.Equal("Microsoft.EntityFrameworkCore", resolvedDependencies[0].Name);
@@ -1104,7 +1104,7 @@ public class MSBuildHelperTests : TestBase
                 new Dependency("Microsoft.EntityFrameworkCore.Analyzers", "8.0.0", DependencyType.PackageReference)
             };
 
-            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new Logger(true));
+            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new TestLogger());
             Assert.NotNull(resolvedDependencies);
             Assert.Equal(4, resolvedDependencies.Length);
             Assert.Equal("Microsoft.EntityFrameworkCore.Design", resolvedDependencies[0].Name);
@@ -1156,7 +1156,7 @@ public class MSBuildHelperTests : TestBase
                 new Dependency("Microsoft.EntityFrameworkCore.Analyzers", "8.0.0", DependencyType.PackageReference)
             };
 
-            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new Logger(true));
+            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new TestLogger());
             Assert.NotNull(resolvedDependencies);
             Assert.Equal(3, resolvedDependencies.Length);
             Assert.Equal("Microsoft.EntityFrameworkCore.Design", resolvedDependencies[0].Name);
@@ -1208,7 +1208,7 @@ public class MSBuildHelperTests : TestBase
                 new Dependency("System.Collections.Immutable", "8.0.0", DependencyType.PackageReference),
             };
 
-            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new Logger(true));
+            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new TestLogger());
             Assert.NotNull(resolvedDependencies);
             Assert.Equal(4, resolvedDependencies.Length);
             Assert.Equal("System.Collections.Immutable", resolvedDependencies[0].Name);
@@ -1260,7 +1260,7 @@ public class MSBuildHelperTests : TestBase
                 new Dependency("System.Collections.Immutable", "8.0.0", DependencyType.PackageReference),
             };
 
-            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new Logger(true));
+            var resolvedDependencies = await MSBuildHelper.ResolveDependencyConflictsNew(repoRoot.FullName, projectPath, "net8.0", dependencies, update, new TestLogger());
             Assert.NotNull(resolvedDependencies);
             Assert.Equal(3, resolvedDependencies.Length);
             Assert.Equal("Microsoft.CodeAnalysis.CSharp.Workspaces", resolvedDependencies[0].Name);

data/lib/dependabot/nuget/file_updater.rb

@@ -20,6 +20,7 @@ module Dependabot
       def self.updated_files_regex
         [
           /.*\.([a-z]{2})?proj$/, # Matches files with any extension like .csproj, .vbproj, etc., in any directory
+          /packages\.lock\.json/,         # Matches packages.lock.json in any directory
           /packages\.config$/i,           # Matches packages.config in any directory
           /app\.config$/i,                # Matches app.config in any directory
           /web\.config$/i,                # Matches web.config in any directory

data/lib/dependabot/nuget/native_helpers.rb

@@ -28,8 +28,7 @@ module Dependabot
           "--project-tfms",
           *project_tfms,
           "--package-tfms",
-          *package_tfms,
-          "--verbose"
+          *package_tfms
         ]
         command = Shellwords.join(command_parts)
 
@@ -39,8 +38,7 @@ module Dependabot
           "--project-tfms",
           "<project-tfms>",
           "--package-tfms",
-          "<package-tfms>",
-          "--verbose"
+          "<package-tfms>"
         ].join(" ")
 
         puts "running NuGet updater:\n" + command
@@ -68,8 +66,7 @@ module Dependabot
           "--workspace",
           workspace_path,
           "--output",
-          output_path,
-          "--verbose"
+          output_path
         ].compact
 
         command = Shellwords.join(command_parts)
@@ -82,8 +79,7 @@ module Dependabot
           "--workspace",
           "<path-to-workspace>",
           "--output",
-          "<path-to-output>",
-          "--verbose"
+          "<path-to-output>"
         ].compact.join(" ")
 
         [command, fingerprint]
@@ -127,8 +123,7 @@ module Dependabot
           "--dependency-file-path",
           dependency_file_path,
           "--analysis-folder-path",
-          analysis_folder_path,
-          "--verbose"
+          analysis_folder_path
         ].compact
 
         command = Shellwords.join(command_parts)
@@ -141,8 +136,7 @@ module Dependabot
           "--dependency-file-path",
           "<dependency-file-path>",
           "--analysis-folder-path",
-          "<analysis_folder_path>",
-          "--verbose"
+          "<analysis_folder_path>"
         ].compact.join(" ")
 
         [command, fingerprint]
@@ -191,8 +185,7 @@ module Dependabot
           dependency.previous_version,
           is_transitive ? "--transitive" : nil,
           "--result-output-path",
-          result_output_path,
-          "--verbose"
+          result_output_path
         ].compact
 
         command = Shellwords.join(command_parts)
@@ -212,8 +205,7 @@ module Dependabot
           "<previous-version>",
           is_transitive ? "--transitive" : nil,
           "--result-output-path",
-          "<result-output-path>",
-          "--verbose"
+          "<result-output-path>"
         ].compact.join(" ")
 
         [command, fingerprint]
@@ -263,14 +255,18 @@ module Dependabot
       sig { params(json: T::Hash[String, T.untyped]).void }
       def self.ensure_no_errors(json)
         error_type = T.let(json.fetch("ErrorType", nil), T.nilable(String))
-        error_details = T.let(json.fetch("ErrorDetails", nil), T.nilable(String))
+        error_details = json.fetch("ErrorDetails", nil)
         case error_type
         when "None", nil
           # no issue
         when "AuthenticationFailure"
-          raise PrivateSourceAuthenticationFailure, error_details
+          raise PrivateSourceAuthenticationFailure, T.let(error_details, T.nilable(String))
         when "MissingFile"
-          raise DependencyFileNotFound, error_details
+          raise DependencyFileNotFound, T.let(error_details, T.nilable(String))
+        when "UpdateNotPossible"
+          raise UpdateNotPossible, T.let(error_details, T::Array[String])
+        when "Unknown"
+          raise DependabotError, T.let(error_details, String)
         else
           raise "Unexpected error type from native tool: #{error_type}: #{error_details}"
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.279.0
+  version: 0.281.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-03 00:00:00.000000000 Z
+date: 2024-10-17 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.279.0
+        version: 0.281.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.279.0
+        version: 0.281.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -176,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.5
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -336,6 +336,8 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/TestBase.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/TestExtensions.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/TestHttpServer.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/TestLogger.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/ExpectedUpdateOperationResult.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/PackagesConfigUpdaterTests.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTestBase.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.DirsProj.cs
@@ -410,11 +412,13 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/ReportedRequirement.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/RequirementSource.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/UnknownError.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/UpdateNotPossible.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/UpdatedDependencyList.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/HttpApiHandler.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/IApiHandler.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/RunResult.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/RunWorker.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/UpdateNotPossibleException.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/BindingRedirectManager.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/BindingRedirectResolver.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/ConfigurationFile.cs
@@ -428,11 +432,12 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/UpdaterWorker.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/WebApplicationTargetsConditionPatcher.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/XmlFilePreAndPostProcessor.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/ConsoleLogger.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/DependencyConflictResolver.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
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/JsonHelper.cs
-- helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/Logger.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/MSBuildHelper.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/NuGetHelper.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/PathHelper.cs
@@ -491,7 +496,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.279.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.281.0
 post_install_message: 
 rdoc_options: []
 require_paths:

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/Logger.cs

@@ -1,21 +0,0 @@
-namespace NuGetUpdater.Core;
-
-public sealed class Logger
-{
-    public bool Verbose { get; set; }
-    private readonly TextWriter _logOutput;
-
-    public Logger(bool verbose)
-    {
-        Verbose = verbose;
-        _logOutput = Console.Out;
-    }
-
-    public void Log(string message)
-    {
-        if (Verbose)
-        {
-            _logOutput.WriteLine(message);
-        }
-    }
-}