dependabot-nuget 0.321.3 → 0.322.1

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/FileWriters/FileWriterWorkerTests_MiscellaneousTests.cs

@@ -106,4 +106,49 @@ public class FileWriterWorkerTests_MiscellaneousTests
         Assert.Equal("initial client content", await File.ReadAllTextAsync(Path.Join(repoContentsPath.FullName, "client/client.csproj"), TestContext.Current.CancellationToken));
         Assert.Equal("initial packages config content", await File.ReadAllTextAsync(Path.Join(repoContentsPath.FullName, "client/packages.config"), TestContext.Current.CancellationToken));
     }
+
+    [Fact]
+    public async Task TryPerformFileWrites_ReportsAppropriateUpdatedFilePaths_WhenStartingFromDifferentProjectDirectory()
+    {
+        // discovery was initiated from the "tests" directory, but we're now evaluating the "client" project for file writes
+        // arrange
+        using var tempDir = await TemporaryDirectory.CreateWithContentsAsync(
+            ("tests/tests.csproj", """
+                <Project>
+                  <ItemGroup>
+                    <PackageReference Include="Some.Package" Version="1.0.0" />
+                  </ItemGroup>
+                </Project>
+                """),
+            ("client/client.csproj", """
+                <Project>
+                  <ItemGroup>
+                    <PackageReference Include="Some.Package" Version="1.0.0" />
+                  </ItemGroup>
+                </Project>
+                """)
+        );
+        var logger = new TestLogger();
+        var fileWriter = new XmlFileWriter(logger);
+        var originalDiscoveryDirectory = new DirectoryInfo(Path.Join(tempDir.DirectoryPath, "tests"));
+        var projectDiscovery = new ProjectDiscoveryResult()
+        {
+            FilePath = "../client/client.csproj",
+            Dependencies = [new("Some.Package", "1.0.0", DependencyType.PackageReference)],
+            ImportedFiles = [],
+            AdditionalFiles = [],
+        };
+
+        // act
+        var updatedFilePaths = await FileWriterWorker.TryPerformFileWritesAsync(
+            fileWriter,
+            new DirectoryInfo(tempDir.DirectoryPath),
+            originalDiscoveryDirectory,
+            projectDiscovery,
+            [new("Some.Package", "1.0.1", DependencyType.PackageReference)]
+        );
+
+        // assert
+        AssertEx.Equal(["/client/client.csproj"], updatedFilePaths);
+    }
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/FileWriters/XmlFileWriterTests.cs

@@ -662,6 +662,40 @@ public class XmlFileWriterTests : FileWriterTestsBase
         );
     }
 
+    [Fact]
+    public async Task MultiDependency_SingleFile_UpdateOnePackage_PinAnotherPackage()
+    {
+        await TestAsync(
+            files: [
+                ("project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <ItemGroup>
+                        <PackageReference Include="Some.Dependency" Version="1.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """)
+            ],
+            initialProjectDependencyStrings: [
+                "Some.Dependency/1.0.0",
+                "Transitive.Dependency/3.0.0"
+            ],
+            requiredDependencyStrings: [
+                "Some.Dependency/2.0.0",
+                "Transitive.Dependency/4.0.0",
+            ],
+            expectedFiles: [
+                ("project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <ItemGroup>
+                        <PackageReference Include="Some.Dependency" Version="2.0.0" />
+                        <PackageReference Include="Transitive.Dependency" Version="4.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """)
+            ]
+        );
+    }
+
     [Fact]
     public async Task MultiDependency_SingleFile_SomeAlreadyUpToDate_FromXml()
     {
@@ -1591,4 +1625,81 @@ public class XmlFileWriterTests : FileWriterTestsBase
             ]
         );
     }
+
+    [Fact]
+    public async Task NoChangesForUnsupportedInitialFile()
+    {
+        // the extension `.xyproj` is not supported by the file writer; it is immediately rejected
+        await TestNoChangeAsync(
+            files: [
+                ("unsupported.xyproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="$(SomePackageVersion)" />
+                      </ItemGroup>
+                    </Project
+                    """),
+                ("versions.props", """
+                    <Project>
+                      <PropertyGroup>
+                        <SomePackageVersion>1.0.0</SomePackageVersion>
+                      </PropertyGroup>
+                    </Project>
+                    """)
+            ],
+            initialProjectDependencyStrings: ["Some.Package/1.0.0"],
+            requiredDependencyStrings: ["Some.Package/2.0.0"]
+        );
+    }
+
+    [Fact]
+    public async Task XmlDeclarationIsRetained()
+    {
+        await TestAsync(
+            files: [
+                ("project.csproj", """
+                    <?xml version="1.0" encoding="utf-8"?>
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <Import Project="versions.props" />
+                      <ItemGroup>
+                        <PackageReference Include="Ignored.Dependency" Version="7.0.0" />
+                        <PackageReference Include="Some.Dependency" Version="$(SomeDependencyVersion)" />
+                        <PackageReference Include="Some.Other.Dependency" Version="8.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """),
+                ("versions.props", """
+                    <?xml version="1.0" encoding="utf-8"?>
+                    <Project>
+                      <PropertyGroup>
+                        <SomeDependencyVersion>1.0.0</SomeDependencyVersion>
+                      </PropertyGroup>
+                    </Project>
+                    """)
+            ],
+            initialProjectDependencyStrings: ["Some.Dependency/1.0.0"],
+            requiredDependencyStrings: ["Some.Dependency/2.0.0"],
+            expectedFiles: [
+                ("project.csproj", """
+                    <?xml version="1.0" encoding="utf-8"?>
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <Import Project="versions.props" />
+                      <ItemGroup>
+                        <PackageReference Include="Ignored.Dependency" Version="7.0.0" />
+                        <PackageReference Include="Some.Dependency" Version="$(SomeDependencyVersion)" />
+                        <PackageReference Include="Some.Other.Dependency" Version="8.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """),
+                ("versions.props", """
+                    <?xml version="1.0" encoding="utf-8"?>
+                    <Project>
+                      <PropertyGroup>
+                        <SomeDependencyVersion>2.0.0</SomeDependencyVersion>
+                      </PropertyGroup>
+                    </Project>
+                    """)
+            ]
+        );
+    }
 }

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

@@ -11,164 +11,6 @@ namespace NuGetUpdater.Core.Test.Update;
 
 public class PackageReferenceUpdaterTests
 {
-    [Fact]
-    public async Task DirectBuildFileChangesAreMaintainedWhenPinningTransitiveDependency()
-    {
-        // arrange
-        using var tempDir = await TemporaryDirectory.CreateWithContentsAsync([("project.csproj", """
-            <Project Sdk="Microsoft.NET.Sdk">
-              <PropertyGroup>
-                <TargetFramework>net9.0</TargetFramework>
-              </PropertyGroup>
-              <ItemGroup>
-                <PackageReference Include="Completely.Different.Package" Version="1.0.0" />
-                <PackageReference Include="Some.Package" Version="1.0.0" />
-              </ItemGroup>
-            </Project>
-            """)]);
-        var packages = new[]
-        {
-            MockNuGetPackage.CreateSimplePackage("Completely.Different.Package", "1.0.0", "net9.0"),
-            MockNuGetPackage.CreateSimplePackage("Completely.Different.Package", "2.0.0", "net9.0"),
-            MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net9.0", [(null, [("Transitive.Package", "1.0.0")])]),
-            MockNuGetPackage.CreateSimplePackage("Transitive.Package", "1.0.0", "net9.0"),
-            MockNuGetPackage.CreateSimplePackage("Transitive.Package", "2.0.0", "net9.0"),
-        };
-        await UpdateWorkerTestBase.MockNuGetPackagesInDirectory(packages, tempDir.DirectoryPath);
-        var fullProjectPath = Path.Combine(tempDir.DirectoryPath, "project.csproj");
-        var buildFile = ProjectBuildFile.Open(tempDir.DirectoryPath, fullProjectPath);
-        var experimentsManager = new ExperimentsManager();
-
-        // act
-        // pin transitive dependency
-        var updatedFiles = await PackageReferenceUpdater.UpdateTransitiveDependencyAsync(
-            tempDir.DirectoryPath,
-            fullProjectPath,
-            "Transitive.Package",
-            "2.0.0",
-            [buildFile],
-            experimentsManager,
-            new TestLogger());
-
-        // subsequent update should not overwrite previous change
-        PackageReferenceUpdater.TryUpdateDependencyVersion([buildFile], "Completely.Different.Package", "1.0.0", "2.0.0", new TestLogger());
-
-        // assert
-        await buildFile.SaveAsync();
-        var actualContents = await File.ReadAllTextAsync(fullProjectPath, TestContext.Current.CancellationToken);
-        var expectedContents = """
-            <Project Sdk="Microsoft.NET.Sdk">
-              <PropertyGroup>
-                <TargetFramework>net9.0</TargetFramework>
-              </PropertyGroup>
-              <ItemGroup>
-                <PackageReference Include="Completely.Different.Package" Version="2.0.0" />
-                <PackageReference Include="Some.Package" Version="1.0.0" />
-                <PackageReference Include="Transitive.Package" Version="2.0.0" />
-              </ItemGroup>
-            </Project>
-            """;
-        Assert.Equal(expectedContents, actualContents);
-    }
-
-    [Fact]
-    public async Task DirectBuildFileChangesAreMaintainedWhenPinningTransitiveDependency_DirectoryPackagesPropsIsDiscovered()
-    {
-        // arrange
-        using var tempDir = await TemporaryDirectory.CreateWithContentsAsync(
-        [
-            ("project.csproj", """
-                 <Project Sdk="Microsoft.NET.Sdk">
-                   <PropertyGroup>
-                     <TargetFramework>net9.0</TargetFramework>
-                   </PropertyGroup>
-                   <ItemGroup>
-                     <PackageReference Include="Completely.Different.Package" />
-                     <PackageReference Include="Some.Package" />
-                   </ItemGroup>
-                 </Project>
-                 """),
-            ("Directory.Packages.props", """
-                <Project>
-                  <PropertyGroup>
-                    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-                  </PropertyGroup>
-                  <ItemGroup>
-                    <PackageVersion Include="Completely.Different.Package" Version="1.0.0" />
-                    <PackageVersion Include="Some.Package" Version="1.0.0" />
-                  </ItemGroup>
-                </Project>
-                """)
-        ]);
-        var packages = new[]
-        {
-             MockNuGetPackage.CreateSimplePackage("Completely.Different.Package", "1.0.0", "net9.0"),
-             MockNuGetPackage.CreateSimplePackage("Completely.Different.Package", "2.0.0", "net9.0"),
-             MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net9.0", [(null, [("Transitive.Package", "1.0.0")])]),
-             MockNuGetPackage.CreateSimplePackage("Transitive.Package", "1.0.0", "net9.0"),
-             MockNuGetPackage.CreateSimplePackage("Transitive.Package", "2.0.0", "net9.0"),
-         };
-        await UpdateWorkerTestBase.MockNuGetPackagesInDirectory(packages, tempDir.DirectoryPath);
-        var fullProjectPath = Path.Combine(tempDir.DirectoryPath, "project.csproj");
-        var fullDirectoryPackagesPath = Path.Combine(tempDir.DirectoryPath, "Directory.Packages.props");
-        var buildFiles = new[]
-        {
-            ProjectBuildFile.Open(tempDir.DirectoryPath, fullProjectPath),
-            ProjectBuildFile.Open(tempDir.DirectoryPath, fullDirectoryPackagesPath)
-        }.ToImmutableArray();
-        var experimentsManager = new ExperimentsManager();
-
-        // act
-        // pin transitive dependency
-        var updatedFiles = await PackageReferenceUpdater.UpdateTransitiveDependencyAsync(
-            tempDir.DirectoryPath,
-            fullProjectPath,
-            "Transitive.Package",
-            "2.0.0",
-            buildFiles,
-            experimentsManager,
-            new TestLogger());
-
-        // subsequent update should not overwrite previous change
-        PackageReferenceUpdater.TryUpdateDependencyVersion(buildFiles, "Completely.Different.Package", "1.0.0", "2.0.0", new TestLogger());
-
-        // assert
-        foreach (var bf in buildFiles)
-        {
-            await bf.SaveAsync();
-        }
-
-        var actualProjectContents = await File.ReadAllTextAsync(fullProjectPath, TestContext.Current.CancellationToken);
-        var expectedProjectContents = """
-             <Project Sdk="Microsoft.NET.Sdk">
-               <PropertyGroup>
-                 <TargetFramework>net9.0</TargetFramework>
-               </PropertyGroup>
-               <ItemGroup>
-                 <PackageReference Include="Completely.Different.Package" />
-                 <PackageReference Include="Some.Package" />
-                 <PackageReference Include="Transitive.Package" />
-               </ItemGroup>
-             </Project>
-             """;
-        Assert.Equal(expectedProjectContents.Replace("\r", ""), actualProjectContents.Replace("\r", ""));
-
-        var actualDirectoryPackagesContents = await File.ReadAllTextAsync(fullDirectoryPackagesPath, TestContext.Current.CancellationToken);
-        var expectedDirectoryPackagesContents = """
-            <Project>
-              <PropertyGroup>
-                <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-              </PropertyGroup>
-              <ItemGroup>
-                <PackageVersion Include="Completely.Different.Package" Version="2.0.0" />
-                <PackageVersion Include="Some.Package" Version="1.0.0" />
-                <PackageVersion Include="Transitive.Package" Version="2.0.0" />
-              </ItemGroup>
-            </Project>
-            """;
-        Assert.Equal(expectedDirectoryPackagesContents.Replace("\r", ""), actualDirectoryPackagesContents.Replace("\r", ""));
-    }
-
     [Theory]
     [MemberData(nameof(ComputeUpdateOperationsTestData))]
     public async Task ComputeUpdateOperations
@@ -182,7 +24,7 @@ public class PackageReferenceUpdaterTests
         // arrange
         using var repoRoot = await TemporaryDirectory.CreateWithContentsAsync(("project.csproj", "<Project Sdk=\"Microsoft.NET.Sdk\" />"));
         var projectPath = Path.Combine(repoRoot.DirectoryPath, "project.csproj");
-        var experimentsManager = new ExperimentsManager() { UseDirectDiscovery = true };
+        var experimentsManager = new ExperimentsManager();
         await UpdateWorkerTestBase.MockNuGetPackagesInDirectory([
             MockNuGetPackage.CreateSimplePackage("Parent.Package", "1.0.0", "net9.0", [(null, [("Transitive.Package", "1.0.0")])]),
             MockNuGetPackage.CreateSimplePackage("Parent.Package", "2.0.0", "net9.0", [(null, [("Transitive.Package", "2.0.0")])]),