dependabot-nuget 0.263.0 → 0.265.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b855d54271454917bba3570280c68fe5d40692701654f284412132158c77a86
-  data.tar.gz: d599048afc3f22e57d0767587e16a3bb2b2eee951f6a1f56d9b713c07baf8a91
+  metadata.gz: 0c8985bae397230599aee116240d6569573ea126c70bc39a37a568935aaf3649
+  data.tar.gz: b137e9983b1ce14c86235b898a70039c53aadf9eb7a4389b94631bc787ba7914
 SHA512:
-  metadata.gz: 4f70f9da88e35221a82c61355aa6d689a2e20eedfb8d4a2d1e62f43b9076d3b256fdb8a3de65b0fb22d8ef1579a336e98a9423ea0870056bc88df9db50407ff0
-  data.tar.gz: 158d0fd0d8f6f8a2519712101a10ecd7c13caebbbdabacc0c09759d99cc7180e052dffbe10c23eb36b4cb8e7738d2229569370eb60b11642335c950b4e58dc9e
+  metadata.gz: bbcf0d5509e6bad8ea0af998c7ee6ea6047c13153c4111b2f9e46d568b559bcbe93eb21e8a200ee9deabb4c41bad10e789d236bb6fb30a34ed8c072a47537ced
+  data.tar.gz: 21ffbb1f7c7ff6a40d8db845b6e175c0f9478d5b99cadd969b127bbed07171b2b120bb3c6a107a1a41d59245906a7276f4006f0cdef4a2f01105d218596bfc6e

data/helpers/lib/NuGetUpdater/NuGetUpdater.Cli/Commands/AnalyzeCommand.cs

@@ -0,0 +1,37 @@
+using System.CommandLine;
+
+using NuGetUpdater.Core;
+using NuGetUpdater.Core.Analyze;
+
+namespace NuGetUpdater.Cli.Commands;
+
+internal static class AnalyzeCommand
+{
+    internal static readonly Option<DirectoryInfo> RepoRootOption = new("--repo-root") { IsRequired = true };
+    internal static readonly Option<FileInfo> DependencyFilePathOption = new("--dependency-file-path") { IsRequired = true };
+    internal static readonly Option<FileInfo> DiscoveryFilePathOption = new("--discovery-file-path") { IsRequired = true };
+    internal static readonly Option<DirectoryInfo> AnalysisFolderOption = new("--analysis-folder-path") { IsRequired = true };
+    internal static readonly Option<bool> VerboseOption = new("--verbose", getDefaultValue: () => false);
+
+    internal static Command GetCommand(Action<int> setExitCode)
+    {
+        Command command = new("analyze", "Determines how to update a dependency based on the workspace discovery information.")
+        {
+            RepoRootOption,
+            DependencyFilePathOption,
+            DiscoveryFilePathOption,
+            AnalysisFolderOption,
+            VerboseOption
+        };
+
+        command.TreatUnmatchedTokensAsErrors = true;
+
+        command.SetHandler(async (repoRoot, discoveryPath, dependencyPath, analysisDirectory, verbose) =>
+        {
+            var worker = new AnalyzeWorker(new Logger(verbose));
+            await worker.RunAsync(repoRoot.FullName, discoveryPath.FullName, dependencyPath.FullName, analysisDirectory.FullName);
+        }, RepoRootOption, DiscoveryFilePathOption, DependencyFilePathOption, AnalysisFolderOption, VerboseOption);
+
+        return command;
+    }
+}

data/helpers/lib/NuGetUpdater/NuGetUpdater.Cli/Commands/DiscoverCommand.cs

@@ -7,9 +7,9 @@ namespace NuGetUpdater.Cli.Commands;
 
 internal static class DiscoverCommand
 {
-    internal static readonly Option<DirectoryInfo> RepoRootOption = new("--repo-root", () => new DirectoryInfo(Environment.CurrentDirectory)) { IsRequired = false };
+    internal static readonly Option<DirectoryInfo> RepoRootOption = new("--repo-root") { IsRequired = true };
     internal static readonly Option<string> WorkspaceOption = new("--workspace") { IsRequired = true };
-    internal static readonly Option<string> OutputOption = new("--output", () => DiscoveryWorker.DiscoveryResultFileName) { IsRequired = false };
+    internal static readonly Option<FileInfo> OutputOption = new("--output") { IsRequired = true };
     internal static readonly Option<bool> VerboseOption = new("--verbose", getDefaultValue: () => false);
 
     internal static Command GetCommand(Action<int> setExitCode)
@@ -27,7 +27,7 @@ internal static class DiscoverCommand
         command.SetHandler(async (repoRoot, workspace, outputPath, verbose) =>
         {
             var worker = new DiscoveryWorker(new Logger(verbose));
-            await worker.RunAsync(repoRoot.FullName, workspace, outputPath);
+            await worker.RunAsync(repoRoot.FullName, workspace, outputPath.FullName);
         }, RepoRootOption, WorkspaceOption, OutputOption, VerboseOption);
 
         return command;

data/helpers/lib/NuGetUpdater/NuGetUpdater.Cli/Program.cs

@@ -15,6 +15,7 @@ internal sealed class Program
         {
             FrameworkCheckCommand.GetCommand(setExitCode),
             DiscoverCommand.GetCommand(setExitCode),
+            AnalyzeCommand.GetCommand(setExitCode),
             UpdateCommand.GetCommand(setExitCode),
         };
         command.TreatUnmatchedTokensAsErrors = true;

data/helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/EntryPointTests.Analyze.cs

@@ -0,0 +1,169 @@
+using System.Text;
+using System.Xml.Linq;
+
+using NuGetUpdater.Core;
+using NuGetUpdater.Core.Analyze;
+using NuGetUpdater.Core.Test;
+using NuGetUpdater.Core.Test.Analyze;
+using NuGetUpdater.Core.Test.Update;
+
+using Xunit;
+
+namespace NuGetUpdater.Cli.Test;
+
+using TestFile = (string Path, string Content);
+
+public partial class EntryPointTests
+{
+    public class Analyze : AnalyzeWorkerTestBase
+    {
+        [Fact]
+        public async Task FindsUpdatedPackageAndReturnsTheCorrectData()
+        {
+            var repositoryXml = XElement.Parse("""<repository type="git" url="https://nuget.example.com/some.package" />""");
+            await RunAsync(path =>
+                [
+                    "analyze",
+                    "--repo-root",
+                    path,
+                    "--discovery-file-path",
+                    Path.Join(path, "discovery.json"),
+                    "--dependency-file-path",
+                    Path.Join(path, "Some.Package.json"),
+                    "--analysis-folder-path",
+                    Path.Join(path, AnalyzeWorker.AnalysisDirectoryName),
+                    "--verbose",
+                ],
+                packages: [
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net8.0", additionalMetadata: [repositoryXml]),
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.1", "net8.0", additionalMetadata: [repositoryXml]),
+                ],
+                dependencyName: "Some.Package",
+                initialFiles:
+                [
+                    ("discovery.json", """
+                        {
+                          "Path": "",
+                          "IsSuccess": true,
+                          "Projects": [
+                            {
+                              "FilePath": "project.csproj",
+                              "Dependencies": [
+                                {
+                                  "Name": "Microsoft.NET.Sdk",
+                                  "Version": null,
+                                  "Type": "MSBuildSdk",
+                                  "EvaluationResult": null,
+                                  "TargetFrameworks": null,
+                                  "IsDevDependency": false,
+                                  "IsDirect": false,
+                                  "IsTransitive": false,
+                                  "IsOverride": false,
+                                  "IsUpdate": false
+                                },
+                                {
+                                  "Name": "Some.Package",
+                                  "Version": "1.0.0",
+                                  "Type": "PackageReference",
+                                  "EvaluationResult": {
+                                    "ResultType": "Success",
+                                    "OriginalValue": "1.0.0",
+                                    "EvaluatedValue": "1.0.0",
+                                    "RootPropertyName": null,
+                                    "ErrorMessage": null
+                                  },
+                                  "TargetFrameworks": [
+                                    "net8.0"
+                                  ],
+                                  "IsDevDependency": false,
+                                  "IsDirect": true,
+                                  "IsTransitive": false,
+                                  "IsOverride": false,
+                                  "IsUpdate": false
+                                }
+                              ],
+                              "IsSuccess": true,
+                              "Properties": [
+                                {
+                                  "Name": "TargetFramework",
+                                  "Value": "net8.0",
+                                  "SourceFilePath": "project.csproj"
+                                }
+                              ],
+                              "TargetFrameworks": [
+                                "net8.0"
+                              ],
+                              "ReferencedProjectPaths": []
+                            }
+                          ],
+                          "DirectoryPackagesProps": null,
+                          "GlobalJson": null,
+                          "DotNetToolsJson": null
+                        }
+                        """),
+                    ("Some.Package.json", """
+                        {
+                          "Name": "Some.Package",
+                          "Version": "1.0.0",
+                          "IsVulnerable": false,
+                          "IgnoredVersions": [],
+                          "Vulnerabilities": []
+                        }
+                        """),
+                    ("project.csproj", """
+                        <Project Sdk="Microsoft.NET.Sdk">
+                          <PropertyGroup>
+                            <TargetFramework>net8.0</TargetFramework>
+                          </PropertyGroup>
+                          <ItemGroup>
+                            <PackageReference Include="Some.Package" Version="1.0.0" />
+                          </ItemGroup>
+                        </Project>
+                        """),
+                ],
+                expectedResult: new()
+                {
+                    UpdatedVersion = "1.0.1",
+                    CanUpdate = true,
+                    VersionComesFromMultiDependencyProperty = false,
+                    UpdatedDependencies =
+                    [
+                        new Dependency("Some.Package", "1.0.1", DependencyType.Unknown, TargetFrameworks: ["net8.0"], InfoUrl: "https://nuget.example.com/some.package")
+                    ],
+                }
+            );
+        }
+
+        private static async Task RunAsync(Func<string, string[]> getArgs, string dependencyName, TestFile[] initialFiles, ExpectedAnalysisResult expectedResult, MockNuGetPackage[]? packages = null)
+        {
+            var actualResult = await RunAnalyzerAsync(dependencyName, initialFiles, async path =>
+            {
+                var sb = new StringBuilder();
+                var writer = new StringWriter(sb);
+
+                var originalOut = Console.Out;
+                var originalErr = Console.Error;
+                Console.SetOut(writer);
+                Console.SetError(writer);
+
+                try
+                {
+                    await UpdateWorkerTestBase.MockNuGetPackagesInDirectory(packages, path);
+                    var args = getArgs(path);
+                    var result = await Program.Main(args);
+                    if (result != 0)
+                    {
+                        throw new Exception($"Program exited with code {result}.\nOutput:\n\n{sb}");
+                    }
+                }
+                finally
+                {
+                    Console.SetOut(originalOut);
+                    Console.SetError(originalErr);
+                }
+            });
+
+            ValidateAnalysisResult(expectedResult, actualResult);
+        }
+    }
+}

data/helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/EntryPointTests.Discover.cs

@@ -1,6 +1,7 @@
 using System.Text;
 
 using NuGetUpdater.Core;
+using NuGetUpdater.Core.Discover;
 using NuGetUpdater.Core.Test;
 using NuGetUpdater.Core.Test.Discover;
 using NuGetUpdater.Core.Test.Update;
@@ -25,6 +26,8 @@ public partial class EntryPointTests
                     path,
                     "--workspace",
                     "path/to/some directory with spaces",
+                    "--output",
+                    Path.Combine(path, DiscoveryWorker.DiscoveryResultFileName),
                 ],
                 packages: [],
                 initialFiles:
@@ -42,7 +45,7 @@ public partial class EntryPointTests
                 ],
                 expectedResult: new()
                 {
-                    FilePath = "path/to/some directory with spaces",
+                    Path = "path/to/some directory with spaces",
                     Projects = [
                         new()
                         {
@@ -72,6 +75,8 @@ public partial class EntryPointTests
                     path,
                     "--workspace",
                     "/",
+                    "--output",
+                    Path.Combine(path, DiscoveryWorker.DiscoveryResultFileName),
                 ],
                 packages:
                 [
@@ -129,7 +134,7 @@ public partial class EntryPointTests
                 },
                 expectedResult: new()
                 {
-                    FilePath = "",
+                    Path = "",
                     Projects = [
                         new()
                         {
@@ -159,6 +164,8 @@ public partial class EntryPointTests
                     path,
                     "--workspace",
                     "path/to",
+                    "--output",
+                    Path.Combine(path, DiscoveryWorker.DiscoveryResultFileName),
                 ],
                 packages:
                 [
@@ -193,7 +200,7 @@ public partial class EntryPointTests
                 },
                 expectedResult: new()
                 {
-                    FilePath = "path/to",
+                    Path = "path/to",
                     Projects = [
                         new()
                         {
@@ -224,6 +231,8 @@ public partial class EntryPointTests
                     path,
                     "--workspace",
                     workspacePath,
+                    "--output",
+                    Path.Combine(path, DiscoveryWorker.DiscoveryResultFileName),
                 ],
                 packages:
                 [
@@ -258,7 +267,7 @@ public partial class EntryPointTests
                 },
                 expectedResult: new()
                 {
-                    FilePath = workspacePath,
+                    Path = workspacePath,
                     Projects = [
                         new()
                         {
@@ -282,69 +291,72 @@ public partial class EntryPointTests
         public async Task WithDuplicateDependenciesOfDifferentTypes()
         {
             await RunAsync(path =>
-            [
-                "discover",
-                "--repo-root",
-                path,
-                "--workspace",
-                "path/to",
-            ],
-            new[]
-            {
-                ("path/to/my.csproj", """
-                    <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-                      <PropertyGroup>
-                        <TargetFramework>net8.0</TargetFramework>
-                      </PropertyGroup>
-                      <ItemGroup>
-                        <PackageReference Include="Newtonsoft.Json" Version="7.0.1" />
-                      </ItemGroup>
-                      <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-                    </Project>
-                    """),
-                ("path/Directory.Build.props", """
-                    <Project>
-                        <ItemGroup Condition="'$(ManagePackageVersionsCentrally)' == 'true'">
-                          <GlobalPackageReference Include="System.Text.Json" Version="8.0.3" />
-                        </ItemGroup>
-                        <ItemGroup Condition="'$(ManagePackageVersionsCentrally)' != 'true'">
-                          <PackageReference Include="System.Text.Json" Version="8.0.3" />
-                        </ItemGroup>
-                    </Project>
-                    """)
-            },
-            expectedResult: new()
-            {
-                FilePath = "path/to",
-                Projects = [
-                    new()
-                    {
-                        FilePath = "my.csproj",
-                        TargetFrameworks = ["net8.0"],
-                        ReferencedProjectPaths = [],
-                        ExpectedDependencyCount = 2,
-                        Dependencies = [
-                            new("Newtonsoft.Json", "7.0.1", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
-                            // $(ManagePackageVersionsCentrally) evaluates false by default, we only get a PackageReference
-                            new("System.Text.Json", "8.0.3", DependencyType.PackageReference, TargetFrameworks: ["net8.0"])
-                        ],
-                        Properties = [
-                            new("TargetFramework", "net8.0", "path/to/my.csproj"),
-                        ],
-                    },
-                    new()
-                    {
-                        FilePath = "../Directory.Build.props",
-                        ReferencedProjectPaths = [],
-                        ExpectedDependencyCount = 2,
-                        Dependencies = [
-                            new("System.Text.Json", "8.0.3", DependencyType.PackageReference, IsDirect: true),
-                            new("System.Text.Json", "8.0.3", DependencyType.GlobalPackageReference, IsDirect: true)
-                        ],
-                        Properties = [],
-                    }
-                ]
-            });
+                [
+                    "discover",
+                    "--repo-root",
+                    path,
+                    "--workspace",
+                    "path/to",
+                    "--output",
+                    Path.Combine(path, DiscoveryWorker.DiscoveryResultFileName)
+                ],
+                new[]
+                {
+                    ("path/to/my.csproj", """
+                        <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+                          <PropertyGroup>
+                            <TargetFramework>net8.0</TargetFramework>
+                          </PropertyGroup>
+                          <ItemGroup>
+                            <PackageReference Include="Newtonsoft.Json" Version="7.0.1" />
+                          </ItemGroup>
+                          <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+                        </Project>
+                        """),
+                    ("path/Directory.Build.props", """
+                        <Project>
+                            <ItemGroup Condition="'$(ManagePackageVersionsCentrally)' == 'true'">
+                              <GlobalPackageReference Include="System.Text.Json" Version="8.0.3" />
+                            </ItemGroup>
+                            <ItemGroup Condition="'$(ManagePackageVersionsCentrally)' != 'true'">
+                              <PackageReference Include="System.Text.Json" Version="8.0.3" />
+                            </ItemGroup>
+                        </Project>
+                        """)
+                },
+                expectedResult: new()
+                {
+                    Path = "path/to",
+                    Projects = [
+                        new()
+                        {
+                            FilePath = "my.csproj",
+                            TargetFrameworks = ["net8.0"],
+                            ReferencedProjectPaths = [],
+                            ExpectedDependencyCount = 2,
+                            Dependencies = [
+                                new("Newtonsoft.Json", "7.0.1", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
+                                // $(ManagePackageVersionsCentrally) evaluates false by default, we only get a PackageReference
+                                new("System.Text.Json", "8.0.3", DependencyType.PackageReference, TargetFrameworks: ["net8.0"])
+                            ],
+                            Properties = [
+                                new("TargetFramework", "net8.0", "path/to/my.csproj"),
+                            ],
+                        },
+                        new()
+                        {
+                            FilePath = "../Directory.Build.props",
+                            ReferencedProjectPaths = [],
+                            ExpectedDependencyCount = 2,
+                            Dependencies = [
+                                new("System.Text.Json", "8.0.3", DependencyType.PackageReference, IsDirect: true),
+                                new("System.Text.Json", "8.0.3", DependencyType.GlobalPackageReference, IsDirect: true)
+                            ],
+                            Properties = [],
+                        }
+                    ]
+                }
+            );
         }
 
         private static async Task RunAsync(

data/helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/EntryPointTests.FrameworkCheck.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
 using Xunit;
 
 namespace NuGetUpdater.Cli.Test;

data/helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/EntryPointTests.Update.cs

@@ -44,19 +44,19 @@ public partial class EntryPointTests
                         Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "my", "my.csproj", "{782E0C0A-10D3-444D-9640-263D03D2B20C}"
                         EndProject
                         Global
-                          GlobalSection(SolutionConfigurationPlatforms) = preSolution
+                            GlobalSection(SolutionConfigurationPlatforms) = preSolution
                             Debug|Any CPU = Debug|Any CPU
                             Release|Any CPU = Release|Any CPU
-                          EndGlobalSection
-                          GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                            EndGlobalSection
+                            GlobalSection(ProjectConfigurationPlatforms) = postSolution
                             {782E0C0A-10D3-444D-9640-263D03D2B20C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                             {782E0C0A-10D3-444D-9640-263D03D2B20C}.Debug|Any CPU.Build.0 = Debug|Any CPU
                             {782E0C0A-10D3-444D-9640-263D03D2B20C}.Release|Any CPU.ActiveCfg = Release|Any CPU
                             {782E0C0A-10D3-444D-9640-263D03D2B20C}.Release|Any CPU.Build.0 = Release|Any CPU
-                          EndGlobalSection
-                          GlobalSection(SolutionProperties) = preSolution
+                            EndGlobalSection
+                            GlobalSection(SolutionProperties) = preSolution
                             HideSolutionNode = FALSE
-                          EndGlobalSection
+                            EndGlobalSection
                         EndGlobal
                         """),
                     ("path/to/my.csproj", """
@@ -82,7 +82,7 @@ public partial class EntryPointTests
                           <package id="Some.Package" version="7.0.1" targetFramework="net45" />
                         </packages>
                         """)
-                ],
+                      ],
                 expectedFiles:
                 [
                     ("path/to/my.csproj", """
@@ -253,7 +253,7 @@ public partial class EntryPointTests
                         """),
                     ("other-dir/Directory.Build.props", """
                         <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-                        
+
                           <ItemGroup>
                             <PackageReference Include="Some.Package" Version="6.1.0" />
                           </ItemGroup>
@@ -271,8 +271,7 @@ public partial class EntryPointTests
                           </ItemGroup>
                         </Project>
                         """),
-                    ("some-dir/project1/project.csproj",
-                        """
+                    ("some-dir/project1/project.csproj", """
                         <Project Sdk="Microsoft.NET.Sdk">
                           <PropertyGroup>
                             <OutputType>Exe</OutputType>
@@ -300,7 +299,7 @@ public partial class EntryPointTests
                         """),
                     ("other-dir/Directory.Build.props", """
                         <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-                        
+
                           <ItemGroup>
                             <PackageReference Include="Some.Package" Version="6.1.0" />
                           </ItemGroup>

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Analyze/AnalysisResult.cs

@@ -0,0 +1,11 @@
+using System.Collections.Immutable;
+
+namespace NuGetUpdater.Core.Analyze;
+
+public record AnalysisResult
+{
+    public required string UpdatedVersion { get; init; }
+    public bool CanUpdate { get; init; }
+    public bool VersionComesFromMultiDependencyProperty { get; init; }
+    public required ImmutableArray<Dependency> UpdatedDependencies { get; init; }
+}