dependabot-nuget 0.301.1 → 0.303.0

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

@@ -2,6 +2,8 @@ using System.Linq;
 using System.Text;
 using System.Text.Json;
 
+using NuGet.Versioning;
+
 using NuGetUpdater.Core.Run.ApiModel;
 using NuGetUpdater.Core.Updater;
 
@@ -50,7 +52,20 @@ public partial class UpdateWorkerTests
                         <PackageReference Include="Some.Package" Version="13.0.1" />
                       </ItemGroup>
                     </Project>
-                    """
+                    """,
+                expectedResult: new()
+                {
+                    UpdateOperations = [
+                        new DirectUpdate()
+                        {
+                            DependencyName = "Some.Package",
+                            NewVersion = NuGetVersion.Parse("13.0.1"),
+                            UpdatedFiles = [
+                                "/src/test-project.csproj"
+                            ]
+                        }
+                    ]
+                }
             );
         }
 
@@ -2636,7 +2651,18 @@ public partial class UpdateWorkerTests
                           </ItemGroup>
                         </Project>
                         """)
-                ]
+                ],
+                expectedResult: new()
+                {
+                    UpdateOperations = [
+                        new PinnedUpdate()
+                        {
+                            DependencyName = "Some.Transitive.Dependency",
+                            NewVersion = NuGetVersion.Parse("5.0.2"),
+                            UpdatedFiles = ["/src/Directory.Build.props", "/src/Directory.Packages.props", "/src/test-project.csproj"]
+                        }
+                    ]
+                }
             );
         }
 
@@ -3106,7 +3132,26 @@ public partial class UpdateWorkerTests
                         <PackageReference Include="Some.Package" Version="2.0.0" />
                       </ItemGroup>
                     </Project>
-                    """
+                    """,
+                expectedResult: new()
+                {
+                    UpdateOperations = [
+                        new DirectUpdate()
+                        {
+                            DependencyName = "Some.Package",
+                            NewVersion = NuGetVersion.Parse("2.0.0"),
+                            UpdatedFiles = ["/src/test-project.csproj"]
+                        },
+                        new ParentUpdate()
+                        {
+                            DependencyName = "Transitive.Package",
+                            NewVersion = NuGetVersion.Parse("8.0.0"),
+                            UpdatedFiles = ["/src/test-project.csproj"],
+                            ParentDependencyName = "Some.Package",
+                            ParentNewVersion = NuGetVersion.Parse("2.0.0")
+                        }
+                    ]
+                }
             );
         }
 
@@ -3202,6 +3247,9 @@ public partial class UpdateWorkerTests
                     </Project>
                     """,
                 expectedResult: new() // success
+                {
+                    UpdateOperations = []
+                }
             );
         }
 
@@ -3484,6 +3532,7 @@ public partial class UpdateWorkerTests
                 expectedResult: new()
                 {
                     Error = new PrivateSourceAuthenticationFailure([$"{http.BaseUrl.TrimEnd('/')}/index.json"]),
+                    UpdateOperations = [],
                 }
             );
         }
@@ -3707,5 +3756,78 @@ public partial class UpdateWorkerTests
                 ]
             );
         }
+
+        [Fact]
+        public async Task LegacyProjectWithPackageReferencesCanUpdate()
+        {
+            await TestUpdateForProject("Some.Dependency", "1.0.0", "1.0.1",
+                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
+                packages: [
+                    MockNuGetPackage.CreateSimplePackage("Some.Dependency", "1.0.0", "net48"),
+                    MockNuGetPackage.CreateSimplePackage("Some.Dependency", "1.0.1", "net48"),
+                ],
+                projectContents: """
+                    <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+                      <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+                      <PropertyGroup>
+                        <OutputType>Library</OutputType>
+                        <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Some.Dependency" Version="1.0.0" />
+                      </ItemGroup>
+                      <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+                    </Project>
+                    """,
+                expectedProjectContents: """
+                    <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+                      <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+                      <PropertyGroup>
+                        <OutputType>Library</OutputType>
+                        <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Some.Dependency" Version="1.0.1" />
+                      </ItemGroup>
+                      <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+                    </Project>
+                    """
+            );
+        }
+
+        [Fact]
+        public async Task UpdateDependencyWhenUnrelatedDependencyHasWildcardVersion()
+        {
+            await TestUpdateForProject("Some.Package", "1.0.0", "1.0.1",
+                experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
+                packages: [
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net9.0"),
+                    MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.1", "net9.0"),
+                    MockNuGetPackage.CreateSimplePackage("Unrelated.Package", "2.1.0", "net9.0"),
+                ],
+                projectContents: """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net9.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="1.0.0" />
+                        <PackageReference Include="Unrelated.Package" Version="2.*" />
+                      </ItemGroup>
+                    </Project>
+                    """,
+                expectedProjectContents: """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net9.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="1.0.1" />
+                        <PackageReference Include="Unrelated.Package" Version="2.*" />
+                      </ItemGroup>
+                    </Project>
+                    """
+            );
+        }
     }
 }

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

@@ -1965,6 +1965,9 @@ public partial class UpdateWorkerTests
                       <ItemGroup>
                         <Compile Include="Properties\AssemblyInfo.cs" />
                       </ItemGroup>
+                      <ItemGroup>
+                        <ProjectReference Include="other-project\other-project.csproj" />
+                      </ItemGroup>
                       <PropertyGroup>
                         <!-- some project files set this property which makes the Microsoft.WebApplication.targets import a few lines down always fail -->
                         <VSToolsPath Condition="'$(VSToolsPath)' == ''">C:\some\path\that\does\not\exist</VSToolsPath>
@@ -1985,6 +1988,20 @@ public partial class UpdateWorkerTests
                       <package id="Some.Package" version="7.0.1" targetFramework="net45" />
                     </packages>
                     """,
+                additionalFiles:
+                [
+                    ("other-project/other-project.csproj", """
+                        <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+                          <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+                          <PropertyGroup>
+                            <OutputType>Library</OutputType>
+                            <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+                          </PropertyGroup>
+                          <Import Project="$(VSToolsPath)\SomeSubPath\WebApplications\Microsoft.WebApplication.targets" />
+                          <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+                        </Project>
+                        """)
+                ],
                 expectedProjectContents: """
                     <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
                       <PropertyGroup>
@@ -2046,6 +2063,9 @@ public partial class UpdateWorkerTests
                       <ItemGroup>
                         <Compile Include="Properties\AssemblyInfo.cs" />
                       </ItemGroup>
+                      <ItemGroup>
+                        <ProjectReference Include="other-project\other-project.csproj" />
+                      </ItemGroup>
                       <PropertyGroup>
                         <!-- some project files set this property which makes the Microsoft.WebApplication.targets import a few lines down always fail -->
                         <VSToolsPath Condition="'$(VSToolsPath)' == ''">C:\some\path\that\does\not\exist</VSToolsPath>
@@ -2426,6 +2446,7 @@ public partial class UpdateWorkerTests
                 expectedResult: new()
                 {
                     Error = new PrivateSourceAuthenticationFailure([$"{http.BaseUrl.TrimEnd('/')}/index.json"]),
+                    UpdateOperations = [],
                 }
             );
         }
@@ -2556,6 +2577,7 @@ public partial class UpdateWorkerTests
                 expectedResult: new()
                 {
                     ErrorRegex = "Response status code does not indicate success",
+                    UpdateOperations = [],
                 }
             );
         }
@@ -2633,6 +2655,7 @@ public partial class UpdateWorkerTests
                 expectedResult: new()
                 {
                     Error = new DependencyNotFound("Unrelated.Package.1.0.0"),
+                    UpdateOperations = [],
                 }
             );
         }