dependabot-nuget 0.242.1 → 0.244.0

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

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+
 using NuGetUpdater.Core.Utilities;
+
 using Xunit;
 
 namespace NuGetUpdater.Core.Test.Utilities;
@@ -18,8 +20,8 @@ public class JsonHelperTests
 
     public static IEnumerable<object[]> JsonUpdaterTestData()
     {
-        yield return new object[]
-        {
+        yield return
+        [
             // json
             """
             {
@@ -75,10 +77,10 @@ public class JsonHelperTests
               }
             }
             """
-        };
+        ];
 
-        yield return new object[]
-        {
+        yield return
+        [
             // json
             """
             {
@@ -119,11 +121,11 @@ public class JsonHelperTests
               }
             }
             """
-        };
+        ];
 
         // differing case between `propertyPath` and the actual property values
-        yield return new object[]
-        {
+        yield return
+        [
             // json
             """
             {
@@ -177,11 +179,11 @@ public class JsonHelperTests
               }
             }
             """
-        };
+        ];
 
         // shallow property path
-        yield return new object[]
-        {
+        yield return
+        [
             // original json
             """
             {
@@ -209,11 +211,11 @@ public class JsonHelperTests
               "path2": "new-value"
             }
             """
-        };
+        ];
 
         // line comment after comma
-        yield return new object[]
-        {
+        yield return
+        [
             // original json
             """
             {
@@ -234,6 +236,6 @@ public class JsonHelperTests
               "property2": "updated-value"
             }
             """
-        };
+        ];
     }
 }

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

@@ -128,7 +128,7 @@ public class MSBuildHelperTests
     }
 
     [Theory]
-    [MemberData(nameof(GetTopLevelPackageDependenyInfosTestData))]
+    [MemberData(nameof(GetTopLevelPackageDependencyInfosTestData))]
     public async Task TopLevelPackageDependenciesCanBeDetermined((string Path, string Content)[] buildFileContents, Dependency[] expectedTopLevelDependencies)
     {
         using var testDirectory = new TemporaryDirectory();
@@ -140,7 +140,7 @@ public class MSBuildHelperTests
             buildFiles.Add(ProjectBuildFile.Parse(testDirectory.DirectoryPath, fullPath, content));
         }
 
-        var actualTopLevelDependencies = MSBuildHelper.GetTopLevelPackageDependenyInfos(buildFiles.ToImmutableArray());
+        var actualTopLevelDependencies = MSBuildHelper.GetTopLevelPackageDependencyInfos(buildFiles.ToImmutableArray());
         Assert.Equal(expectedTopLevelDependencies, actualTopLevelDependencies);
     }
 
@@ -167,7 +167,11 @@ public class MSBuildHelperTests
             new("System.Threading.Tasks.Extensions", "4.5.4", DependencyType.Unknown),
             new("NETStandard.Library", "2.0.3", DependencyType.Unknown),
         };
-        var actualDependencies = await MSBuildHelper.GetAllPackageDependenciesAsync(temp.DirectoryPath, temp.DirectoryPath, "netstandard2.0", new[] { new Dependency("Microsoft.Extensions.Http", "7.0.0", DependencyType.Unknown) });
+        var actualDependencies = await MSBuildHelper.GetAllPackageDependenciesAsync(
+            temp.DirectoryPath,
+            temp.DirectoryPath,
+            "netstandard2.0",
+            [new Dependency("Microsoft.Extensions.Http", "7.0.0", DependencyType.Unknown)]);
         Assert.Equal(expectedDependencies, actualDependencies);
     }
 
@@ -251,7 +255,8 @@ public class MSBuildHelperTests
             new("MSTest.TestAdapter", "2.1.0", DependencyType.Unknown),
             new("NETStandard.Library", "2.0.3", DependencyType.Unknown),
         };
-        var packages = new[] {
+        var packages = new[]
+        {
             new Dependency("System", "4.1.311.2", DependencyType.Unknown),
             new Dependency("System.Core", "3.5.21022.801", DependencyType.Unknown),
             new Dependency("Moq", "4.16.1", DependencyType.Unknown),
@@ -269,12 +274,13 @@ public class MSBuildHelperTests
             new Dependency("Newtonsoft.Json", "12.0.1", DependencyType.Unknown)
         };
         var actualDependencies = await MSBuildHelper.GetAllPackageDependenciesAsync(temp.DirectoryPath, temp.DirectoryPath, "netstandard2.0", packages);
-        for(int i = 0; i < actualDependencies.Length; i++)
+        for (int i = 0; i < actualDependencies.Length; i++)
         {
             var ad = actualDependencies[i];
             var ed = expectedDependencies[i];
             Assert.Equal(ed, ad);
         }
+
         Assert.Equal(expectedDependencies, actualDependencies);
     }
 
@@ -301,7 +307,8 @@ public class MSBuildHelperTests
             new("System.Threading.Tasks.Extensions", "4.5.4", DependencyType.Unknown),
             new("NETStandard.Library", "2.0.3", DependencyType.Unknown),
         };
-        var packages = new[] {
+        var packages = new[]
+        {
             new Dependency("Microsoft.Extensions.Http", "7.0.0", DependencyType.Unknown),
             new Dependency("Newtonsoft.Json", "12.0.1", DependencyType.Unknown, IsUpdate: true)
         };
@@ -326,11 +333,16 @@ public class MSBuildHelperTests
             Environment.SetEnvironmentVariable("NUGET_HTTP_CACHE_PATH", tempNuGetHttpCacheDirectory);
 
             // First validate that we are unable to find dependencies for the package version without a NuGet.config.
-            var dependenciesNoNuGetConfig = await MSBuildHelper.GetAllPackageDependenciesAsync(temp.DirectoryPath, temp.DirectoryPath, "netstandard2.0", new[] { new Dependency("Microsoft.CodeAnalysis.Common", "4.8.0-3.23457.5", DependencyType.Unknown) });
-            Assert.Equal(Array.Empty<Dependency>(), dependenciesNoNuGetConfig);
+            var dependenciesNoNuGetConfig = await MSBuildHelper.GetAllPackageDependenciesAsync(
+                temp.DirectoryPath,
+                temp.DirectoryPath,
+                "netstandard2.0",
+                [new Dependency("Microsoft.CodeAnalysis.Common", "4.8.0-3.23457.5", DependencyType.Unknown)]);
+            Assert.Equal([], dependenciesNoNuGetConfig);
 
             // Write the NuGet.config and try again.
-            await File.WriteAllTextAsync(Path.Combine(temp.DirectoryPath, "NuGet.Config"), """
+            await File.WriteAllTextAsync(
+                Path.Combine(temp.DirectoryPath, "NuGet.Config"), """
                 <?xml version="1.0" encoding="utf-8"?>
                 <configuration>
                   <packageSources>
@@ -355,7 +367,12 @@ public class MSBuildHelperTests
                 new("Microsoft.CodeAnalysis.Analyzers", "3.3.4", DependencyType.Unknown),
                 new("NETStandard.Library", "2.0.3", DependencyType.Unknown),
             };
-            var actualDependencies = await MSBuildHelper.GetAllPackageDependenciesAsync(temp.DirectoryPath, temp.DirectoryPath, "netstandard2.0", new[] { new Dependency("Microsoft.CodeAnalysis.Common", "4.8.0-3.23457.5", DependencyType.Unknown) });
+            var actualDependencies = await MSBuildHelper.GetAllPackageDependenciesAsync(
+                temp.DirectoryPath,
+                temp.DirectoryPath,
+                "netstandard2.0",
+                [new Dependency("Microsoft.CodeAnalysis.Common", "4.8.0-3.23457.5", DependencyType.Unknown)]
+            );
             Assert.Equal(expectedDependencies, actualDependencies);
         }
         finally
@@ -366,11 +383,11 @@ public class MSBuildHelperTests
         }
     }
 
-    public static IEnumerable<object[]> GetTopLevelPackageDependenyInfosTestData()
+    public static IEnumerable<object[]> GetTopLevelPackageDependencyInfosTestData()
     {
         // simple case
-        yield return new object[]
-        {
+        yield return
+        [
             // build file contents
             new[]
             {
@@ -387,11 +404,11 @@ public class MSBuildHelperTests
             {
                 new("Newtonsoft.Json", "12.0.1", DependencyType.Unknown)
             }
-        };
+        ];
 
         // version is a child-node of the package reference
-        yield return new object[]
-        {
+        yield return
+        [
             // build file contents
             new[]
             {
@@ -410,11 +427,11 @@ public class MSBuildHelperTests
             {
                 new("Newtonsoft.Json", "12.0.1", DependencyType.Unknown)
             }
-        };
+        ];
 
         // version is in property in same file
-        yield return new object[]
-        {
+        yield return
+        [
             // build file contents
             new[]
             {
@@ -434,9 +451,35 @@ public class MSBuildHelperTests
             {
                 new("Newtonsoft.Json", "12.0.1", DependencyType.Unknown)
             }
-        };
+        ];
 
         // version is a property not triggered by a condition
+        yield return
+        [
+            // build file contents
+            new[]
+            {
+                ("project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>netstandard2.0</TargetFramework>
+                        <NewtonsoftJsonVersion>12.0.1</NewtonsoftJsonVersion>
+                        <NewtonsoftJsonVersion Condition="$(PropertyThatDoesNotExist) == 'true'">13.0.1</NewtonsoftJsonVersion>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
+                      </ItemGroup>
+                    </Project>
+                    """)
+            },
+            // expected dependencies
+            new Dependency[]
+            {
+                new("Newtonsoft.Json", "12.0.1", DependencyType.Unknown)
+            }
+        ];
+
+        // version is a property not triggered by a quoted condition
         yield return new object[]
         {
             // build file contents
@@ -447,7 +490,7 @@ public class MSBuildHelperTests
                       <PropertyGroup>
                         <TargetFramework>netstandard2.0</TargetFramework>
                         <NewtonsoftJsonVersion>12.0.1</NewtonsoftJsonVersion>
-                        <NewtonsoftJsonVersion Condition="$(PropertyThatDoesNotExist) == 'true'">13.0.1</NewtonsoftJsonVersion>
+                        <NewtonsoftJsonVersion Condition="'$(PropertyThatDoesNotExist)' == 'true'">13.0.1</NewtonsoftJsonVersion>
                       </PropertyGroup>
                       <ItemGroup>
                         <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
@@ -463,8 +506,8 @@ public class MSBuildHelperTests
         };
 
         // version is a property with a condition checking for an empty string
-        yield return new object[]
-        {
+        yield return
+        [
             // build file contents
             new[]
             {
@@ -486,22 +529,48 @@ public class MSBuildHelperTests
             {
                 new("Newtonsoft.Json", "12.0.1", DependencyType.Unknown)
             }
-        };
+        ];
 
-        // version is set in one file, used in another
+        // version is a property with a quoted condition checking for an empty string
         yield return new object[]
         {
             // build file contents
             new[]
             {
-                ("Packages.props", """
-                    <Project>
+                ("project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>netstandard2.0</TargetFramework>
+                        <NewtonsoftJsonVersion Condition="'$(NewtonsoftJsonVersion)' == ''">12.0.1</NewtonsoftJsonVersion>
+                        <NewtonsoftJsonVersion Condition="'$(PropertyThatDoesNotExist)' == 'true'">13.0.1</NewtonsoftJsonVersion>
+                      </PropertyGroup>
                       <ItemGroup>
-                        <PackageReference Update="Azure.Identity" Version="1.6.0" />
-                        <PackageReference Update="Microsoft.Data.SqlClient" Version="5.1.4" />
+                        <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
                       </ItemGroup>
                     </Project>
-                """),
+                    """)
+            },
+            // expected dependencies
+            new Dependency[]
+            {
+                new("Newtonsoft.Json", "12.0.1", DependencyType.Unknown)
+            }
+        };
+
+        // version is set in one file, used in another
+        yield return
+        [
+            // build file contents
+            new[]
+            {
+                ("Packages.props", """
+                        <Project>
+                          <ItemGroup>
+                            <PackageReference Update="Azure.Identity" Version="1.6.0" />
+                            <PackageReference Update="Microsoft.Data.SqlClient" Version="5.1.4" />
+                          </ItemGroup>
+                        </Project>
+                    """),
                 ("project.csproj", """
                     <Project Sdk="Microsoft.NET.Sdk">
                       <PropertyGroup>
@@ -519,11 +588,11 @@ public class MSBuildHelperTests
                 new("Azure.Identity", "1.6.0", DependencyType.Unknown),
                 new("Microsoft.Data.SqlClient", "5.1.4", DependencyType.Unknown, IsUpdate: true)
             }
-        };
+        ];
 
         // version is set in one file, used in another
-        yield return new object[]
-        {
+        yield return
+        [
             // build file contents
             new[]
             {
@@ -538,13 +607,13 @@ public class MSBuildHelperTests
                     </Project>
                     """),
                 ("Packages.props", """
-                    <Project>
-                      <ItemGroup>
-                        <PackageReference Update="Azure.Identity" Version="1.6.0" />
-                        <PackageReference Update="Microsoft.Data.SqlClient" Version="5.1.4" />
-                      </ItemGroup>
-                    </Project>
-                """)
+                        <Project>
+                          <ItemGroup>
+                            <PackageReference Update="Azure.Identity" Version="1.6.0" />
+                            <PackageReference Update="Microsoft.Data.SqlClient" Version="5.1.4" />
+                          </ItemGroup>
+                        </Project>
+                    """)
             },
             // expected dependencies
             new Dependency[]
@@ -552,13 +621,13 @@ public class MSBuildHelperTests
                 new("Azure.Identity", "1.6.0", DependencyType.Unknown),
                 new("Microsoft.Data.SqlClient", "5.1.4", DependencyType.Unknown, IsUpdate: true)
             }
-        };
+        ];
     }
 
     public static IEnumerable<object[]> SolutionProjectPathTestData()
     {
-        yield return new object[]
-        {
+        yield return
+        [
             """
             Microsoft Visual Studio Solution File, Format Version 12.00
             # Visual Studio 14
@@ -592,7 +661,7 @@ public class MSBuildHelperTests
             {
                 "src/Some.Project/SomeProject.csproj",
                 "src/Some.Project.Test/Some.Project.Test.csproj",
-            },
-        };
+            }
+        ];
     }
 }