dependabot-nuget 0.242.1 → 0.244.0

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Files/ProjectBuildFileTests.cs

@@ -133,17 +133,26 @@ public class ProjectBuildFileTests
     }
 
     [Theory]
-    [InlineData( // no change made
-    @"<Project><ItemGroup><Reference><HintPath>path\to\file.dll</HintPath></Reference></ItemGroup></Project>",
-    @"<Project><ItemGroup><Reference><HintPath>path\to\file.dll</HintPath></Reference></ItemGroup></Project>"
+    // no change made
+    [InlineData(
+        // language=csproj
+        @"<Project><ItemGroup><Reference><HintPath>path\to\file.dll</HintPath></Reference></ItemGroup></Project>",
+        // language=csproj
+        @"<Project><ItemGroup><Reference><HintPath>path\to\file.dll</HintPath></Reference></ItemGroup></Project>"
     )]
-    [InlineData( // change from `/` to `\`
-    "<Project><ItemGroup><Reference><HintPath>path/to/file.dll</HintPath></Reference></ItemGroup></Project>",
-    @"<Project><ItemGroup><Reference><HintPath>path\to\file.dll</HintPath></Reference></ItemGroup></Project>"
+    // change from `/` to `\`
+    [InlineData(
+        // language=csproj
+        "<Project><ItemGroup><Reference><HintPath>path/to/file.dll</HintPath></Reference></ItemGroup></Project>",
+        // language=csproj
+        @"<Project><ItemGroup><Reference><HintPath>path\to\file.dll</HintPath></Reference></ItemGroup></Project>"
     )]
-    [InlineData( // multiple changes made
-    "<Project><ItemGroup><Reference><HintPath>path1/to1/file1.dll</HintPath></Reference><Reference><HintPath>path2/to2/file2.dll</HintPath></Reference></ItemGroup></Project>",
-    @"<Project><ItemGroup><Reference><HintPath>path1\to1\file1.dll</HintPath></Reference><Reference><HintPath>path2\to2\file2.dll</HintPath></Reference></ItemGroup></Project>"
+    // multiple changes made
+    [InlineData(
+        // language=csproj
+        "<Project><ItemGroup><Reference><HintPath>path1/to1/file1.dll</HintPath></Reference><Reference><HintPath>path2/to2/file2.dll</HintPath></Reference></ItemGroup></Project>",
+        // language=csproj
+        @"<Project><ItemGroup><Reference><HintPath>path1\to1\file1.dll</HintPath></Reference><Reference><HintPath>path2\to2\file2.dll</HintPath></Reference></ItemGroup></Project>"
     )]
     public void ReferenceHintPathsCanBeNormalized(string originalXml, string expectedXml)
     {

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/FrameworkChecker/CompatibilityCheckerFacts.cs

@@ -20,7 +20,7 @@ public class CompatibilityCheckerFacts
     [InlineData("net4.8", "netstandard1.3")]
     public void PackageContainsCompatibleFramework(string projectTfm, string packageTfm)
     {
-        var result = CompatibilityChecker.IsCompatible(new[] { projectTfm }, new[] { packageTfm }, new Logger(verbose: true));
+        var result = CompatibilityChecker.IsCompatible([projectTfm], [packageTfm], new Logger(verbose: true));
 
         Assert.True(result);
     }
@@ -37,7 +37,7 @@ public class CompatibilityCheckerFacts
     [InlineData("net7.0", "net48")]
     public void PackageContainsIncompatibleFramework(string projectTfm, string packageTfm)
     {
-        var result = CompatibilityChecker.IsCompatible(new[] { projectTfm }, new[] { packageTfm }, new Logger(verbose: true));
+        var result = CompatibilityChecker.IsCompatible([projectTfm], [packageTfm], new Logger(verbose: true));
 
         Assert.False(result);
     }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/FrameworkChecker/FrameworkCompatibilityServiceFacts.cs

@@ -41,11 +41,11 @@ public class FrameworkCompatibilityServiceFacts
     public void UnknownSupportedPackageReturnsSetWithSameFramework()
     {
         var framework = NuGetFramework.Parse("net45-client");
-        var frameworks = new List<NuGetFramework>() { framework };
+        var frameworks = new List<NuGetFramework> { framework };
         var compatible = _service.GetCompatibleFrameworks(frameworks);
 
         Assert.False(framework.IsUnsupported);
-        Assert.Equal(expected: 1, compatible.Count);
+        Assert.Single(compatible);
         Assert.Contains(framework, compatible);
     }
 
@@ -57,10 +57,10 @@ public class FrameworkCompatibilityServiceFacts
     {
         var unsupportedFramework = NuGetFramework.Parse(unsupportedFrameworkName);
 
-        var result = _service.GetCompatibleFrameworks(new List<NuGetFramework>() { unsupportedFramework });
+        var result = _service.GetCompatibleFrameworks([unsupportedFramework]);
 
         Assert.True(unsupportedFramework.IsUnsupported);
-        Assert.Equal(expected: 0, actual: result.Count);
+        Assert.Empty(result);
     }
 
     [Theory]
@@ -71,10 +71,10 @@ public class FrameworkCompatibilityServiceFacts
     {
         var portableFramework = NuGetFramework.Parse(pclFrameworkName);
 
-        var result = _service.GetCompatibleFrameworks(new List<NuGetFramework>() { portableFramework });
+        var result = _service.GetCompatibleFrameworks([portableFramework]);
 
         Assert.True(portableFramework.IsPCL);
-        Assert.Equal(expected: 0, actual: result.Count);
+        Assert.Empty(result);
     }
 
     [Theory]
@@ -113,7 +113,7 @@ public class FrameworkCompatibilityServiceFacts
             projectFrameworks.Add(NuGetFramework.Parse(frameworkName));
         }
 
-        var compatibleFrameworks = _service.GetCompatibleFrameworks(new HashSet<NuGetFramework>() { packageFramework });
+        var compatibleFrameworks = _service.GetCompatibleFrameworks([packageFramework]);
         Assert.Equal(windowsProjectFrameworks.Length, compatibleFrameworks.Count);
 
         var containsAllCompatibleFrameworks = compatibleFrameworks.All(cf => projectFrameworks.Contains(cf));

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/FrameworkChecker/SupportedFrameworkFacts.cs

@@ -49,7 +49,7 @@ public class SupportedFrameworksFacts
 
         foreach (var field in fields)
         {
-            var framework = (NuGetFramework)field.GetValue(null);
+            var framework = (NuGetFramework)field.GetValue(null)!;
 
             if (DeprecatedFrameworks.Contains(framework))
             {

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/PackagesConfigUpdaterTests.cs

@@ -23,8 +23,8 @@ public class PackagesConfigUpdaterTests
     public static IEnumerable<object[]> PackagesDirectoryPathTestData()
     {
         // project with namespace
-        yield return new object[]
-        {
+        yield return
+        [
             """
             <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
               <ItemGroup>
@@ -38,11 +38,11 @@ public class PackagesConfigUpdaterTests
             "Newtonsoft.Json",
             "7.0.1",
             @"..\packages"
-        };
+        ];
 
         // project without namespace
-        yield return new object[]
-        {
+        yield return
+        [
             """
             <Project>
               <ItemGroup>
@@ -56,11 +56,11 @@ public class PackagesConfigUpdaterTests
             "Newtonsoft.Json",
             "7.0.1",
             @"..\packages"
-        };
+        ];
 
         // project with non-standard packages path
-        yield return new object[]
-        {
+        yield return
+        [
             """
             <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
               <ItemGroup>
@@ -74,6 +74,6 @@ public class PackagesConfigUpdaterTests
             "Newtonsoft.Json",
             "7.0.1",
             @"..\not-a-path-you-would-expect"
-        };
+        ];
     }
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorker.DirsProj.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -23,53 +24,53 @@ public partial class UpdateWorkerTests
                 // initial
                 projectContents: """
                 <Project Sdk="Microsoft.Build.NoTargets">
-
+                
                   <ItemGroup>
                     <ProjectReference Include="src/test-project.csproj" />
                   </ItemGroup>
 
                 </Project>
                 """,
-                additionalFiles: new (string Path, string Content)[]
-                {
+                additionalFiles:
+                [
                     ("src/test-project.csproj",
-                      """
-                      <Project Sdk="Microsoft.NET.Sdk">
-                        <PropertyGroup>
-                          <TargetFramework>netstandard2.0</TargetFramework>
-                        </PropertyGroup>
-
-                        <ItemGroup>
-                          <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
-                        </ItemGroup>
-                      </Project>
-                      """)
-                },
+                        """
+                        <Project Sdk="Microsoft.NET.Sdk">
+                          <PropertyGroup>
+                            <TargetFramework>netstandard2.0</TargetFramework>
+                          </PropertyGroup>
+                        
+                          <ItemGroup>
+                            <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+                          </ItemGroup>
+                        </Project>
+                        """)
+                ],
                 // expected
                 expectedProjectContents: """
                 <Project Sdk="Microsoft.Build.NoTargets">
-
+                
                   <ItemGroup>
                     <ProjectReference Include="src/test-project.csproj" />
                   </ItemGroup>
 
                 </Project>
                 """,
-                additionalFilesExpected: new (string Path, string Content)[]
-                {
+                additionalFilesExpected:
+                [
                     ("src/test-project.csproj",
-                      """
-                      <Project Sdk="Microsoft.NET.Sdk">
-                        <PropertyGroup>
-                          <TargetFramework>netstandard2.0</TargetFramework>
-                        </PropertyGroup>
-
-                        <ItemGroup>
-                          <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-                        </ItemGroup>
-                      </Project>
-                      """)
-                });
+                        """
+                        <Project Sdk="Microsoft.NET.Sdk">
+                          <PropertyGroup>
+                            <TargetFramework>netstandard2.0</TargetFramework>
+                          </PropertyGroup>
+                        
+                          <ItemGroup>
+                            <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+                          </ItemGroup>
+                        </Project>
+                        """)
+                ]);
         }
 
         [Fact]
@@ -100,73 +101,225 @@ public partial class UpdateWorkerTests
                 // initial
                 projectContents: """
                 <Project Sdk="Microsoft.Build.NoTargets">
+                
+                  <ItemGroup>
+                    <ProjectReference Include="src/dirs.proj" />
+                  </ItemGroup>
+
+                </Project>
+                """,
+                additionalFiles:
+                [
+                    ("src/dirs.proj",
+                        """
+                        <Project Sdk="Microsoft.Build.NoTargets">
+                        
+                          <ItemGroup>
+                            <ProjectReference Include="test-project/test-project.csproj" />
+                          </ItemGroup>
 
+                        </Project>
+                        """),
+                    ("src/test-project/test-project.csproj",
+                        """
+                        <Project Sdk="Microsoft.NET.Sdk">
+                          <PropertyGroup>
+                            <TargetFramework>netstandard2.0</TargetFramework>
+                          </PropertyGroup>
+                        
+                          <ItemGroup>
+                            <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+                          </ItemGroup>
+                        </Project>
+                        """)
+                ],
+                // expected
+                expectedProjectContents: """
+                <Project Sdk="Microsoft.Build.NoTargets">
+                
                   <ItemGroup>
                     <ProjectReference Include="src/dirs.proj" />
                   </ItemGroup>
 
                 </Project>
                 """,
-                additionalFiles: new (string Path, string Content)[]
-                {
+                additionalFilesExpected:
+                [
                     ("src/dirs.proj",
-                      """
-                      <Project Sdk="Microsoft.Build.NoTargets">
+                        """
+                        <Project Sdk="Microsoft.Build.NoTargets">
+                        
+                          <ItemGroup>
+                            <ProjectReference Include="test-project/test-project.csproj" />
+                          </ItemGroup>
 
-                        <ItemGroup>
-                          <ProjectReference Include="test-project/test-project.csproj" />
-                        </ItemGroup>
+                        </Project>
+                        """),
+                    ("src/test-project/test-project.csproj",
+                        """
+                        <Project Sdk="Microsoft.NET.Sdk">
+                          <PropertyGroup>
+                            <TargetFramework>netstandard2.0</TargetFramework>
+                          </PropertyGroup>
+                        
+                          <ItemGroup>
+                            <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+                          </ItemGroup>
+                        </Project>
+                        """)
+                ]);
+        }
+
+        [Fact]
+        public async Task UpdateSingleDependencyInNestedDirsProjUsingWildcard()
+        {
+            await TestUpdateForDirsProj("Newtonsoft.Json", "9.0.1", "13.0.1",
+                // initial
+                projectContents: """
+                <Project Sdk="Microsoft.Build.NoTargets">
+                
+                  <ItemGroup>
+                    <ProjectReference Include="src/*.proj" />
+                  </ItemGroup>
+
+                </Project>
+                """,
+                additionalFiles:
+                [
+                    ("src/dirs.proj",
+                        """
+                        <Project Sdk="Microsoft.Build.NoTargets">
+                        
+                          <ItemGroup>
+                            <ProjectReference Include="test-project/test-project.csproj" />
+                          </ItemGroup>
 
-                      </Project>
-                      """),
+                        </Project>
+                        """),
                     ("src/test-project/test-project.csproj",
-                      """
-                      <Project Sdk="Microsoft.NET.Sdk">
-                        <PropertyGroup>
-                          <TargetFramework>netstandard2.0</TargetFramework>
-                        </PropertyGroup>
-
-                        <ItemGroup>
-                          <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
-                        </ItemGroup>
-                      </Project>
-                      """)
-                },
+                        """
+                        <Project Sdk="Microsoft.NET.Sdk">
+                          <PropertyGroup>
+                            <TargetFramework>netstandard2.0</TargetFramework>
+                          </PropertyGroup>
+                        
+                          <ItemGroup>
+                            <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+                          </ItemGroup>
+                        </Project>
+                        """)
+                ],
                 // expected
                 expectedProjectContents: """
                 <Project Sdk="Microsoft.Build.NoTargets">
+                
+                  <ItemGroup>
+                    <ProjectReference Include="src/*.proj" />
+                  </ItemGroup>
+
+                </Project>
+                """,
+                additionalFilesExpected:
+                [
+                    ("src/dirs.proj",
+                        """
+                        <Project Sdk="Microsoft.Build.NoTargets">
+                        
+                          <ItemGroup>
+                            <ProjectReference Include="test-project/test-project.csproj" />
+                          </ItemGroup>
 
+                        </Project>
+                        """),
+                    ("src/test-project/test-project.csproj",
+                        """
+                        <Project Sdk="Microsoft.NET.Sdk">
+                          <PropertyGroup>
+                            <TargetFramework>netstandard2.0</TargetFramework>
+                          </PropertyGroup>
+                        
+                          <ItemGroup>
+                            <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+                          </ItemGroup>
+                        </Project>
+                        """)
+                ]);
+        }
+
+        [Fact]
+        public async Task UpdateSingleDependencyInNestedDirsProjUsingRecursiveWildcard()
+        {
+            await TestUpdateForDirsProj("Newtonsoft.Json", "9.0.1", "13.0.1",
+                // initial
+                projectContents: """
+                <Project Sdk="Microsoft.Build.NoTargets">
+                
                   <ItemGroup>
-                    <ProjectReference Include="src/dirs.proj" />
+                    <ProjectReference Include="**/*.proj" />
                   </ItemGroup>
 
                 </Project>
                 """,
-                additionalFilesExpected: new (string Path, string Content)[]
-                {
+                additionalFiles:
+                [
                     ("src/dirs.proj",
-                      """
-                      <Project Sdk="Microsoft.Build.NoTargets">
+                        """
+                        <Project Sdk="Microsoft.Build.NoTargets">
+                        
+                          <ItemGroup>
+                            <ProjectReference Include="test-project/test-project.csproj" />
+                          </ItemGroup>
 
-                        <ItemGroup>
-                          <ProjectReference Include="test-project/test-project.csproj" />
-                        </ItemGroup>
+                        </Project>
+                        """),
+                    ("src/test-project/test-project.csproj",
+                        """
+                        <Project Sdk="Microsoft.NET.Sdk">
+                          <PropertyGroup>
+                            <TargetFramework>netstandard2.0</TargetFramework>
+                          </PropertyGroup>
+                        
+                          <ItemGroup>
+                            <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+                          </ItemGroup>
+                        </Project>
+                        """)
+                ],
+                // expected
+                expectedProjectContents: """
+                <Project Sdk="Microsoft.Build.NoTargets">
+                
+                  <ItemGroup>
+                    <ProjectReference Include="**/*.proj" />
+                  </ItemGroup>
+
+                </Project>
+                """,
+                additionalFilesExpected:
+                [
+                    ("src/dirs.proj",
+                        """
+                        <Project Sdk="Microsoft.Build.NoTargets">
+                        
+                          <ItemGroup>
+                            <ProjectReference Include="test-project/test-project.csproj" />
+                          </ItemGroup>
 
-                      </Project>
-                      """),
+                        </Project>
+                        """),
                     ("src/test-project/test-project.csproj",
-                      """
-                      <Project Sdk="Microsoft.NET.Sdk">
-                        <PropertyGroup>
-                          <TargetFramework>netstandard2.0</TargetFramework>
-                        </PropertyGroup>
-
-                        <ItemGroup>
-                          <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-                        </ItemGroup>
-                      </Project>
-                      """)
-                });
+                        """
+                        <Project Sdk="Microsoft.NET.Sdk">
+                          <PropertyGroup>
+                            <TargetFramework>netstandard2.0</TargetFramework>
+                          </PropertyGroup>
+                        
+                          <ItemGroup>
+                            <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+                          </ItemGroup>
+                        </Project>
+                        """)
+                ]);
         }
 
         static async Task TestUpdateForDirsProj(
@@ -179,8 +332,8 @@ public partial class UpdateWorkerTests
             (string Path, string Content)[]? additionalFiles = null,
             (string Path, string Content)[]? additionalFilesExpected = null)
         {
-            additionalFiles ??= Array.Empty<(string Path, string Content)>();
-            additionalFilesExpected ??= Array.Empty<(string Path, string Content)>();
+            additionalFiles ??= [];
+            additionalFilesExpected ??= [];
 
             var projectName = "dirs";
             var projectFileName = $"{projectName}.proj";

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTestBase.cs

@@ -18,7 +18,15 @@ public abstract class UpdateWorkerTestBase
         bool isTransitive = false,
         (string Path, string Content)[]? additionalFiles = null,
         string projectFilePath = "test-project.csproj")
-        => TestUpdateForProject(dependencyName, oldVersion, newVersion, (projectFilePath, projectContents), expectedProjectContents: projectContents, isTransitive, additionalFiles, additionalFilesExpected: additionalFiles);
+        => TestUpdateForProject(
+            dependencyName,
+            oldVersion,
+            newVersion,
+            (projectFilePath, projectContents),
+            expectedProjectContents: projectContents,
+            isTransitive,
+            additionalFiles,
+            additionalFilesExpected: additionalFiles);
 
     protected static Task TestUpdateForProject(
         string dependencyName,
@@ -30,10 +38,15 @@ public abstract class UpdateWorkerTestBase
         (string Path, string Content)[]? additionalFiles = null,
         (string Path, string Content)[]? additionalFilesExpected = null,
         string projectFilePath = "test-project.csproj")
-    {
-        var projectFile = (Path: projectFilePath, Content: projectContents);
-        return TestUpdateForProject(dependencyName, oldVersion, newVersion, projectFile, expectedProjectContents, isTransitive, additionalFiles, additionalFilesExpected);
-    }
+        => TestUpdateForProject(
+            dependencyName,
+            oldVersion,
+            newVersion,
+            (Path: projectFilePath, Content: projectContents),
+            expectedProjectContents,
+            isTransitive,
+            additionalFiles,
+            additionalFilesExpected);
 
     protected static async Task TestUpdateForProject(
         string dependencyName,
@@ -45,8 +58,8 @@ public abstract class UpdateWorkerTestBase
         (string Path, string Content)[]? additionalFiles = null,
         (string Path, string Content)[]? additionalFilesExpected = null)
     {
-        additionalFiles ??= Array.Empty<(string Path, string Content)>();
-        additionalFilesExpected ??= Array.Empty<(string Path, string Content)>();
+        additionalFiles ??= [];
+        additionalFilesExpected ??= [];
 
         var projectFilePath = projectFile.Path;
         var projectName = Path.GetFileNameWithoutExtension(projectFilePath);
@@ -76,7 +89,7 @@ public abstract class UpdateWorkerTestBase
             """;
         var testFiles = new[] { (slnName, slnContent), projectFile }.Concat(additionalFiles).ToArray();
 
-        var actualResult = await RunUpdate(testFiles, async (temporaryDirectory) =>
+        var actualResult = await RunUpdate(testFiles, async temporaryDirectory =>
         {
             var slnPath = Path.Combine(temporaryDirectory, slnName);
             var worker = new UpdaterWorker(new Logger(verbose: true));
@@ -94,7 +107,7 @@ public abstract class UpdateWorkerTestBase
         using var tempDir = new TemporaryDirectory();
         foreach (var file in files)
         {
-            var localPath = file.Path.StartsWith("/") ? file.Path[1..] : file.Path; // remove path rooting character
+            var localPath = file.Path.StartsWith('/') ? file.Path[1..] : file.Path; // remove path rooting character
             var filePath = Path.Combine(tempDir.DirectoryPath, localPath);
             var directoryPath = Path.GetDirectoryName(filePath);
             Directory.CreateDirectory(directoryPath!);