dependabot-nuget 0.321.3 → 0.322.1

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Analyze/AnalyzeWorkerTests.cs

@@ -53,7 +53,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                 CanUpdate = true,
                 VersionComesFromMultiDependencyProperty = false,
                 UpdatedDependencies = [
-                    new("Some.Package", "1.1.0", DependencyType.Unknown, TargetFrameworks: ["net8.0"]),
+                    new("Some.Package", "1.1.0", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect : true),
                 ],
             }
         );
@@ -104,70 +104,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                 CanUpdate = true,
                 VersionComesFromMultiDependencyProperty = false,
                 UpdatedDependencies = [
-                    new("Some.Package", "4.9.2", DependencyType.Unknown, TargetFrameworks: ["net8.0"]),
-                    new("Some.Transitive.Dependency", "4.9.2", DependencyType.Unknown, TargetFrameworks: ["net8.0"]),
-                ],
-            }
-        );
-    }
-
-    [Fact]
-    public async Task DeterminesMultiPropertyVersion()
-    {
-        var evaluationResult = new EvaluationResult(EvaluationResultType.Success, "$(SomePackageVersion)", "4.0.1", "SomePackageVersion", ErrorMessage: null);
-        await TestAnalyzeAsync(
-            packages:
-            [
-                MockNuGetPackage.CreateSimplePackage("Some.Package", "4.0.1", "net8.0", [(null, [("Some.Transitive.Dependency", "[4.0.1]")])]), // initially this
-                MockNuGetPackage.CreateSimplePackage("Some.Package", "4.9.2", "net8.0", [(null, [("Some.Transitive.Dependency", "[4.9.2]")])]), // should update to this
-                MockNuGetPackage.CreateSimplePackage("Some.Package", "4.9.3", "net8.0", [(null, [("Some.Transitive.Dependency", "[4.9.3]")])]), // will not update this far
-                MockNuGetPackage.CreateSimplePackage("Some.Transitive.Dependency", "4.0.1", "net8.0"),
-                MockNuGetPackage.CreateSimplePackage("Some.Transitive.Dependency", "4.9.2", "net8.0"),
-                MockNuGetPackage.CreateSimplePackage("Some.Transitive.Dependency", "4.9.3", "net8.0"),
-            ],
-            discovery: new()
-            {
-                Path = "/",
-                Projects = [
-                    new()
-                    {
-                        FilePath = "./project.csproj",
-                        TargetFrameworks = ["net8.0"],
-                        Dependencies = [
-                            new("Some.Transitive.Dependency", "4.0.1", DependencyType.PackageReference, EvaluationResult: evaluationResult, TargetFrameworks: ["net8.0"]),
-                        ],
-                        ReferencedProjectPaths = [],
-                        ImportedFiles = [],
-                        AdditionalFiles = [],
-                    },
-                    new()
-                    {
-                        FilePath = "./project2.csproj",
-                        TargetFrameworks = ["net8.0"],
-                        Dependencies = [
-                            new("Some.Package", "4.0.1", DependencyType.PackageReference, EvaluationResult: evaluationResult, TargetFrameworks: ["net8.0"]),
-                        ],
-                        ReferencedProjectPaths = [],
-                        ImportedFiles = [],
-                        AdditionalFiles = [],
-                    },
-                ],
-            },
-            dependencyInfo: new()
-            {
-                Name = "Some.Transitive.Dependency",
-                Version = "4.0.1",
-                IgnoredVersions = [Requirement.Parse("> 4.9.2")],
-                IsVulnerable = false,
-                Vulnerabilities = [],
-            },
-            expectedResult: new()
-            {
-                UpdatedVersion = "4.9.2",
-                CanUpdate = true,
-                VersionComesFromMultiDependencyProperty = true,
-                UpdatedDependencies = [
-                    new("Some.Package", "4.9.2", DependencyType.Unknown, TargetFrameworks: ["net8.0"]),
+                    new("Some.Package", "4.9.2", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
                     new("Some.Transitive.Dependency", "4.9.2", DependencyType.Unknown, TargetFrameworks: ["net8.0"]),
                 ],
             }
@@ -425,7 +362,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                 UpdatedVersion = "1.1.0",
                 CanUpdate = true,
                 UpdatedDependencies = [
-                    new("Some.Package", "1.1.0", DependencyType.Unknown, TargetFrameworks: ["net8.0"]),
+                    new("Some.Package", "1.1.0", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
                 ],
             }
         );
@@ -472,7 +409,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                 CanUpdate = true,
                 VersionComesFromMultiDependencyProperty = false,
                 UpdatedDependencies = [
-                    new("Some.Package", "1.1.0", DependencyType.Unknown, TargetFrameworks: ["net8.0"]),
+                    new("Some.Package", "1.1.0", DependencyType.PackageReference, TargetFrameworks :["net8.0"], IsDirect : true),
                 ],
             }
         );
@@ -527,7 +464,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                 CanUpdate = true,
                 VersionComesFromMultiDependencyProperty = false,
                 UpdatedDependencies = [
-                    new("Some.Package", "1.1.0", DependencyType.Unknown, TargetFrameworks: ["net8.0"]),
+                    new("Some.Package", "1.1.0", DependencyType.PackageReference, TargetFrameworks :["net8.0"], IsDirect : true),
                 ],
             }
         );
@@ -537,7 +474,6 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
     public async Task WindowsSpecificProjectAndWindowsSpecificDependency()
     {
         await TestAnalyzeAsync(
-            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
             packages: [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net6.0-windows7.0"),
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.1", "net6.0-windows7.0"),
@@ -753,7 +689,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                 VersionComesFromMultiDependencyProperty = false,
                 UpdatedDependencies =
                 [
-                    new("Some.Package", "1.2.3", DependencyType.Unknown, TargetFrameworks: ["net8.0"]),
+                    new("Some.Package", "1.2.3", DependencyType.PackageReference, TargetFrameworks :["net8.0"], IsDirect : true),
                 ],
             }
         );
@@ -925,7 +861,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                 VersionComesFromMultiDependencyProperty = false,
                 UpdatedDependencies =
                 [
-                    new("Some.Package", "1.2.3", DependencyType.Unknown, TargetFrameworks: ["net8.0"]),
+                    new("Some.Package", "1.2.3", DependencyType.PackageReference, TargetFrameworks :["net8.0"], IsDirect : true),
                 ],
             }
         );
@@ -1113,7 +1049,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
                 VersionComesFromMultiDependencyProperty = false,
                 UpdatedDependencies =
                 [
-                    new("Some.Package", "1.1.0", DependencyType.Unknown, TargetFrameworks: ["net8.0"]),
+                    new("Some.Package", "1.1.0", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true),
                 ],
             }
         );
@@ -1129,7 +1065,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
             UpdatedVersion = "",
             UpdatedDependencies = [],
         }, new TestLogger());
-        var discoveryContents = await File.ReadAllTextAsync(Path.Combine(temporaryDirectory.DirectoryPath, "Some.Dependency.json"));
+        var discoveryContents = await File.ReadAllTextAsync(Path.Combine(temporaryDirectory.DirectoryPath, "Some.Dependency.json"), TestContext.Current.CancellationToken);
 
         // raw result file should look like this:
         // {

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Clone/CloneWorkerTests.cs

@@ -242,12 +242,12 @@ public class CloneWorkerTests
         var actualApiMessages = testApiHandler.ReceivedMessages.ToArray();
         if (actualApiMessages.Length > expectedApiMessages.Length)
         {
-            var extraApiMessages = actualApiMessages.Skip(expectedApiMessages.Length).Select(m => RunWorkerTests.SerializeObjectAndType(m.Object)).ToArray();
+            var extraApiMessages = actualApiMessages.Skip(expectedApiMessages.Length).Select(m => EndToEndTests.SerializeObjectAndType(m.Object)).ToArray();
             Assert.Fail($"Expected {expectedApiMessages.Length} API messages, but got {extraApiMessages.Length} extra:\n\t{string.Join("\n\t", extraApiMessages)}");
         }
         if (expectedApiMessages.Length > actualApiMessages.Length)
         {
-            var missingApiMessages = expectedApiMessages.Skip(actualApiMessages.Length).Select(m => RunWorkerTests.SerializeObjectAndType(m)).ToArray();
+            var missingApiMessages = expectedApiMessages.Skip(actualApiMessages.Length).Select(m => EndToEndTests.SerializeObjectAndType(m)).ToArray();
             Assert.Fail($"Expected {expectedApiMessages.Length} API messages, but only got {actualApiMessages.Length}; missing:\n\t{string.Join("\n\t", missingApiMessages)}");
         }
     }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/DependencySolver/MSBuildDependencySolverTests.cs

@@ -614,7 +614,7 @@ public class MSBuildDependencySolverTests : TestBase
         await Update.UpdateWorkerTestBase.MockNuGetPackagesInDirectory(packages, tempDir.DirectoryPath);
         var repoContentsPath = new DirectoryInfo(tempDir.DirectoryPath);
         var projectPath = new FileInfo(Path.Combine(repoContentsPath.FullName, projectName));
-        var experimentsManager = new ExperimentsManager() { UseDirectDiscovery = true };
+        var experimentsManager = new ExperimentsManager();
         var logger = new TestLogger();
         var msbuildDepSolver = new MSBuildDependencySolver(repoContentsPath, projectPath, experimentsManager, logger);
 

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTestBase.cs

@@ -1,13 +1,9 @@
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
-using System.Runtime.InteropServices;
-using System.Text.Json;
 
 using NuGetUpdater.Core.Discover;
 using NuGetUpdater.Core.Test.Update;
-using NuGetUpdater.Core.Test.Updater;
 using NuGetUpdater.Core.Test.Utilities;
-using NuGetUpdater.Core.Updater;
 using NuGetUpdater.Core.Utilities;
 
 using Xunit;
@@ -98,31 +94,16 @@ public class DiscoveryWorkerTestBase : TestBase
             Assert.True(actualProject is not null, $"Unable to find project with path `{expectedProject.FilePath.NormalizePathToUnix()}` in collection [{string.Join(", ", actualProjects.Select(p => p.FilePath))}]");
             Assert.Equal(expectedProject.FilePath.NormalizePathToUnix(), actualProject.FilePath.NormalizePathToUnix());
 
-            // some properties are byproducts of the older temporary project discovery process and shouldn't be returned
             var actualProperties = actualProject.Properties;
-            if (!experimentsManager.UseDirectDiscovery)
-            {
-                var forbiddenProperties = new HashSet<string>(["TargetFrameworkVersion"], StringComparer.OrdinalIgnoreCase);
-                actualProperties = actualProperties.Where(p => !forbiddenProperties.Contains(p.Name)).ToImmutableArray();
-            }
-
             AssertEx.Equal(expectedProject.Properties, actualProperties, PropertyComparer.Instance);
             AssertEx.Equal(expectedProject.TargetFrameworks, actualProject.TargetFrameworks);
             AssertEx.Equal(expectedProject.ReferencedProjectPaths, actualProject.ReferencedProjectPaths);
             AssertEx.Equal(expectedProject.ImportedFiles, actualProject.ImportedFiles);
             AssertEx.Equal(expectedProject.AdditionalFiles, actualProject.AdditionalFiles);
 
-            // some dependencies are byproducts of the older temporary project discovery process and shouldn't be returned
-            var actualDependencies = actualProject.Dependencies;
-            if (!experimentsManager.UseDirectDiscovery)
-            {
-                var forbiddenDependencies = new HashSet<string>(["Microsoft.NET.Sdk"], StringComparer.OrdinalIgnoreCase);
-                actualDependencies = actualDependencies.Where(d => !forbiddenDependencies.Contains(d.Name)).ToImmutableArray();
-            }
-
             // some dependencies are byproducts of the test framework and shouldn't be returned to make the tests more deterministic
             var forbiddenTestDependencies = new HashSet<string>(["Microsoft.NETFramework.ReferenceAssemblies"], StringComparer.OrdinalIgnoreCase);
-            actualDependencies = actualDependencies.Where(d => !forbiddenTestDependencies.Contains(d.Name)).ToImmutableArray();
+            var actualDependencies = actualProject.Dependencies.Where(d => !forbiddenTestDependencies.Contains(d.Name)).ToImmutableArray();
 
             ValidateDependencies(expectedProject.Dependencies, actualDependencies);
             Assert.Equal(expectedProject.ExpectedDependencyCount ?? expectedProject.Dependencies.Length, actualDependencies.Length);

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.GlobalJson.cs

@@ -31,7 +31,6 @@ public partial class DiscoveryWorkerTests
                     {
                         FilePath = "global.json",
                         Dependencies = [
-                            new("Microsoft.NET.Sdk", "2.2.104", DependencyType.MSBuildSdk),
                             new("Microsoft.Build.Traversal", "1.0.45", DependencyType.MSBuildSdk),
                         ]
                     },
@@ -65,7 +64,6 @@ public partial class DiscoveryWorkerTests
                     {
                         FilePath = "global.json",
                         Dependencies = [
-                            new("Microsoft.NET.Sdk", "2.2.104", DependencyType.MSBuildSdk),
                             new("Microsoft.Build.Traversal", "1.0.45", DependencyType.MSBuildSdk),
                         ]
                     },

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.PackagesConfig.cs

@@ -7,10 +7,9 @@ public partial class DiscoveryWorkerTests
     public class PackagesConfig : DiscoveryWorkerTestBase
     {
         [Fact]
-        public async Task DiscoversDependencies_DirectDiscovery()
+        public async Task DiscoversDependencies()
         {
             await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Package.A", "1.0.0", "net46"),
@@ -63,66 +62,9 @@ public partial class DiscoveryWorkerTests
         }
 
         [Fact]
-        public async Task DiscoversDependencies_TemporaryProjectDiscovery()
+        public async Task DiscoveryIsMergedWithPackageReferences()
         {
             await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = false },
-                packages:
-                [
-                    MockNuGetPackage.CreateSimplePackage("Package.A", "1.0.0", "net46"),
-                    MockNuGetPackage.CreateSimplePackage("Package.B", "2.0.0", "net46"),
-                ],
-                workspacePath: "",
-                files: [
-                    ("packages.config", """
-                        <?xml version="1.0" encoding="utf-8"?>
-                        <packages>
-                          <package id="Package.A" version="1.0.0" targetFramework="net46" />
-                          <package id="Package.B" version="2.0.0" targetFramework="net46" />
-                        </packages>
-                        """),
-                    ("myproj.csproj", """
-                        <Project Sdk="Microsoft.NET.Sdk">
-                          <PropertyGroup>
-                            <TargetFramework>net46</TargetFramework>
-                          </PropertyGroup>
-                          <ItemGroup>
-                            <None Include="packages.config" />
-                          </ItemGroup>
-                        </Project>
-                        """)
-                ],
-                expectedResult: new()
-                {
-                    Path = "",
-                    Projects = [
-                        new()
-                        {
-                            FilePath = "myproj.csproj",
-                            Properties = [new("TargetFramework", "net46", "myproj.csproj")],
-                            TargetFrameworks = ["net46"],
-                            Dependencies = [
-                                new("Package.A", "1.0.0", DependencyType.PackagesConfig, TargetFrameworks: ["net46"]),
-                                new("Package.B", "2.0.0", DependencyType.PackagesConfig, TargetFrameworks: ["net46"]),
-                            ],
-                            ReferencedProjectPaths = [],
-                            ImportedFiles = [],
-                            AdditionalFiles = [
-                                "packages.config"
-                            ],
-                        }
-                    ],
-                }
-            );
-        }
-
-        [Theory]
-        [InlineData(true)]
-        [InlineData(false)]
-        public async Task DiscoveryIsMergedWithPackageReferences(bool useDirectDiscovery)
-        {
-            await TestDiscoveryAsync(
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery },
                 packages:
                 [
                     MockNuGetPackage.CreateSimplePackage("Package.A", "1.0.0", "net46"),
@@ -173,11 +115,10 @@ public partial class DiscoveryWorkerTests
         }
 
         [Fact]
-        public async Task DirectDiscoveryWorksEvenWithTargetsImportsOnlyProvidedByVisualStudio()
+        public async Task DiscoveryWorksEvenWithTargetsImportsOnlyProvidedByVisualStudio()
         {
             await TestDiscoveryAsync(
                 workspacePath: "project1/",
-                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
                 packages: [
                     MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net48"),
                 ],