dependabot-nuget 0.285.0 → 0.287.0

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

@@ -56,11 +56,12 @@ public partial class UpdateWorkerTests
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        public async Task UpdateVersionChildElement_InProjectFile_ForPackageReferenceIncludeTheory(bool useDependencySolver)
+        public async Task UpdateVersionChildElement_InProjectFile_ForPackageReferenceIncludeTheory(bool useLegacyDependencySolver)
         {
             // update Some.Package from 9.0.1 to 13.0.1
-            using var _ = new DependencySolverEnvironment(useDependencySolver);
+            var experimentsManager = new ExperimentsManager() { UseLegacyDependencySolver = useLegacyDependencySolver };
             await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1",
+                experimentsManager: experimentsManager,
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
@@ -98,10 +99,11 @@ public partial class UpdateWorkerTests
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        public async Task PeerDependenciesAreUpdatedEvenWhenNotExplicit(bool useDependencySolver)
+        public async Task PeerDependenciesAreUpdatedEvenWhenNotExplicit(bool useLegacyDependencySolver)
         {
-            using var _ = new DependencySolverEnvironment(useDependencySolver);
+            var experimentsManager = new ExperimentsManager() { UseLegacyDependencySolver = useLegacyDependencySolver };
             await TestUpdateForProject("Some.Package", "1.0.0", "2.0.0",
+                experimentsManager: experimentsManager,
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net8.0", [(null, [("Transitive.Package", "[1.0.0]")])]),
@@ -160,7 +162,6 @@ public partial class UpdateWorkerTests
         public async Task CallingResolveDependencyConflictsNew()
         {
             // update Microsoft.CodeAnalysis.Common from 4.9.2 to 4.10.0
-            using var _ = new DependencySolverEnvironment();
             await TestUpdateForProject("Microsoft.CodeAnalysis.Common", "4.9.2", "4.10.0",
                 // initial
                 projectContents: $"""
@@ -310,7 +311,7 @@ public partial class UpdateWorkerTests
                     MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
                     MockNuGetPackage.CreateSimplePackage("Some.Package", "13.0.1", "net8.0"),
                     // necessary for the `net8.0-windows10.0.19041.0` TFM
-                    new("Microsoft.Windows.SDK.NET.Ref", "10.0.19041.34", Files:
+                    new("Microsoft.Windows.SDK.NET.Ref", "10.0.19041.54", Files:
                     [
                         ("data/FrameworkList.xml", Encoding.UTF8.GetBytes("""
                             <FileList Name="Windows SDK .NET 6.0">
@@ -515,7 +516,7 @@ public partial class UpdateWorkerTests
             //
             // do the update
             //
-            UpdaterWorker worker = new(new TestLogger());
+            UpdaterWorker worker = new(new ExperimentsManager(), new TestLogger());
             await worker.RunAsync(tempDirectory.DirectoryPath, projectPath, "Some.Package", "1.0.0", "1.1.0", isTransitive: false);
 
             //
@@ -598,11 +599,12 @@ public partial class UpdateWorkerTests
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        public async Task AddPackageReference_InProjectFile_ForTransientDependency(bool useDependencySolver)
+        public async Task AddPackageReference_InProjectFile_ForTransientDependency(bool useLegacyDependencySolver)
         {
-            using var _ = new DependencySolverEnvironment(useDependencySolver);
+            var experimentsManager = new ExperimentsManager() { UseLegacyDependencySolver = useLegacyDependencySolver };
             // add transient package Some.Transient.Dependency from 5.0.1 to 5.0.2
             await TestUpdateForProject("Some.Transient.Dependency", "5.0.1", "5.0.2", isTransitive: true,
+                experimentsManager: experimentsManager,
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Some.Package", "3.1.3", "net8.0", [(null, [("Some.Transient.Dependency", "5.0.1")])]),
@@ -887,6 +889,45 @@ public partial class UpdateWorkerTests
             );
         }
 
+        [Fact]
+        public async Task UpdateVersionAttribute_InProjectFile_ForPackageReferenceUpdateWithSemicolon()
+        {
+            // update Some.Package from 9.0.1 to 13.0.1
+            await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1",
+                packages:
+                [
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
+                    MockNuGetPackage.CreateSimplePackage("Some.Package2", "9.0.1", "net8.0"),
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "13.0.1", "net8.0"),
+                    MockNuGetPackage.CreateSimplePackage("Some.Package2", "13.0.1", "net8.0"),
+                ],
+                // initial
+                projectContents: """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                      </PropertyGroup>
+
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package;Some.Package2" Version="9.0.1" />
+                      </ItemGroup>
+                    </Project>
+                    """,
+                // expected
+                expectedProjectContents: """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                      </PropertyGroup>
+
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package;Some.Package2" Version="13.0.1" />
+                      </ItemGroup>
+                    </Project>
+                    """
+            );
+        }
+
         [Fact]
         public async Task UpdateVersionAttribute_InDirectoryPackages_ForPackageVersion()
         {
@@ -2979,7 +3020,6 @@ public partial class UpdateWorkerTests
         public async Task UpdatingTransitiveDependencyWithNewSolverCanUpdateJustTheTopLevelPackage()
         {
             // we've been asked to explicitly update a transitive dependency, but we can solve it by updating the top-level package instead
-            using var _ = new DependencySolverEnvironment();
             await TestUpdateForProject("Transitive.Package", "1.0.0", "2.0.0",
                 isTransitive: true,
                 packages:
@@ -3017,13 +3057,14 @@ public partial class UpdateWorkerTests
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        public async Task NoChange_IfThereAreIncoherentVersions(bool useDependencySolver)
+        public async Task NoChange_IfThereAreIncoherentVersions(bool useLegacyDependencySolver)
         {
-            using var _ = new DependencySolverEnvironment(useDependencySolver);
+            var experimentsManager = new ExperimentsManager() { UseLegacyDependencySolver = useLegacyDependencySolver };
 
             // trying to update `Transitive.Dependency` to 1.1.0 would normally pull `Some.Package` from 1.0.0 to 1.1.0,
             // but the TFM doesn't allow it
             await TestNoChangeforProject("Transitive.Dependency", "1.0.0", "1.1.0",
+                experimentsManager: experimentsManager,
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net7.0", [(null, [("Transitive.Dependency", "[1.0.0]")])]),
@@ -3143,12 +3184,13 @@ public partial class UpdateWorkerTests
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        public async Task UnresolvablePropertyDoesNotStopOtherUpdates(bool useDependencySolver)
+        public async Task UnresolvablePropertyDoesNotStopOtherUpdates(bool useLegacyDependencySolver)
         {
-            using var _ = new DependencySolverEnvironment(useDependencySolver);
+            var experimentsManager = new ExperimentsManager() { UseLegacyDependencySolver = useLegacyDependencySolver };
 
             // the property `$(SomeUnresolvableProperty)` cannot be resolved
             await TestUpdateForProject("Some.Package", "7.0.1", "13.0.1",
+                experimentsManager: experimentsManager,
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Some.Package", "7.0.1", "net8.0"),
@@ -3184,12 +3226,13 @@ public partial class UpdateWorkerTests
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        public async Task ProjectWithWorkloadsShouldNotFail(bool useDependencySolver)
+        public async Task ProjectWithWorkloadsShouldNotFail(bool useLegacyDependencySolver)
         {
-            using var _ = new DependencySolverEnvironment(useDependencySolver);
+            var experimentsManager = new ExperimentsManager() { UseLegacyDependencySolver = useLegacyDependencySolver };
 
             // the property `$(SomeUnresolvableProperty)` cannot be resolved
             await TestUpdateForProject("Some.Package", "7.0.1", "13.0.1",
+                experimentsManager: experimentsManager,
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Some.Package", "7.0.1", "net8.0"),
@@ -3224,12 +3267,13 @@ public partial class UpdateWorkerTests
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        public async Task UpdatingPackageAlsoUpdatesAnythingWithADependencyOnTheUpdatedPackage(bool useDependencySolver)
+        public async Task UpdatingPackageAlsoUpdatesAnythingWithADependencyOnTheUpdatedPackage(bool useLegacyDependencySolver)
         {
-            using var _ = new DependencySolverEnvironment(useDependencySolver);
+            var experimentsManager = new ExperimentsManager() { UseLegacyDependencySolver = useLegacyDependencySolver };
 
             // updating Some.Package from 3.3.30 requires that Some.Package.Extensions also be updated
             await TestUpdateForProject("Some.Package", "3.3.30", "3.4.3",
+                experimentsManager: experimentsManager,
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Some.Package", "3.3.30", "net8.0"),

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

@@ -2288,7 +2288,7 @@ 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 TestLogger());
+            var worker = new UpdaterWorker(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);

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

@@ -19,4 +19,18 @@ public class PathHelperTests
         var actual = input.NormalizeUnixPathParts();
         Assert.Equal(expected, actual);
     }
+
+    [Fact]
+    public void VerifyResolveCaseInsensitivePath()
+    {
+        var temp = new TemporaryDirectory();
+        Directory.CreateDirectory(Path.Combine(temp.DirectoryPath, "src", "a"));
+        File.WriteAllText(Path.Combine(temp.DirectoryPath, "src", "a", "packages.config"), "");
+
+        var repoRootPath = Path.Combine(temp.DirectoryPath, "src");
+
+        var resolvedPath = PathHelper.ResolveCaseInsensitivePathInsideRepoRoot(Path.Combine(repoRootPath, "A", "PACKAGES.CONFIG"), repoRootPath);
+
+        Assert.Equal(Path.Combine(temp.DirectoryPath, "src", "a", "packages.config"), resolvedPath);
+    }
 }

data/helpers/lib/NuGetUpdater/global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100-rc.1.24452.12",
+    "version": "9.0.100",
     "rollForward": "latestMinor"
   }
 }

data/lib/dependabot/nuget/file_updater.rb

@@ -79,6 +79,11 @@ module Dependabot
 
       private
 
+      sig { returns(String) }
+      def job_file_path
+        ENV.fetch("DEPENDABOT_JOB_PATH")
+      end
+
       sig { params(dependency: Dependabot::Dependency).returns(T::Boolean) }
       def try_update_projects(dependency)
         update_ran = T.let(false, T::Boolean)
@@ -127,9 +132,9 @@ module Dependabot
 
       sig { params(dependency: Dependency, proj_path: String).void }
       def call_nuget_updater_tool(dependency, proj_path)
-        NativeHelpers.run_nuget_updater_tool(repo_root: T.must(repo_contents_path), proj_path: proj_path,
-                                             dependency: dependency, is_transitive: !dependency.top_level?,
-                                             credentials: credentials)
+        NativeHelpers.run_nuget_updater_tool(job_path: job_file_path, repo_root: T.must(repo_contents_path),
+                                             proj_path: proj_path, dependency: dependency,
+                                             is_transitive: !dependency.top_level?, credentials: credentials)
 
         # Tests need to track how many times we call the tooling updater to ensure we don't recurse needlessly
         # Ideally we should find a way to not run this code in prod

data/lib/dependabot/nuget/native_helpers.rb

@@ -165,14 +165,17 @@ module Dependabot
 
       # rubocop:disable Metrics/MethodLength
       sig do
-        params(repo_root: String, proj_path: String, dependency: Dependency,
+        params(job_path: String, repo_root: String, proj_path: String, dependency: Dependency,
                is_transitive: T::Boolean, result_output_path: String).returns([String, String])
       end
-      def self.get_nuget_updater_tool_command(repo_root:, proj_path:, dependency:, is_transitive:, result_output_path:)
+      def self.get_nuget_updater_tool_command(job_path:, repo_root:, proj_path:, dependency:, is_transitive:,
+                                              result_output_path:)
         exe_path = File.join(native_helpers_root, "NuGetUpdater", "NuGetUpdater.Cli")
         command_parts = [
           exe_path,
           "update",
+          "--job-path",
+          job_path,
           "--repo-root",
           repo_root,
           "--solution-or-project",
@@ -219,6 +222,7 @@ module Dependabot
 
       sig do
         params(
+          job_path: String,
           repo_root: String,
           proj_path: String,
           dependency: Dependency,
@@ -226,23 +230,18 @@ module Dependabot
           credentials: T::Array[Dependabot::Credential]
         ).void
       end
-      def self.run_nuget_updater_tool(repo_root:, proj_path:, dependency:, is_transitive:, credentials:)
-        (command, fingerprint) = get_nuget_updater_tool_command(repo_root: repo_root, proj_path: proj_path,
-                                                                dependency: dependency, is_transitive: is_transitive,
+      def self.run_nuget_updater_tool(job_path:, repo_root:, proj_path:, dependency:, is_transitive:, credentials:)
+        (command, fingerprint) = get_nuget_updater_tool_command(job_path: job_path, repo_root: repo_root,
+                                                                proj_path: proj_path, dependency: dependency,
+                                                                is_transitive: is_transitive,
                                                                 result_output_path: update_result_file_path)
 
         puts "running NuGet updater:\n" + command
 
         NuGetConfigCredentialHelpers.patch_nuget_config_for_action(credentials) do
-          # default to UseNewNugetPackageResolved _unless_ nuget_legacy_dependency_solver is enabled
-          env = {}
-          unless Dependabot::Experiments.enabled?(:nuget_legacy_dependency_solver)
-            env["UseNewNugetPackageResolver"] = "true"
-          end
           output = SharedHelpers.run_shell_command(command,
                                                    allow_unsafe_shell_command: true,
-                                                   fingerprint: fingerprint,
-                                                   env: env)
+                                                   fingerprint: fingerprint)
           puts output
 
           result_contents = File.read(update_result_file_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.285.0
+  version: 0.287.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-07 00:00:00.000000000 Z
+date: 2024-11-19 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.285.0
+        version: 0.287.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.285.0
+        version: 0.287.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -313,7 +313,6 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Analyze/VersionFinderTests.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Clone/CloneWorkerTests.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Clone/TestGitCommandHandler.cs
-- helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/DependencySolverEnvironment.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTestBase.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.DotNetToolsJson.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.GlobalJson.cs
@@ -337,10 +336,13 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/UpdatedDependencyListTests.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/TemporaryDirectory.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/TemporaryEnvironment.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/TestAnalyzeWorker.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/TestBase.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/TestDiscoveryWorker.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/TestUpdaterWorker.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/BindingRedirectsTests.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/ExpectedUpdateOperationResult.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/PackagesConfigUpdaterTests.cs
@@ -391,6 +393,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/ErrorType.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/EvaluationResult.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/EvaluationResultType.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/ExperimentsManager.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Files/BuildFile.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Files/DotNetToolsJsonBuildFile.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Files/GlobalJsonBuildFile.cs
@@ -401,6 +404,9 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/FrameworkChecker/CompatabilityChecker.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/FrameworkChecker/FrameworkCompatibilityService.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/FrameworkChecker/SupportedFrameworks.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/IAnalyzeWorker.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/IDiscoveryWorker.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/IUpdaterWorker.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/MissingFileException.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/NativeResult.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/NuGetUpdater.Core.csproj
@@ -505,7 +511,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.285.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.287.0
 post_install_message: 
 rdoc_options: []
 require_paths:

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/DependencySolverEnvironment.cs

@@ -1,12 +0,0 @@
-namespace NuGetUpdater.Core.Test;
-
-/// <summary>
-/// Prepares the environment to use the new dependency solver.
-/// </summary>
-public class DependencySolverEnvironment : TemporaryEnvironment
-{
-    public DependencySolverEnvironment(bool useDependencySolver = true)
-        : base([("UseNewNugetPackageResolver", useDependencySolver ? "true" : "false")])
-    {
-    }
-}