dependabot-nuget 0.267.0 → 0.270.0

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

@@ -1,6 +1,9 @@
 using System.Collections.Immutable;
+using System.Text;
 using System.Text.Json;
 
+using NuGet;
+
 using NuGetUpdater.Core.Updater;
 
 using Xunit;
@@ -1663,67 +1666,173 @@ public partial class UpdateWorkerTests
         [Fact]
         public async Task PackageCanBeUpdatedWhenAnotherInstalledPackageHasBeenDelisted()
         {
-            // updating one package (Newtonsoft.Json) when another installed package (FSharp.Core/5.0.3-beta.21369.4) has been delisted
-            await TestUpdateForProject("Newtonsoft.Json", "7.0.1", "13.0.1",
+            // updating one package (Some.Package) when another installed package (Delisted.Package/5.0.0) has been delisted
+            // this test can't be faked with a local package source and requires an HTTP endpoint; the important part is
+            // the `"listed": false` in the registration index
+            static (int, byte[]) TestHttpHandler(string uriString)
+            {
+                var uri = new Uri(uriString, UriKind.Absolute);
+                var baseUrl = $"{uri.Scheme}://{uri.Host}:{uri.Port}";
+                return uri.PathAndQuery switch
+                {
+                    "/index.json" => (200, Encoding.UTF8.GetBytes($$"""
+                    {
+                        "version": "3.0.0",
+                        "resources": [
+                            {
+                                "@id": "{{baseUrl}}/download",
+                                "@type": "PackageBaseAddress/3.0.0"
+                            },
+                            {
+                                "@id": "{{baseUrl}}/query",
+                                "@type": "SearchQueryService"
+                            },
+                            {
+                                "@id": "{{baseUrl}}/registrations",
+                                "@type": "RegistrationsBaseUrl"
+                            }
+                        ]
+                    }
+                    """)),
+                    "/registrations/delisted.package/index.json" => (200, Encoding.UTF8.GetBytes($$"""
+                        {
+                            "count": 1,
+                            "items": [
+                                {
+                                    "lower": "5.0.0",
+                                    "upper": "5.0.0",
+                                    "items": [
+                                        {
+                                            "catalogEntry": {
+                                                "id": "Delisted.Package",
+                                                "listed": false,
+                                                "version": "5.0.0"
+                                            },
+                                            "packageContent": "{{baseUrl}}/download/delisted.package/5.0.0/delisted.package.5.0.0.nupkg",
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                        """)),
+                    "/registrations/some.package/index.json" => (200, Encoding.UTF8.GetBytes($$"""
+                        {
+                            "count": 1,
+                            "items": [
+                                {
+                                    "lower": "1.0.0",
+                                    "upper": "2.0.0",
+                                    "items": [
+                                        {
+                                            "catalogEntry": {
+                                                "id": "Some.Package",
+                                                "listed": true,
+                                                "version": "1.0.0"
+                                            },
+                                            "packageContent": "{{baseUrl}}/download/some.package/1.0.0/some.package.1.0.0.nupkg",
+                                        },
+                                        {
+                                            "catalogEntry": {
+                                                "id": "Some.Package",
+                                                "listed": true,
+                                                "version": "2.0.0"
+                                            },
+                                            "packageContent": "{{baseUrl}}/download/some.package/2.0.0/some.package.2.0.0.nupkg",
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                        """)),
+                    "/download/delisted.package/5.0.0/delisted.package.5.0.0.nupkg" =>
+                        (200, MockNuGetPackage.CreateSimplePackage("Delisted.Package", "5.0.0", "net45").GetZipStream().ReadAllBytes()),
+                    "/download/some.package/1.0.0/some.package.1.0.0.nupkg" =>
+                        (200, MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net45").GetZipStream().ReadAllBytes()),
+                    "/download/some.package/2.0.0/some.package.2.0.0.nupkg" =>
+                        (200, MockNuGetPackage.CreateSimplePackage("Some.Package", "2.0.0", "net45").GetZipStream().ReadAllBytes()),
+                    _ => (404, Encoding.UTF8.GetBytes("{}")), // everything is missing
+                };
+            }
+            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
                 projectContents: """
-                <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-                  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-                  <PropertyGroup>
-                    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-                  </PropertyGroup>
-                  <ItemGroup>
-                    <None Include="packages.config" />
-                  </ItemGroup>
-                  <ItemGroup>
-                    <Reference Include="FSharp.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-                      <HintPath>packages\FSharp.Core.5.0.3-beta.21369.4\lib\netstandard2.0\FSharp.Core.dll</HintPath>
-                      <Private>True</Private>
-                    </Reference>
-                    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
-                      <HintPath>packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-                      <Private>True</Private>
-                    </Reference>
-                  </ItemGroup>
-                  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-                </Project>
-                """,
+                    <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+                      <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+                      <PropertyGroup>
+                        <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <None Include="packages.config" />
+                      </ItemGroup>
+                      <ItemGroup>
+                        <Reference Include="Delisted.Package">
+                          <HintPath>packages\Delisted.Package.5.0.0\lib\net45\Delisted.Package.dll</HintPath>
+                          <Private>True</Private>
+                        </Reference>
+                        <Reference Include="Some.Package">
+                          <HintPath>packages\Some.Package.1.0.0\lib\net45\Some.Package.dll</HintPath>
+                          <Private>True</Private>
+                        </Reference>
+                      </ItemGroup>
+                      <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+                    </Project>
+                    """,
                 packagesConfigContents: """
-                <packages>
-                  <package id="FSharp.Core" version="5.0.3-beta.21369.4" targetFramework="net462" />
-                  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net462" />
-                </packages>
-                """,
+                    <packages>
+                      <package id="Delisted.Package" version="5.0.0" targetFramework="net462" />
+                      <package id="Some.Package" version="1.0.0" targetFramework="net462" />
+                    </packages>
+                    """,
+                additionalFiles:
+                [
+                    ("NuGet.Config", $"""
+                        <configuration>
+                          <packageSources>
+                            <clear />
+                            <add key="private_feed" value="{http.BaseUrl.TrimEnd('/')}/index.json" allowInsecureConnections="true" />
+                          </packageSources>
+                        </configuration>
+                        """)
+                ],
                 // expected
                 expectedProjectContents: """
-                <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-                  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-                  <PropertyGroup>
-                    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-                  </PropertyGroup>
-                  <ItemGroup>
-                    <None Include="packages.config" />
-                  </ItemGroup>
-                  <ItemGroup>
-                    <Reference Include="FSharp.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-                      <HintPath>packages\FSharp.Core.5.0.3-beta.21369.4\lib\netstandard2.0\FSharp.Core.dll</HintPath>
-                      <Private>True</Private>
-                    </Reference>
-                    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
-                      <HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-                      <Private>True</Private>
-                    </Reference>
-                  </ItemGroup>
-                  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-                </Project>
-                """,
+                    <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+                      <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+                      <PropertyGroup>
+                        <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <None Include="packages.config" />
+                      </ItemGroup>
+                      <ItemGroup>
+                        <Reference Include="Delisted.Package">
+                          <HintPath>packages\Delisted.Package.5.0.0\lib\net45\Delisted.Package.dll</HintPath>
+                          <Private>True</Private>
+                        </Reference>
+                        <Reference Include="Some.Package">
+                          <HintPath>packages\Some.Package.2.0.0\lib\net45\Some.Package.dll</HintPath>
+                          <Private>True</Private>
+                        </Reference>
+                      </ItemGroup>
+                      <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+                    </Project>
+                    """,
                 expectedPackagesConfigContents: """
-                <?xml version="1.0" encoding="utf-8"?>
-                <packages>
-                  <package id="FSharp.Core" version="5.0.3-beta.21369.4" targetFramework="net462" />
-                  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net462" />
-                </packages>
-                """);
+                    <?xml version="1.0" encoding="utf-8"?>
+                    <packages>
+                      <package id="Delisted.Package" version="5.0.0" targetFramework="net462" />
+                      <package id="Some.Package" version="2.0.0" targetFramework="net462" />
+                    </packages>
+                    """
+            );
         }
 
         [Fact]

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

@@ -52,10 +52,13 @@ public partial class UpdateWorkerTests
             );
         }
 
-        [Fact]
-        public async Task UpdateVersionChildElement_InProjectFile_ForPackageReferenceInclude()
+        [Theory]
+        [InlineData("true")]
+        [InlineData(null)]
+        public async Task UpdateVersionChildElement_InProjectFile_ForPackageReferenceIncludeTheory(string variableValue)
         {
             // update Some.Package from 9.0.1 to 13.0.1
+            using var env = new TemporaryEnvironment([("UseNewNugetPackageResolver", variableValue)]);
             await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1",
                 packages:
                 [
@@ -91,6 +94,43 @@ public partial class UpdateWorkerTests
               );
         }
 
+        [Fact]
+        public async Task CallingResolveDependencyConflictsNew()
+        {
+            // update Microsoft.CodeAnalysis.Common from 4.9.2 to 4.10.0
+            using var env = new TemporaryEnvironment([("UseNewNugetPackageResolver", "true")]);
+            await TestUpdateForProject("Microsoft.CodeAnalysis.Common", "4.9.2", "4.10.0",
+                // initial
+                projectContents: $"""
+                    <Project Sdk="Microsoft.NET.Sdk">
+                        <PropertyGroup>
+                            <TargetFramework>net8.0</TargetFramework>
+                        </PropertyGroup>
+                        <ItemGroup>
+                            <PackageReference Include="Microsoft.CodeAnalysis.Compilers" Version="4.9.2" />
+                            <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" />
+                            <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
+                            <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.9.2" />
+                        </ItemGroup>
+                    </Project>
+                    """,
+                // expected
+                expectedProjectContents: $"""
+                    <Project Sdk="Microsoft.NET.Sdk">
+                        <PropertyGroup>
+                            <TargetFramework>net8.0</TargetFramework>
+                        </PropertyGroup>
+                        <ItemGroup>
+                            <PackageReference Include="Microsoft.CodeAnalysis.Compilers" Version="4.10.0" />
+                            <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.10.0" />
+                            <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
+                            <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.10.0" />
+                        </ItemGroup>
+                    </Project>
+                    """
+              );
+        }
+
         [Fact]
         public async Task UpdateVersions_InProjectFile_ForDuplicatePackageReferenceInclude()
         {
@@ -489,9 +529,12 @@ public partial class UpdateWorkerTests
             );
         }
 
-        [Fact]
-        public async Task AddPackageReference_InProjectFile_ForTransientDependency()
+        [Theory]
+        [InlineData(null)]
+        [InlineData("true")]
+        public async Task AddPackageReference_InProjectFile_ForTransientDependency(string variableValue)
         {
+            using var env = new TemporaryEnvironment([("UseNewNugetPackageResolver", variableValue)]);
             // add transient package Some.Transient.Dependency from 5.0.1 to 5.0.2
             await TestUpdateForProject("Some.Transient.Dependency", "5.0.1", "5.0.2", isTransitive: true,
                 packages:
@@ -532,6 +575,127 @@ public partial class UpdateWorkerTests
             );
         }
 
+        [Fact]
+        public async Task TransitiveDependencyCanBeAddedWithMismatchingSdk()
+        {
+            await TestUpdateForProject("Some.Transitive.Package", "1.0.0", "1.0.1", isTransitive: true,
+                packages:
+                [
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net8.0", [(null, [("Some.Transitive.Package", "1.0.0")])]),
+                    MockNuGetPackage.CreateSimplePackage("Some.Transitive.Package", "1.0.0", "net8.0"),
+                    MockNuGetPackage.CreateSimplePackage("Some.Transitive.Package", "1.0.1", "net8.0"),
+                ],
+                projectContents: """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="1.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """,
+                additionalFiles:
+                [
+                    ("global.json", """
+                        {
+                          "sdk": {
+                            "version": "99.99.999" // this version doesn't match anything that's installed
+                          }
+                        }
+                        """)
+                ],
+                expectedProjectContents: """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="1.0.0" />
+                        <PackageReference Include="Some.Transitive.Package" Version="1.0.1" />
+                      </ItemGroup>
+                    </Project>
+                    """
+            );
+        }
+
+        [Fact]
+        public async Task TransitiveDependencyCanBeAddedWithCustomMSBuildSdk()
+        {
+            await TestUpdateForProject("Some.Transitive.Package", "1.0.0", "1.0.1", isTransitive: true,
+                packages:
+                [
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net8.0", [(null, [("Some.Transitive.Package", "1.0.0")])]),
+                    MockNuGetPackage.CreateSimplePackage("Some.Transitive.Package", "1.0.0", "net8.0"),
+                    MockNuGetPackage.CreateSimplePackage("Some.Transitive.Package", "1.0.1", "net8.0"),
+                    MockNuGetPackage.CreateMSBuildSdkPackage("Custom.MSBuild.Sdk", "1.2.3"),
+                ],
+                projectContents: """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" />
+                      </ItemGroup>
+                    </Project>
+                    """,
+                additionalFiles:
+                [
+                    ("Directory.Build.props", """
+                        <Project>
+                          <Import Project="Sdk.props" Sdk="Custom.MSBuild.Sdk" />
+                        </Project>
+                        """),
+                    ("Directory.Packages.props", """
+                        <Project>
+                          <PropertyGroup>
+                            <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+                          </PropertyGroup>
+                          <ItemGroup>
+                            <PackageVersion Include="Some.Package" Version="1.0.0" />
+                          </ItemGroup>
+                        </Project>
+                        """),
+                    ("global.json", """
+                        {
+                          "sdk": {
+                            "version": "99.99.999" // this version doesn't match anything that's installed
+                          },
+                          "msbuild-sdks": {
+                            "Custom.MSBuild.Sdk": "1.2.3"
+                          }
+                        }
+                        """)
+                ],
+                expectedProjectContents: """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" />
+                        <PackageReference Include="Some.Transitive.Package" />
+                      </ItemGroup>
+                    </Project>
+                    """,
+                additionalFilesExpected:
+                [
+                    ("Directory.Packages.props", """
+                        <Project>
+                          <PropertyGroup>
+                            <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+                          </PropertyGroup>
+                          <ItemGroup>
+                            <PackageVersion Include="Some.Package" Version="1.0.0" />
+                            <PackageVersion Include="Some.Transitive.Package" Version="1.0.1" />
+                          </ItemGroup>
+                        </Project>
+                        """)
+                ]
+            );
+        }
+
         [Fact]
         public async Task UpdateVersionAttribute_InProjectFile_ForAnalyzerPackageReferenceInclude()
         {
@@ -2741,9 +2905,13 @@ public partial class UpdateWorkerTests
             );
         }
 
-        [Fact]
-        public async Task NoChange_IfThereAreIncoherentVersions()
+        [Theory]
+        [InlineData("true")]
+        [InlineData(null)]
+        public async Task NoChange_IfThereAreIncoherentVersions(string variableValue)
         {
+            using var env = new TemporaryEnvironment([("UseNewNugetPackageResolver", variableValue)]);
+
             // trying to update `Transitive.Dependency` to 1.1.0 would normally pull `Some.Package` from 1.0.0 to 1.1.0,
             // but the TFM doesn't allow it
             await TestNoChangeforProject("Transitive.Dependency", "1.0.0", "1.1.0",
@@ -2827,9 +2995,13 @@ public partial class UpdateWorkerTests
             );
         }
 
-        [Fact]
-        public async Task UnresolvablePropertyDoesNotStopOtherUpdates()
+        [Theory]
+        [InlineData("true")]
+        [InlineData(null)]
+        public async Task UnresolvablePropertyDoesNotStopOtherUpdates(string variableValue)
         {
+            using var env = new TemporaryEnvironment([("UseNewNugetPackageResolver", variableValue)]);
+
             // the property `$(SomeUnresolvableProperty)` cannot be resolved
             await TestUpdateForProject("Some.Package", "7.0.1", "13.0.1",
                 packages:
@@ -2863,9 +3035,13 @@ public partial class UpdateWorkerTests
             );
         }
 
-        [Fact]
-        public async Task UpdatingPackageAlsoUpdatesAnythingWithADependencyOnTheUpdatedPackage()
+        [Theory]
+        [InlineData("true")]
+        [InlineData(null)]
+        public async Task UpdatingPackageAlsoUpdatesAnythingWithADependencyOnTheUpdatedPackage(string variableValue)
         {
+            using var env = new TemporaryEnvironment([("UseNewNugetPackageResolver", variableValue)]);
+
             // updating Some.Package from 3.3.30 requires that Some.Package.Extensions also be updated
             await TestUpdateForProject("Some.Package", "3.3.30", "3.4.3",
                 packages: