dependabot-nuget 0.322.0 → 0.322.1

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

@@ -11,28 +11,23 @@ namespace NuGetUpdater.Core.Test.Discover;
 public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
 {
     [Theory]
-    [InlineData("src/project.csproj", true)]
-    [InlineData("src/project.csproj", false)]
-    [InlineData("src/project.vbproj", true)]
-    [InlineData("src/project.vbproj", false)]
-    [InlineData("src/project.fsproj", true)]
-    [InlineData("src/project.fsproj", false)]
-    public async Task TestProjectFiles(string projectPath, bool useDirectDiscovery)
+    [InlineData("src/project.csproj")]
+    [InlineData("src/project.vbproj")]
+    [InlineData("src/project.fsproj")]
+    public async Task TestProjectFiles(string projectPath)
     {
         var expectedDependencies = new List<Dependency>()
         {
             new Dependency("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true)
         };
-        if (useDirectDiscovery && Path.GetExtension(projectPath)! == ".fsproj")
+        if (Path.GetExtension(projectPath)! == ".fsproj")
         {
             // this package ships with the SDK and is automatically added for F# projects but should be manually added here to make the test consistent
             // only direct package discovery finds this, though
             expectedDependencies.Add(new Dependency("FSharp.Core", MockNuGetPackage.FSharpCorePackageVersion.Value, DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true));
         }
 
-        var experimentsManager = new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery };
         await TestDiscoveryAsync(
-            experimentsManager: experimentsManager,
             packages:
             [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
@@ -75,14 +70,10 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
         );
     }
 
-    [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public async Task FindDependenciesFromSDKProjectsWithDesktopTFM(bool useDirectDiscovery)
+    [Fact]
+    public async Task FindDependenciesFromSDKProjectsWithDesktopTFM()
     {
-        var experimentsManager = new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery };
         await TestDiscoveryAsync(
-            experimentsManager: experimentsManager,
             packages:
             [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "1.2.3", "net472"),
@@ -124,14 +115,10 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
         );
     }
 
-    [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public async Task TestDependencyWithTrailingSpacesInAttribute(bool useDirectDiscovery)
+    [Fact]
+    public async Task TestDependencyWithTrailingSpacesInAttribute()
     {
-        var experimentsManager = new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery };
         await TestDiscoveryAsync(
-            experimentsManager: experimentsManager,
             packages:
             [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
@@ -185,7 +172,6 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
                 MockNuGetPackage.CreateSimplePackage("Some.Package2", "9.0.1", "net8.0"),
             ],
-            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
             workspacePath: "src",
             files: new[]
             {
@@ -235,7 +221,6 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
             [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
             ],
-            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
             workspacePath: "src",
             files: new[]
             {
@@ -339,7 +324,6 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
                 MockNuGetPackage.CreateSimplePackage("Some.Package2", "9.0.1", "net8.0"),
             ],
-            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
             workspacePath: "src",
             files: new[]
             {
@@ -386,9 +370,7 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
     [InlineData(false)]
     public async Task TestPackageConfig(bool useDirectDiscovery)
     {
-        var experimentsManager = new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery };
         await TestDiscoveryAsync(
-            experimentsManager: experimentsManager,
             packages:
             [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "7.0.1", "net45"),
@@ -447,70 +429,6 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
     public async Task TestProps_DirectDiscovery()
     {
         await TestDiscoveryAsync(
-            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
-            packages:
-            [
-                MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
-            ],
-            workspacePath: "src",
-            files: new[]
-            {
-                ("src/project.csproj", """
-                    <Project Sdk="Microsoft.NET.Sdk">
-                      <PropertyGroup>
-                        <TargetFramework>net8.0</TargetFramework>
-                      </PropertyGroup>
-
-                      <ItemGroup>
-                        <PackageReference Include="Some.Package" />
-                      </ItemGroup>
-                    </Project>
-                    """),
-                ("Directory.Build.props", "<Project />"),
-                ("Directory.Packages.props", """
-                    <Project>
-                      <PropertyGroup>
-                        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-                        <SomePackageVersion>9.0.1</SomePackageVersion>
-                      </PropertyGroup>
-
-                      <ItemGroup>
-                        <PackageVersion Include="Some.Package" Version="$(SomePackageVersion)" />
-                      </ItemGroup>
-                    </Project>
-                    """)
-            },
-            expectedResult: new()
-            {
-                Path = "src",
-                Projects = [
-                    new()
-                    {
-                        FilePath = "project.csproj",
-                        TargetFrameworks = ["net8.0"],
-                        Dependencies = [
-                            new("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true)
-                        ],
-                        Properties = [
-                            new("TargetFramework", "net8.0", "src/project.csproj")
-                        ],
-                        ReferencedProjectPaths = [],
-                        ImportedFiles = [
-                            "../Directory.Build.props",
-                            "../Directory.Packages.props",
-                        ],
-                        AdditionalFiles = [],
-                    }
-                ],
-            }
-        );
-    }
-
-    [Fact]
-    public async Task TestProps_NoDirectDiscovery()
-    {
-        await TestDiscoveryAsync(
-            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = false },
             packages:
             [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
@@ -555,8 +473,6 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
                             new("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net8.0"], IsDirect: true)
                         ],
                         Properties = [
-                            new("ManagePackageVersionsCentrally", "true", "Directory.Packages.props"),
-                            new("SomePackageVersion", "9.0.1", "Directory.Packages.props"),
                             new("TargetFramework", "net8.0", "src/project.csproj")
                         ],
                         ReferencedProjectPaths = [],
@@ -572,11 +488,10 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
     }
 
     [Fact]
-    public async Task TestRepo_DirectDiscovery()
+    public async Task TestRepo()
     {
         var solutionPath = "solution.sln";
         await TestDiscoveryAsync(
-            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
             packages:
             [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net7.0"),
@@ -711,7 +626,6 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
     {
         var solutionPath = "solution.slnx";
         await TestDiscoveryAsync(
-            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
             packages:
             [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net7.0"),
@@ -768,7 +682,7 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
         await TestDiscoveryAsync(
             packages:
             [
-                MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
+                MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net7.0"),
             ],
             workspacePath: "",
             files: new[]
@@ -833,8 +747,6 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
                             new("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net7.0", "net8.0"], IsDirect: true)
                         ],
                         Properties = [
-                            new("ManagePackageVersionsCentrally", "true", "Directory.Packages.props"),
-                            new("SomePackageVersion", "9.0.1", "Directory.Packages.props"),
                             new("TargetFrameworks", "net7.0;net8.0", "src/project.csproj"),
                         ],
                         ReferencedProjectPaths = [],
@@ -856,7 +768,7 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
         await TestDiscoveryAsync(
             packages:
             [
-                MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net8.0"),
+                MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net7.0"),
             ],
             workspacePath: "",
             files: new[]
@@ -906,8 +818,6 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
                             new("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net7.0", "net8.0"], IsDirect: true)
                         ],
                         Properties = [
-                            new("ManagePackageVersionsCentrally", "true", "Directory.Packages.props"),
-                            new("SomePackageVersion", "9.0.1", "Directory.Packages.props"),
                             new("TargetFrameworks", "net7.0;net8.0", "src/project.csproj"),
                         ],
                         ReferencedProjectPaths = [],
@@ -923,150 +833,9 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
     }
 
     [Fact]
-    public async Task TestRepo_NoDirectDiscovery()
-    {
-        var solutionPath = "solution.sln";
-        await TestDiscoveryAsync(
-            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = false },
-            packages:
-            [
-                MockNuGetPackage.CreateSimplePackage("Some.Package", "9.0.1", "net7.0"),
-            ],
-            workspacePath: "",
-            files: new[]
-            {
-                ("src/project.csproj", """
-                    <Project Sdk="Microsoft.NET.Sdk">
-                      <PropertyGroup>
-                        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
-                      </PropertyGroup>
-
-                      <ItemGroup>
-                        <PackageReference Include="Some.Package" />
-                      </ItemGroup>
-                    </Project>
-                    """),
-                ("Directory.Build.props", "<Project />"),
-                ("Directory.Packages.props", """
-                    <Project>
-                      <PropertyGroup>
-                        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-                        <SomePackageVersion>9.0.1</SomePackageVersion>
-                      </PropertyGroup>
-
-                      <ItemGroup>
-                        <PackageVersion Include="Some.Package" Version="$(SomePackageVersion)" />
-                      </ItemGroup>
-                    </Project>
-                    """),
-                (solutionPath, """
-                    Microsoft Visual Studio Solution File, Format Version 12.00
-                    # Visual Studio 14
-                    VisualStudioVersion = 14.0.22705.0
-                    MinimumVisualStudioVersion = 10.0.40219.1
-                    Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "project", ".\src\project.csproj", "{782E0C0A-10D3-444D-9640-263D03D2B20C}"
-                    EndProject
-                    Global
-                      GlobalSection(SolutionConfigurationPlatforms) = preSolution
-                        Debug|Any CPU = Debug|Any CPU
-                        Release|Any CPU = Release|Any CPU
-                      EndGlobalSection
-                      GlobalSection(ProjectConfigurationPlatforms) = postSolution
-                        {782E0C0A-10D3-444D-9640-263D03D2B20C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                        {782E0C0A-10D3-444D-9640-263D03D2B20C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                        {782E0C0A-10D3-444D-9640-263D03D2B20C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                        {782E0C0A-10D3-444D-9640-263D03D2B20C}.Release|Any CPU.Build.0 = Release|Any CPU
-                      EndGlobalSection
-                      GlobalSection(SolutionProperties) = preSolution
-                        HideSolutionNode = FALSE
-                      EndGlobalSection
-                    EndGlobal
-                    """),
-                ("global.json", """
-                    {
-                      "sdk": {
-                        "version": "6.0.405",
-                        "rollForward": "latestPatch"
-                      },
-                      "msbuild-sdks": {
-                        "My.Custom.Sdk": "5.0.0",
-                        "My.Other.Sdk": "1.0.0-beta"
-                      }
-                    }
-                    """),
-                (".config/dotnet-tools.json", """
-                    {
-                      "version": 1,
-                      "isRoot": true,
-                      "tools": {
-                        "microsoft.botsay": {
-                          "version": "1.0.0",
-                          "commands": [
-                            "botsay"
-                          ]
-                        },
-                        "dotnetsay": {
-                          "version": "2.1.3",
-                          "commands": [
-                            "dotnetsay"
-                          ]
-                        }
-                      }
-                    }
-                    """),
-            },
-            expectedResult: new()
-            {
-                Path = "",
-                Projects = [
-                    new()
-                    {
-                        FilePath = "src/project.csproj",
-                        TargetFrameworks = ["net7.0", "net8.0"],
-                        Dependencies = [
-                            new("Some.Package", "9.0.1", DependencyType.PackageReference, TargetFrameworks: ["net7.0", "net8.0"], IsDirect: true),
-                        ],
-                        Properties = [
-                            new("ManagePackageVersionsCentrally", "true", "Directory.Packages.props"),
-                            new("SomePackageVersion", "9.0.1", "Directory.Packages.props"),
-                            new("TargetFrameworks", "net7.0;net8.0", "src/project.csproj")
-                        ],
-                        ReferencedProjectPaths = [],
-                        ImportedFiles = [
-                            "../Directory.Build.props",
-                            "../Directory.Packages.props",
-                        ],
-                        AdditionalFiles = [],
-                    }
-                ],
-                GlobalJson = new()
-                {
-                    FilePath = "global.json",
-                    Dependencies = [
-                        new("My.Custom.Sdk", "5.0.0", DependencyType.MSBuildSdk),
-                        new("My.Other.Sdk", "1.0.0-beta", DependencyType.MSBuildSdk),
-                    ]
-                },
-                DotNetToolsJson = new()
-                {
-                    FilePath = ".config/dotnet-tools.json",
-                    Dependencies = [
-                        new("microsoft.botsay", "1.0.0", DependencyType.DotNetTool),
-                        new("dotnetsay", "2.1.3", DependencyType.DotNetTool),
-                    ]
-                }
-            }
-        );
-    }
-
-    [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public async Task NonSupportedProjectExtensionsAreSkipped(bool useDirectDiscovery)
+    public async Task NonSupportedProjectExtensionsAreSkipped()
     {
-        var experimentsManager = new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery };
         await TestDiscoveryAsync(
-            experimentsManager: experimentsManager,
             packages:
             [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net8.0"),
@@ -1146,14 +915,10 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
         );
     }
 
-    [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public async Task DiscoveryReportsDependencyFileNotParseable(bool useDirectDiscovery)
+    [Fact]
+    public async Task DiscoveryReportsDependencyFileNotParseable()
     {
-        var experimentsManager = new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery };
         await TestDiscoveryAsync(
-            experimentsManager: experimentsManager,
             workspacePath: "",
             files:
             [
@@ -1197,7 +962,7 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
             Path = "/",
             Projects = [],
         });
-        var discoveryContents = await File.ReadAllTextAsync(discoveryResultPath);
+        var discoveryContents = await File.ReadAllTextAsync(discoveryResultPath, TestContext.Current.CancellationToken);
 
         // raw result file should look like this:
         // {
@@ -1220,10 +985,8 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
         Assert.Equal("(<some package feed>)", errorSource.GetString());
     }
 
-    [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public async Task ReportsPrivateSourceAuthenticationFailure(bool useDirectDiscovery)
+    [Fact]
+    public async Task ReportsPrivateSourceAuthenticationFailure()
     {
         static (int, string) TestHttpHandler(string uriString)
         {
@@ -1265,9 +1028,7 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
             ("NUGET_PLUGINS_CACHE_PATH", Path.Combine(tempDir.DirectoryPath, "NUGET_PLUGINS_CACHE_PATH")),
         ]);
         using var http = TestHttpServer.CreateTestStringServer(TestHttpHandler);
-        var experimentsManager = new ExperimentsManager() { UseDirectDiscovery = useDirectDiscovery };
         await TestDiscoveryAsync(
-            experimentsManager: experimentsManager,
             workspacePath: "",
             files:
             [
@@ -1342,9 +1103,7 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
             ("NUGET_PLUGINS_CACHE_PATH", Path.Combine(tempDir.DirectoryPath, "NUGET_PLUGINS_CACHE_PATH")),
         ]);
         using var http = TestHttpServer.CreateTestStringServer(TestHttpHandler);
-        var experimentsManager = new ExperimentsManager() { UseDirectDiscovery = true };
         await TestDiscoveryAsync(
-            experimentsManager: experimentsManager,
             workspacePath: "",
             files:
             [
@@ -1419,9 +1178,7 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
             ("NUGET_PLUGINS_CACHE_PATH", Path.Combine(tempDir.DirectoryPath, "NUGET_PLUGINS_CACHE_PATH")),
         ]);
         using var http = TestHttpServer.CreateTestStringServer(TestHttpHandler);
-        var experimentsManager = new ExperimentsManager() { UseDirectDiscovery = true };
         await TestDiscoveryAsync(
-            experimentsManager: experimentsManager,
             workspacePath: "",
             files:
             [
@@ -1459,7 +1216,7 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
         // this test mimics a package feed that doesn't have the common Microsoft.Windows.App.Ref package; common in Azure DevOps
         // Windows machines always have the package, so this test only makes sense on Linux
         await TestDiscoveryAsync(
-            experimentsManager: new ExperimentsManager() { InstallDotnetSdks = true, UseDirectDiscovery = true },
+            experimentsManager: new ExperimentsManager() { InstallDotnetSdks = true },
             includeCommonPackages: false,
             packages: [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "1.2.3", "net8.0"),
@@ -1507,7 +1264,6 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
             packages: [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "1.2.3", "net8.0", [(null, [("Transitive.Dependency.Does.Not.Exist", "4.5.6")])]),
             ],
-            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
             workspacePath: "",
             files: [
                 ("project.csproj", """
@@ -1538,7 +1294,6 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "1.2.3", "net8.0", [(null, [("Transitive.Dependency", "4.5.6")])]),
                 MockNuGetPackage.CreateSimplePackage("Transitive.Dependency", "0.1.2", "net8.0"),
             ],
-            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
             workspacePath: "",
             files: [
                 ("project.csproj", """
@@ -1566,7 +1321,7 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
     {
         await TestDiscoveryAsync(
             packages: [],
-            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true, InstallDotnetSdks = true },
+            experimentsManager: new ExperimentsManager() { InstallDotnetSdks = true },
             workspacePath: "",
             files: [
                 ("project.csproj", """
@@ -1597,7 +1352,6 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
             packages: [
                 MockNuGetPackage.CreateSimplePackage("Some.Package", "1.2.3", "net8.0"),
             ],
-            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
             workspacePath: "",
             files: [
                 ("project.csproj", """
@@ -1653,7 +1407,6 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
         using var http2 = TestHttpServer.CreateTestNuGetFeed(MockNuGetPackage.CreateSimplePackage("Package2", "2.0.0", "net9.0"));
         await TestDiscoveryAsync(
             packages: [],
-            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
             workspacePath: "/src",
             files: [
                 ("src/NuGet.Config", $"""

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

@@ -637,8 +637,8 @@ public class SdkProjectDiscoveryTests : DiscoveryWorkerTestBase
 
         var logger = new TestLogger();
         var fullProjectPath = Path.Combine(testDirectory.DirectoryPath, projectPath);
-        var experimentsManager = new ExperimentsManager() { UseDirectDiscovery = true }; // the following method is direct discovery; this just makes the call to Validate... happy
-        var projectDiscovery = await SdkProjectDiscovery.DiscoverWithBinLogAsync(testDirectory.DirectoryPath, Path.GetDirectoryName(fullProjectPath)!, fullProjectPath, experimentsManager, logger);
+        var experimentsManager = new ExperimentsManager();
+        var projectDiscovery = await SdkProjectDiscovery.DiscoverAsync(testDirectory.DirectoryPath, Path.GetDirectoryName(fullProjectPath)!, fullProjectPath, experimentsManager, logger);
         ValidateProjectResults(expectedProjects, projectDiscovery, experimentsManager);
     }
 }