dependabot-nuget 0.292.0 → 0.294.0

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.PackagesConfig.cs

@@ -4,6 +4,7 @@ using System.Text.Json;
 
 using NuGet;
 
+using NuGetUpdater.Core.Run.ApiModel;
 using NuGetUpdater.Core.Test.Updater;
 using NuGetUpdater.Core.Updater;
 
@@ -2282,13 +2283,13 @@ public partial class UpdateWorkerTests
             await MockNuGetPackagesInDirectory(packages, Path.Combine(temporaryDirectory.DirectoryPath, "packages"));
             var resultOutputPath = Path.Combine(temporaryDirectory.DirectoryPath, "result.json");
 
-            var worker = new UpdaterWorker(new ExperimentsManager(), new TestLogger());
+            var worker = new UpdaterWorker("TEST-JOB-ID", new ExperimentsManager(), new TestLogger());
             await worker.RunAsync(temporaryDirectory.DirectoryPath, "project.csproj", "Some.Package", "1.0.0", "1.1.0", isTransitive: false, resultOutputPath: resultOutputPath);
 
             var resultContents = await File.ReadAllTextAsync(resultOutputPath);
-            var result = JsonSerializer.Deserialize<UpdateOperationResult>(resultContents, UpdaterWorker.SerializerOptions)!;
-            Assert.Equal(ErrorType.MissingFile, result.ErrorType);
-            Assert.Equal(Path.Combine(temporaryDirectory.DirectoryPath, "this.file.does.not.exist.targets"), result.ErrorDetails!.ToString());
+            var rawResult = JsonDocument.Parse(resultContents);
+            Assert.Equal("dependency_file_not_found", rawResult.RootElement.GetProperty("Error").GetProperty("error-type").GetString());
+            Assert.Equal(Path.Combine(temporaryDirectory.DirectoryPath, "this.file.does.not.exist.targets").NormalizePathToUnix(), rawResult.RootElement.GetProperty("Error").GetProperty("error-details").GetProperty("file-path").GetString());
         }
 
         [Fact]
@@ -2338,13 +2339,13 @@ public partial class UpdateWorkerTests
             await MockNuGetPackagesInDirectory(packages, Path.Combine(temporaryDirectory.DirectoryPath, "packages"));
             var resultOutputPath = Path.Combine(temporaryDirectory.DirectoryPath, "result.json");
 
-            var worker = new UpdaterWorker(new ExperimentsManager(), new TestLogger());
+            var worker = new UpdaterWorker("TEST-JOB-ID", new ExperimentsManager(), new TestLogger());
             await worker.RunAsync(temporaryDirectory.DirectoryPath, "project.csproj", "Some.Package", "1.0.0", "1.1.0", isTransitive: false, resultOutputPath: resultOutputPath);
 
             var resultContents = await File.ReadAllTextAsync(resultOutputPath);
-            var result = JsonSerializer.Deserialize<UpdateOperationResult>(resultContents, UpdaterWorker.SerializerOptions)!;
-            Assert.Equal(ErrorType.MissingFile, result.ErrorType);
-            Assert.Equal("$(MSBuildExtensionsPath32)/Microsoft/VisualStudio/v$(VisualStudioVersion)/Some.Visual.Studio.Component.props", result.ErrorDetails!.ToString().NormalizePathToUnix());
+            var rawResult = JsonDocument.Parse(resultContents);
+            Assert.Equal("dependency_file_not_found", rawResult.RootElement.GetProperty("Error").GetProperty("error-type").GetString());
+            Assert.Equal("$(MSBuildExtensionsPath32)/Microsoft/VisualStudio/v$(VisualStudioVersion)/Some.Visual.Studio.Component.props", rawResult.RootElement.GetProperty("Error").GetProperty("error-details").GetProperty("file-path").GetString());
         }
 
         [Theory]
@@ -2424,8 +2425,7 @@ public partial class UpdateWorkerTests
                     """,
                 expectedResult: new()
                 {
-                    ErrorType = ErrorType.AuthenticationFailure,
-                    ErrorDetails = $"({http.BaseUrl.TrimEnd('/')}/index.json)",
+                    Error = new PrivateSourceAuthenticationFailure([$"{http.BaseUrl.TrimEnd('/')}/index.json"]),
                 }
             );
         }
@@ -2555,8 +2555,7 @@ public partial class UpdateWorkerTests
                     """,
                 expectedResult: new()
                 {
-                    ErrorType = ErrorType.Unknown,
-                    ErrorDetailsRegex = "Response status code does not indicate success",
+                    ErrorRegex = "Response status code does not indicate success",
                 }
             );
         }
@@ -2633,8 +2632,7 @@ public partial class UpdateWorkerTests
                     """,
                 expectedResult: new()
                 {
-                    ErrorType = ErrorType.UpdateNotPossible,
-                    ErrorDetails = new[] { "Unrelated.Package.1.0.0" },
+                    Error = new UpdateNotPossible(["Unrelated.Package.1.0.0"]),
                 }
             );
         }

data/helpers/lib/NuGetUpdater/NuGetUpdater.sln

@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.33516.290
@@ -43,6 +42,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.Versioning", "NuGetPr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetUpdater.Cli.Test", "NuGetUpdater.Cli.Test\NuGetUpdater.Cli.Test.csproj", "{BDBEBF91-F5FD-4589-B4FB-B3DE3103B04B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetPackageCorrelation", "DotNetPackageCorrelation\DotNetPackageCorrelation.csproj", "{52A6437B-7E72-4CCF-8E1E-355000F5DC10}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetPackageCorrelation.Test", "DotNetPackageCorrelation.Test\DotNetPackageCorrelation.Test.csproj", "{0945703C-C8DC-44F0-B1D8-0EFE011411AE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetPackageCorrelation.Cli", "DotNetPackageCorrelation.Cli\DotNetPackageCorrelation.Cli.csproj", "{509454EE-629F-4767-B1D4-7F2DF86C11B5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -125,6 +130,18 @@ Global
 		{BDBEBF91-F5FD-4589-B4FB-B3DE3103B04B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BDBEBF91-F5FD-4589-B4FB-B3DE3103B04B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BDBEBF91-F5FD-4589-B4FB-B3DE3103B04B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{52A6437B-7E72-4CCF-8E1E-355000F5DC10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{52A6437B-7E72-4CCF-8E1E-355000F5DC10}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{52A6437B-7E72-4CCF-8E1E-355000F5DC10}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{52A6437B-7E72-4CCF-8E1E-355000F5DC10}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0945703C-C8DC-44F0-B1D8-0EFE011411AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0945703C-C8DC-44F0-B1D8-0EFE011411AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0945703C-C8DC-44F0-B1D8-0EFE011411AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0945703C-C8DC-44F0-B1D8-0EFE011411AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{509454EE-629F-4767-B1D4-7F2DF86C11B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{509454EE-629F-4767-B1D4-7F2DF86C11B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{509454EE-629F-4767-B1D4-7F2DF86C11B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{509454EE-629F-4767-B1D4-7F2DF86C11B5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

data/lib/dependabot/nuget/native_helpers.rb

@@ -11,6 +11,11 @@ module Dependabot
     module NativeHelpers
       extend T::Sig
 
+      sig { returns(String) }
+      def self.job_id
+        ENV.fetch("DEPENDABOT_JOB_ID")
+      end
+
       sig { returns(String) }
       def self.native_helpers_root
         helpers_root = ENV.fetch("DEPENDABOT_NATIVE_HELPERS_PATH", nil)
@@ -66,6 +71,8 @@ module Dependabot
         command_parts = [
           exe_path,
           "discover",
+          "--job-id",
+          job_id,
           "--job-path",
           job_path,
           "--repo-root",
@@ -81,6 +88,8 @@ module Dependabot
         fingerprint = [
           exe_path,
           "discover",
+          "--job-id",
+          "<job-id>",
           "--job-path",
           "<job-path>",
           "--repo-root",
@@ -127,6 +136,8 @@ module Dependabot
         command_parts = [
           exe_path,
           "analyze",
+          "--job-id",
+          job_id,
           "--job-path",
           job_path,
           "--repo-root",
@@ -144,6 +155,8 @@ module Dependabot
         fingerprint = [
           exe_path,
           "analyze",
+          "--job-id",
+          "<job-id>",
           "--job-path",
           "<job-path>",
           "--discovery-file-path",
@@ -190,6 +203,8 @@ module Dependabot
         command_parts = [
           exe_path,
           "update",
+          "--job-id",
+          job_id,
           "--job-path",
           job_path,
           "--repo-root",
@@ -212,6 +227,8 @@ module Dependabot
         fingerprint = [
           exe_path,
           "update",
+          "--job-id",
+          "<job-id>",
           "--job-path",
           "<job-path>",
           "--repo-root",
@@ -290,29 +307,37 @@ module Dependabot
         puts output
       end
 
+      # rubocop:disable Metrics/AbcSize
       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 = json.fetch("ErrorDetails", nil)
+        error = T.let(json.fetch("Error", nil), T.nilable(T::Hash[String, T.untyped]))
+        return if error.nil?
+
+        error_type = T.let(error.fetch("error-type"), String)
+        error_details = T.let(error.fetch("error-details", {}), T::Hash[String, T.untyped])
+
         case error_type
-        when "None", nil
-          # no issue
-        when "DependencyFileNotParseable"
-          raise DependencyFileNotParseable, T.must(T.let(error_details, T.nilable(String)))
-        when "AuthenticationFailure"
-          raise PrivateSourceAuthenticationFailure, T.let(error_details, T.nilable(String))
-        when "BadRequirement"
-          raise BadRequirementError, T.let(error_details, T.nilable(String))
-        when "MissingFile"
-          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)
+        when "dependency_file_not_found"
+          file_path = T.let(error_details.fetch("file-path"), String)
+          message = T.let(error_details.fetch("message", nil), T.nilable(String))
+          raise DependencyFileNotFound.new(file_path, message)
+        when "dependency_file_not_parseable"
+          file_path = T.let(error_details.fetch("file-path"), String)
+          message = T.let(error_details.fetch("message", nil), T.nilable(String))
+          raise DependencyFileNotParseable.new(file_path, message)
+        when "illformed_requirement"
+          raise BadRequirementError, T.let(error_details.fetch("message"), String)
+        when "private_source_authentication_failure"
+          raise PrivateSourceAuthenticationFailure, T.let(error_details.fetch("source"), String)
+        when "update_not_possible"
+          raise UpdateNotPossible, T.let(error_details.fetch("dependencies"), T::Array[String])
+        when "unknown_error"
+          raise DependabotError, error_details.to_json
         else
           raise "Unexpected error type from native tool: #{error_type}: #{error_details}"
         end
       end
+      # rubocop:enable Metrics/AbcSize
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.292.0
+  version: 0.294.0
 platform: ruby
 authors:
 - Dependabot
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-09 00:00:00.000000000 Z
+date: 2025-01-23 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.292.0
+        version: 0.294.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.292.0
+        version: 0.294.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -269,6 +269,22 @@ files:
 - helpers/lib/NuGetUpdater/Directory.Build.targets
 - helpers/lib/NuGetUpdater/Directory.Common.props
 - helpers/lib/NuGetUpdater/Directory.Packages.props
+- helpers/lib/NuGetUpdater/DotNetPackageCorrelation.Cli/DotNetPackageCorrelation.Cli.csproj
+- helpers/lib/NuGetUpdater/DotNetPackageCorrelation.Cli/Program.cs
+- helpers/lib/NuGetUpdater/DotNetPackageCorrelation.Test/CorrelatorTests.cs
+- helpers/lib/NuGetUpdater/DotNetPackageCorrelation.Test/DotNetPackageCorrelation.Test.csproj
+- helpers/lib/NuGetUpdater/DotNetPackageCorrelation.Test/EndToEndTests.cs
+- helpers/lib/NuGetUpdater/DotNetPackageCorrelation.Test/RuntimePackagesTests.cs
+- helpers/lib/NuGetUpdater/DotNetPackageCorrelation/Correlator.cs
+- helpers/lib/NuGetUpdater/DotNetPackageCorrelation/DotNetPackageCorrelation.csproj
+- helpers/lib/NuGetUpdater/DotNetPackageCorrelation/Model/PackageMapper.cs
+- helpers/lib/NuGetUpdater/DotNetPackageCorrelation/Model/PackageSet.cs
+- helpers/lib/NuGetUpdater/DotNetPackageCorrelation/Model/Release.cs
+- helpers/lib/NuGetUpdater/DotNetPackageCorrelation/Model/ReleasesFile.cs
+- helpers/lib/NuGetUpdater/DotNetPackageCorrelation/Model/RuntimePackages.cs
+- helpers/lib/NuGetUpdater/DotNetPackageCorrelation/Model/Sdk.cs
+- helpers/lib/NuGetUpdater/DotNetPackageCorrelation/Model/SemVerComparer.cs
+- helpers/lib/NuGetUpdater/DotNetPackageCorrelation/Model/SemVersionConverter.cs
 - helpers/lib/NuGetUpdater/NuGetProjects/Directory.Build.props
 - helpers/lib/NuGetUpdater/NuGetProjects/Directory.Build.targets
 - helpers/lib/NuGetUpdater/NuGetProjects/NuGet.Build.Tasks/NuGet.Build.Tasks.csproj
@@ -397,7 +413,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/ProjectDiscoveryResult.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/SdkProjectDiscovery.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/WorkspaceDiscoveryResult.cs
-- helpers/lib/NuGetUpdater/NuGetUpdater.Core/ErrorType.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/EnsureDotNetPackageCorrelation.targets
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/EvaluationResult.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/EvaluationResultType.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/ExperimentsManager.cs
@@ -426,6 +442,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/CreatePullRequest.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/DependencyFile.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/DependencyFileNotFound.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/DependencyFileNotParseable.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/DependencyGroup.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/GroupPullRequest.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/IncrementMetric.cs
@@ -450,6 +467,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/RunWorker.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/VersionConverter.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/TargetFrameworkReporter.targets
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/UnparseableFileException.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/UpdateNotPossibleException.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/BindingRedirectManager.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/BindingRedirectResolver.cs
@@ -467,6 +485,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/CollectionExtensions.cs
 - 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/HashSetExtensions.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/ILogger.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/ImmutableArrayExtensions.cs
@@ -509,7 +528,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.292.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.294.0
 post_install_message:
 rdoc_options: []
 require_paths:

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/ErrorType.cs

@@ -1,12 +0,0 @@
-namespace NuGetUpdater.Core;
-
-public enum ErrorType
-{
-    None,
-    AuthenticationFailure,
-    BadRequirement,
-    MissingFile,
-    UpdateNotPossible,
-    DependencyFileNotParseable,
-    Unknown,
-}