dependabot-nuget 0.288.0 → 0.290.0

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

@@ -287,5 +287,89 @@ public partial class UpdateWorkerTests
                 ]
             );
         }
+
+        [Fact]
+        public async Task UpdateSingleDependencyWithTrailingComma()
+        {
+            await TestUpdateForProject("Some.DotNet.Tool", "1.0.0", "1.1.0",
+                packages:
+                [
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "13.0.3", "net8.0"),
+                    MockNuGetPackage.CreateDotNetToolPackage("Some.DotNet.Tool", "1.0.0", "net8.0"),
+                    MockNuGetPackage.CreateDotNetToolPackage("Some.DotNet.Tool", "1.1.0", "net8.0"),
+                ],
+                // initial
+                projectContents: """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                      </PropertyGroup>
+                
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="13.0.3" />
+                      </ItemGroup>
+                    </Project>
+                    """,
+                additionalFiles:
+                [
+                    (".config/dotnet-tools.json", """
+                        {
+                          "version": 1,
+                          "isRoot": true,
+                          "tools": {
+                            "some.dotnet.tool": {
+                              "version": "1.0.0",
+                              "commands": [
+                                "some.dotnet.tool"
+                              ],
+                            },
+                            "some-other-tool": {
+                              "version": "2.1.3",
+                              "commands": [
+                                "some-other-tool"
+                              ],
+                            }
+                          }
+                        }
+                        """)
+                ],
+                // expected
+                expectedProjectContents: """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                      </PropertyGroup>
+                
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="13.0.3" />
+                      </ItemGroup>
+                    </Project>
+                    """,
+                // expected files no longer have trailing commas in the json
+                additionalFilesExpected:
+                [
+                    (".config/dotnet-tools.json", """
+                        {
+                          "version": 1,
+                          "isRoot": true,
+                          "tools": {
+                            "some.dotnet.tool": {
+                              "version": "1.1.0",
+                              "commands": [
+                                "some.dotnet.tool"
+                              ]
+                            },
+                            "some-other-tool": {
+                              "version": "2.1.3",
+                              "commands": [
+                                "some-other-tool"
+                              ]
+                            }
+                          }
+                        }
+                        """)
+                ]
+            );
+        }
     }
 }

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

@@ -226,5 +226,71 @@ public partial class UpdateWorkerTests
                 ]
             );
         }
+
+        [Fact]
+        public async Task UpdateDependencyWithTrailingComma()
+        {
+            await TestUpdateForProject("Some.MSBuild.Sdk", "3.2.0", "4.1.0",
+                packages:
+                [
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "13.0.3", "net8.0"),
+                    MockNuGetPackage.CreateMSBuildSdkPackage("Some.MSBuild.Sdk", "3.2.0"),
+                    MockNuGetPackage.CreateMSBuildSdkPackage("Some.MSBuild.Sdk", "4.1.0"),
+                ],
+                // initial
+                projectContents: """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                      </PropertyGroup>
+                
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="13.0.3" />
+                      </ItemGroup>
+                    </Project>
+                    """,
+                additionalFiles:
+                [
+                    ("global.json", """
+                        {
+                          "sdk": {
+                            "version": "6.0.405",
+                            "rollForward": "latestPatch"
+                          },
+                          "msbuild-sdks": {
+                            "Some.MSBuild.Sdk": "3.2.0"
+                          },
+                        }
+                        """)
+                ],
+                // expected
+                expectedProjectContents: """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                      </PropertyGroup>
+                
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="13.0.3" />
+                      </ItemGroup>
+                    </Project>
+                    """,
+                // expected file no longer has the trailing comma because the parser removes it.
+                additionalFilesExpected:
+                [
+                    ("global.json", """
+                        {
+                          "sdk": {
+                            "version": "6.0.405",
+                            "rollForward": "latestPatch"
+                          },
+                          "msbuild-sdks": {
+                            "Some.MSBuild.Sdk": "4.1.0"
+                          }
+                        }
+                        """)
+                ]
+            );
+        }
     }
 }

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

@@ -158,6 +158,61 @@ public partial class UpdateWorkerTests
             );
         }
 
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task PackageIsUpdatedFromCommonTargetsFile(bool useDirectDiscovery)
+        {
+            await TestUpdateForProject("Some.Package", "1.0.0", "2.0.0",
+                packages:
+                [
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net8.0"),
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "2.0.0", "net8.0"),
+                ],
+                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery },
+                projectContents: """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                      </PropertyGroup>
+                      <Import Project="CommonPackages.targets" />
+                    </Project>
+                    """,
+                additionalFiles:
+                [
+                    ("CommonPackages.targets", """
+                        <Project>
+                          <ItemGroup>
+                            <PackageReference Include="Some.Package">
+                              <Version>1.0.0</Version>
+                            </PackageReference>
+                          </ItemGroup>
+                        </Project>
+                        """)
+                ],
+                expectedProjectContents: """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                      </PropertyGroup>
+                      <Import Project="CommonPackages.targets" />
+                    </Project>
+                    """,
+                additionalFilesExpected:
+                [
+                    ("CommonPackages.targets", """
+                        <Project>
+                          <ItemGroup>
+                            <PackageReference Include="Some.Package">
+                              <Version>2.0.0</Version>
+                            </PackageReference>
+                          </ItemGroup>
+                        </Project>
+                        """)
+                ]
+            );
+        }
+
         [Fact]
         public async Task CallingResolveDependencyConflictsNew()
         {
@@ -3109,6 +3164,46 @@ public partial class UpdateWorkerTests
             );
         }
 
+        [Fact]
+        public async Task NoChange_IfPeerDependenciesCannotBeEvaluated()
+        {
+            // make sure we don't throw if we find conflicting peer dependencies; this can happen in multi-tfm projects if the dependencies are too complicated to resolve
+            // eventually this should be able to be resolved, but currently we can't branch on the different packages for different TFMs
+            await TestNoChangeforProject("Some.Package", "1.0.0", "1.1.0",
+                packages:
+                [
+                    // initial packages
+                    new MockNuGetPackage("Some.Package", "1.0.0",
+                        DependencyGroups: [
+                            ("net8.0", [("Transitive.Dependency", "8.0.0")]),
+                            ("net9.0", [("Transitive.Dependency", "9.0.0")])
+                        ]),
+                    MockNuGetPackage.CreateSimplePackage("Transitive.Dependency", "8.0.0", "net8.0"),
+                    MockNuGetPackage.CreateSimplePackage("Transitive.Dependency", "9.0.0", "net9.0"),
+
+                    // what we're trying to update to, but will fail
+                    new MockNuGetPackage("Some.Package", "1.1.0",
+                        DependencyGroups: [
+                            ("net8.0", [("Transitive.Dependency", "8.1.0")]),
+                            ("net9.0", [("Transitive.Dependency", "9.1.0")])
+                        ]),
+                    MockNuGetPackage.CreateSimplePackage("Transitive.Dependency", "8.1.0", "net8.0"),
+                    MockNuGetPackage.CreateSimplePackage("Transitive.Dependency", "9.1.0", "net9.0"),
+                ],
+                projectContents: """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="1.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """,
+                expectedResult: new() // success
+            );
+        }
+
         [Fact]
         public async Task ProcessingProjectWithWorkloadReferencesDoesNotFail()
         {

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

@@ -2160,12 +2160,6 @@ public partial class UpdateWorkerTests
                 };
             }
             using var cache = new TemporaryDirectory();
-            using var env = new TemporaryEnvironment([
-                ("NUGET_PACKAGES", Path.Join(cache.DirectoryPath, "NUGET_PACKAGES")),
-                ("NUGET_HTTP_CACHE_PATH", Path.Join(cache.DirectoryPath, "NUGET_HTTP_CACHE_PATH")),
-                ("NUGET_SCRATCH", Path.Join(cache.DirectoryPath, "NUGET_SCRATCH")),
-                ("NUGET_PLUGINS_CACHE_PATH", Path.Join(cache.DirectoryPath, "NUGET_PLUGINS_CACHE_PATH")),
-            ]);
             using var http = TestHttpServer.CreateTestServer(TestHttpHandler);
             await TestUpdateForProject("Some.Package", "1.0.0", "2.0.0",
                 // existing
@@ -2294,7 +2288,7 @@ public partial class UpdateWorkerTests
             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());
+            Assert.Equal(Path.Combine(temporaryDirectory.DirectoryPath, "this.file.does.not.exist.targets"), result.ErrorDetails!.ToString());
         }
 
         [Fact]

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

@@ -97,7 +97,7 @@ public static class AssertEx
             return;
         }
 
-        Assert.True(false, GetAssertMessage(expected, actual, comparer, message));
+        Assert.Fail(GetAssertMessage(expected, actual, comparer, message));
     }
 
     private static bool SequenceEqual<T>(

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

@@ -0,0 +1,12 @@
+using Xunit;
+
+public class LinuxOnlyFactAttribute : FactAttribute
+{
+    public LinuxOnlyFactAttribute()
+    {
+        if (!OperatingSystem.IsLinux())
+        {
+            Skip = "This test runs only on Linux.";
+        }
+    }
+}