dependabot-nuget 0.297.2 → 0.298.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 303dd4ae4de15c33ca64bc0a8957ee6a4fa27cac4ffd2fbb93047d518d6afdb6
-  data.tar.gz: b4075db4bac953819932132e23d6478b6bc3e06242032d79235d2025caa1ed6f
+  metadata.gz: 7ddf8333c71d3c76213603301923f6005fc9a35a3a7b1f59dedf21ff2381a5ac
+  data.tar.gz: b2e38e24b320965f93d502eacdc0622b354e915a0366bc8478a9528c053e4410
 SHA512:
-  metadata.gz: 700973559052453bdfe9d999df2c980d1a5d95ecf296393edb1d1e030c050fa24eafd344898ed3017e2b6a19f7f61cf1503388ec875ffa093fc05b26cbbfc3a5
-  data.tar.gz: 3c3464e7f039d06e3fc55b3406e966767b2ed2e33d31c604f8034c7bde706aea942bcd5499b415ed1d8fae1b19323f57439e82b749e08ba0591aa53cab80aecb
+  metadata.gz: 317614f24858deff63cad0dddfcfb80f53c6e8330b4dfd64d9946a34c50afed27f9e63527f3563ebc2678f7c5ad6e43078ddf4feb7944c10fb7947056f31740d
+  data.tar.gz: 8cb7df04044fc6a1bb421508bbf1bf1fdebab675f81c30d188963e6991f2bd84b4d4f165a315fbfec3257a97e85f232ed824cef7d01f3ab658cd5f9247d44035

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/FrameworkChecker/SupportedFrameworks.cs

@@ -20,7 +20,8 @@ namespace NuGetGallery.Frameworks
     /// </remarks>
     public static class SupportedFrameworks
     {
-        public static readonly Version Version8 = new Version(8, 0, 0, 0); // https://github.com/NuGet/Engineering/issues/5112
+        public static readonly Version Version8 = new Version(8, 0, 0, 0);
+        public static readonly Version Version9 = new Version(9, 0, 0, 0);
 
         public static readonly NuGetFramework MonoAndroid = new NuGetFramework(FrameworkIdentifiers.MonoAndroid, EmptyVersion);
         public static readonly NuGetFramework MonoTouch = new NuGetFramework(FrameworkIdentifiers.MonoTouch, EmptyVersion);
@@ -29,12 +30,14 @@ namespace NuGetGallery.Frameworks
         public static readonly NuGetFramework Net48 = new NuGetFramework(FrameworkIdentifiers.Net, new Version(4, 8, 0, 0));
         public static readonly NuGetFramework Net481 = new NuGetFramework(FrameworkIdentifiers.Net, new Version(4, 8, 1, 0));
         public static readonly NuGetFramework Net50Windows = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version5, "windows", EmptyVersion);
+
         public static readonly NuGetFramework Net60Android = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version6, "android", EmptyVersion);
         public static readonly NuGetFramework Net60Ios = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version6, "ios", EmptyVersion);
         public static readonly NuGetFramework Net60MacOs = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version6, "macos", EmptyVersion);
         public static readonly NuGetFramework Net60MacCatalyst = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version6, "maccatalyst", EmptyVersion);
         public static readonly NuGetFramework Net60TvOs = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version6, "tvos", EmptyVersion);
         public static readonly NuGetFramework Net60Windows = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version6, "windows", EmptyVersion);
+
         public static readonly NuGetFramework Net70Android = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7, "android", EmptyVersion);
         public static readonly NuGetFramework Net70Ios = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7, "ios", EmptyVersion);
         public static readonly NuGetFramework Net70MacOs = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7, "macos", EmptyVersion);
@@ -42,14 +45,22 @@ namespace NuGetGallery.Frameworks
         public static readonly NuGetFramework Net70TvOs = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7, "tvos", EmptyVersion);
         public static readonly NuGetFramework Net70Windows = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7, "windows", EmptyVersion);
 
-        public static readonly NuGetFramework Net80 = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version8); // https://github.com/NuGet/Engineering/issues/5112
-
+        public static readonly NuGetFramework Net80 = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version8);
         public static readonly NuGetFramework Net80Android = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version8, "android", EmptyVersion);
         public static readonly NuGetFramework Net80Ios = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version8, "ios", EmptyVersion);
         public static readonly NuGetFramework Net80MacOs = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version8, "macos", EmptyVersion);
         public static readonly NuGetFramework Net80MacCatalyst = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version8, "maccatalyst", EmptyVersion);
         public static readonly NuGetFramework Net80TvOs = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version8, "tvos", EmptyVersion);
         public static readonly NuGetFramework Net80Windows = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version8, "windows", EmptyVersion);
+
+        public static readonly NuGetFramework Net90 = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version9);
+        public static readonly NuGetFramework Net90Android = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version9, "android", EmptyVersion);
+        public static readonly NuGetFramework Net90Ios = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version9, "ios", EmptyVersion);
+        public static readonly NuGetFramework Net90MacOs = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version9, "macos", EmptyVersion);
+        public static readonly NuGetFramework Net90MacCatalyst = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version9, "maccatalyst", EmptyVersion);
+        public static readonly NuGetFramework Net90TvOs = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version9, "tvos", EmptyVersion);
+        public static readonly NuGetFramework Net90Windows = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version9, "windows", EmptyVersion);
+
         public static readonly NuGetFramework NetCore = new NuGetFramework(FrameworkIdentifiers.NetCore, EmptyVersion);
         public static readonly NuGetFramework NetMf = new NuGetFramework(FrameworkIdentifiers.NetMicro, EmptyVersion);
         public static readonly NuGetFramework UAP = new NuGetFramework(FrameworkIdentifiers.UAP, EmptyVersion);
@@ -75,6 +86,7 @@ namespace NuGetGallery.Frameworks
                 Net60, Net60Android, Net60Ios, Net60MacCatalyst, Net60MacOs, Net60TvOs, Net60Windows,
                 Net70, Net70Android, Net70Ios, Net70MacCatalyst, Net70MacOs, Net70TvOs, Net70Windows,
                 Net80, Net80Android, Net80Ios, Net80MacCatalyst, Net80MacOs, Net80TvOs, Net80Windows,
+                Net90, Net90Android, Net90Ios, Net90MacCatalyst, Net90MacOs, Net90TvOs, Net90Windows,
                 NetCore, NetCore45, NetCore451,
                 NetCoreApp10, NetCoreApp11, NetCoreApp20, NetCoreApp21, NetCoreApp22, NetCoreApp30, NetCoreApp31,
                 NetMf,
@@ -94,6 +106,7 @@ namespace NuGetGallery.Frameworks
         {
             public static readonly List<NuGetFramework> NetTfms =
             [
+                Net90,
                 Net80,
                 Net70,
                 Net60,

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/RunWorker.cs

@@ -3,6 +3,7 @@ using System.Net;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Text.RegularExpressions;
 
 using Microsoft.Extensions.FileSystemGlobbing;
 
@@ -13,6 +14,8 @@ using NuGetUpdater.Core.Discover;
 using NuGetUpdater.Core.Run.ApiModel;
 using NuGetUpdater.Core.Utilities;
 
+using static NuGetUpdater.Core.Utilities.EOLHandling;
+
 namespace NuGetUpdater.Core.Run;
 
 public class RunWorker
@@ -122,6 +125,7 @@ public class RunWorker
 
         // TODO: pull out relevant dependencies, then check each for updates and track the changes
         var originalDependencyFileContents = new Dictionary<string, string>();
+        var originalDependencyFileEOFs = new Dictionary<string, EOLType>();
         var actualUpdatedDependencies = new List<ReportedDependency>();
 
         // track original contents for later handling
@@ -131,6 +135,7 @@ public class RunWorker
             var localFullPath = Path.Join(repoContentsPath.FullName, repoFullPath);
             var content = await File.ReadAllTextAsync(localFullPath);
             originalDependencyFileContents[repoFullPath] = content;
+            originalDependencyFileEOFs[repoFullPath] = content.GetPredominantEOL();
         }
 
         foreach (var project in discoveryResult.Projects)
@@ -203,8 +208,13 @@ public class RunWorker
             var localFullPath = Path.GetFullPath(Path.Join(repoContentsPath.FullName, repoFullPath));
             var originalContent = originalDependencyFileContents[repoFullPath];
             var updatedContent = await File.ReadAllTextAsync(localFullPath);
+
+            updatedContent = updatedContent.SetEOL(originalDependencyFileEOFs[repoFullPath]);
+            await File.WriteAllTextAsync(localFullPath, updatedContent);
+
             if (updatedContent != originalContent)
             {
+
                 updatedDependencyFiles[localFullPath] = new DependencyFile()
                 {
                     Name = Path.GetFileName(repoFullPath),

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/EOLHandling.cs

@@ -0,0 +1,78 @@
+using System.Text.RegularExpressions;
+
+namespace NuGetUpdater.Core.Utilities;
+
+public static class EOLHandling
+{
+    /// <summary>
+    /// Used to save (and then restore) which line endings are predominant in a file.
+    /// </summary>
+    public enum EOLType
+    {
+        /// <summary>
+        /// Line feed - \n
+        /// Typical on most systems.
+        /// </summary>
+        LF,
+        /// <summary>
+        /// Carriage return - \r
+        /// Typical on older MacOS, unlikely (but possible) to come up here
+        /// </summary>
+        CR,
+        /// <summary>
+        /// Carriage return and line feed - \r\n.
+        /// Typical on Windows
+        /// </summary>
+        CRLF
+    };
+
+    /// <summary>
+    /// Analyze the input string and find the most common line ending type.
+    /// </summary>
+    /// <param name="content">The string to analyze</param>
+    /// <returns>The most common type of line ending in the input string.</returns>
+    public static EOLType GetPredominantEOL(this string content)
+    {
+        // Get stats on EOL characters/character sequences, if one predominates choose that for writing later.
+        var lfcount = content.Count(c => c == '\n');
+        var crcount = content.Count(c => c == '\r');
+        var crlfcount = Regex.Matches(content, "\r\n").Count();
+
+        // Since CRLF contains both a CR and a LF, subtract it from those counts
+        lfcount -= crlfcount;
+        crcount -= crlfcount;
+        if (crcount > lfcount && crcount > crlfcount)
+        {
+            return EOLType.CR;
+        }
+        else if (crlfcount > lfcount)
+        {
+            return EOLType.CRLF;
+        }
+        else
+        {
+            return EOLType.LF;
+        }
+    }
+
+    /// <summary>
+    /// Given a line ending, modify the input string to uniformly use that line ending.
+    /// </summary>
+    /// <param name="content">The input string, which may have any combination of line endings.</param>
+    /// <param name="desiredEOL">The line ending type to use across the result.</param>
+    /// <returns>The string with any line endings swapped to the desired type.</returns>
+    /// <exception cref="ArgumentOutOfRangeException">If EOLType is an unexpected value.</exception>
+    public static string SetEOL(this string content, EOLType desiredEOL)
+    {
+        switch (desiredEOL)
+        {
+            case EOLType.LF:
+                return Regex.Replace(content, "(\r\n|\r)", "\n");
+            case EOLType.CR:
+                return Regex.Replace(content, "(\r\n|\n)", "\r");
+            case EOLType.CRLF:
+                return Regex.Replace(content, "(\r\n|\r|\n)", "\r\n");
+        }
+        throw new ArgumentOutOfRangeException(nameof(desiredEOL));
+    }
+}

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/FrameworkChecker/CompatibilityCheckerFacts.cs

@@ -7,6 +7,8 @@ namespace NuGetUpdater.Core.Test.FrameworkChecker;
 public class CompatibilityCheckerFacts
 {
     [Theory]
+    [InlineData("net9.0", "net9.0")]
+    [InlineData("net9.0", "net8.0")]
     [InlineData("net8.0", "net8.0")]
     [InlineData("net8.0", "net7.0")]
     [InlineData("net7.0", "net7.0")]

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/RunWorkerTests.cs

@@ -14,12 +14,17 @@ using Xunit;
 
 namespace NuGetUpdater.Core.Test.Run;
 
+using static NuGetUpdater.Core.Utilities.EOLHandling;
+
 using TestFile = (string Path, string Content);
 
 public class RunWorkerTests
 {
-    [Fact]
-    public async Task UpdateSinglePackageProducedExpectedAPIMessages()
+    [Theory]
+    [InlineData(EOLType.CR)]
+    [InlineData(EOLType.LF)]
+    [InlineData(EOLType.CRLF)]
+    public async Task UpdateSinglePackageProducedExpectedAPIMessages(EOLType EOL)
     {
         await RunAsync(
             packages: [],
@@ -43,7 +48,7 @@ public class RunWorkerTests
                         <PackageReference Include="Some.Package" Version="1.0.0" />
                       </ItemGroup>
                     </Project>
-                    """)
+                    """.SetEOL(EOL))
             ],
             discoveryWorker: new TestDiscoveryWorker(_input =>
             {
@@ -94,7 +99,7 @@ public class RunWorkerTests
                         <PackageReference Include="Some.Package" Version="1.0.1" />
                       </ItemGroup>
                     </Project>
-                    """);
+                    """.SetEOL(EOL));
                 return new UpdateOperationResult();
             }),
             expectedResult: new RunResult()
@@ -114,7 +119,7 @@ public class RunWorkerTests
                                 <PackageReference Include="Some.Package" Version="1.0.0" />
                               </ItemGroup>
                             </Project>
-                            """))
+                            """.SetEOL(EOL)))
                     }
                 ],
                 BaseCommitSha = "TEST-COMMIT-SHA",
@@ -199,7 +204,7 @@ public class RunWorkerTests
                                     <PackageReference Include="Some.Package" Version="1.0.1" />
                                   </ItemGroup>
                                 </Project>
-                                """,
+                                """.SetEOL(EOL),
                         },
                     ],
                     BaseCommitSha = "TEST-COMMIT-SHA",
@@ -212,11 +217,14 @@ public class RunWorkerTests
         );
     }
 
-    [Fact]
-    public async Task UpdateHandlesSemicolonsInPackageReference()
+    [Theory]
+    [InlineData(EOLType.CR)]
+    [InlineData(EOLType.LF)]
+    [InlineData(EOLType.CRLF)]
+    public async Task UpdateHandlesSemicolonsInPackageReference(EOLType EOL)
     {
-        var repoMetadata = XElement.Parse("""<repository type="git" url="https://nuget.example.com/some-package" />""");
-        var repoMetadata2 = XElement.Parse("""<repository type="git" url="https://nuget.example.com/some-package2" />""");
+        var repoMetadata = XElement.Parse("""<repository type="git" url="https://nuget.example.com/some-package" />""".SetEOL(EOL));
+        var repoMetadata2 = XElement.Parse("""<repository type="git" url="https://nuget.example.com/some-package2" />""".SetEOL(EOL));
         await RunAsync(
             packages:
             [
@@ -246,7 +254,7 @@ public class RunWorkerTests
                         <PackageReference Include="Some.Package;Some.Package2" Version="1.0.0" />
                       </ItemGroup>
                     </Project>
-                    """)
+                    """.SetEOL(EOL))
             ],
             discoveryWorker: new TestDiscoveryWorker(_input =>
             {
@@ -299,7 +307,7 @@ public class RunWorkerTests
                         <PackageReference Include="Some.Package;Some.Package2" Version="1.0.1" />
                       </ItemGroup>
                     </Project>
-                    """);
+                    """.SetEOL(EOL));
                 return new UpdateOperationResult();
             }),
             expectedResult: new RunResult()
@@ -319,7 +327,7 @@ public class RunWorkerTests
                                 <PackageReference Include="Some.Package;Some.Package2" Version="1.0.0" />
                               </ItemGroup>
                             </Project>
-                            """))
+                            """.SetEOL(EOL)))
                     }
                 ],
                 BaseCommitSha = "TEST-COMMIT-SHA",
@@ -447,7 +455,7 @@ public class RunWorkerTests
                                     <PackageReference Include="Some.Package;Some.Package2" Version="1.0.1" />
                                   </ItemGroup>
                                 </Project>
-                                """,
+                                """.SetEOL(EOL),
                         }
 
                     ],
@@ -461,8 +469,11 @@ public class RunWorkerTests
         );
     }
 
-    [Fact]
-    public async Task PrivateSourceAuthenticationFailureIsForwaredToApiHandler()
+    [Theory]
+    [InlineData(EOLType.CR)]
+    [InlineData(EOLType.LF)]
+    [InlineData(EOLType.CRLF)]
+    public async Task PrivateSourceAuthenticationFailureIsForwaredToApiHandler(EOLType EOL)
     {
         await RunAsync(
             packages:
@@ -486,7 +497,7 @@ public class RunWorkerTests
                         <add key="private_feed" value="http://example.com/nuget/index.json" allowInsecureConnections="true" />
                       </packageSources>
                     </configuration>
-                    """),
+                    """.SetEOL(EOL)),
                 ("project.csproj", """
                     <Project Sdk="Microsoft.NET.Sdk">
                       <PropertyGroup>
@@ -496,7 +507,7 @@ public class RunWorkerTests
                         <PackageReference Include="Some.Package" Version="1.0.0" />
                       </ItemGroup>
                     </Project>
-                    """)
+                    """.SetEOL(EOL))
             ],
             discoveryWorker: new TestDiscoveryWorker((_input) =>
             {
@@ -517,11 +528,14 @@ public class RunWorkerTests
         );
     }
 
-    [Fact]
-    public async Task UpdateHandlesPackagesConfigFiles()
+    [Theory]
+    [InlineData(EOLType.CR)]
+    [InlineData(EOLType.LF)]
+    [InlineData(EOLType.CRLF)]
+    public async Task UpdateHandlesPackagesConfigFiles(EOLType EOL)
     {
-        var repoMetadata = XElement.Parse("""<repository type="git" url="https://nuget.example.com/some-package" />""");
-        var repoMetadata2 = XElement.Parse("""<repository type="git" url="https://nuget.example.com/some-package2" />""");
+        var repoMetadata = XElement.Parse("""<repository type="git" url="https://nuget.example.com/some-package" />""".SetEOL(EOL));
+        var repoMetadata2 = XElement.Parse("""<repository type="git" url="https://nuget.example.com/some-package2" />""".SetEOL(EOL));
         await RunAsync(
             packages:
             [
@@ -551,13 +565,13 @@ public class RunWorkerTests
                         <PackageReference Include="Some.Package" Version="1.0.0" />
                       </ItemGroup>
                     </Project>
-                    """),
+                    """.SetEOL(EOL)),
                 ("some-dir/packages.config", """
                     <?xml version="1.0" encoding="utf-8"?>
                     <packages>
                       <package id="Some.Package2" version="2.0.0" targetFramework="net8.0" />
                     </packages>
-                    """),
+                    """.SetEOL(EOL)),
             ],
             discoveryWorker: new TestDiscoveryWorker(_input =>
             {
@@ -630,7 +644,7 @@ public class RunWorkerTests
                                 <PackageReference Include="Some.Package" Version="1.0.1" />
                               </ItemGroup>
                              </Project>
-                            """);
+                            """.SetEOL(EOL));
                         break;
                     case "Some.Package2":
                         await File.WriteAllTextAsync(projectPath, """
@@ -648,14 +662,14 @@ public class RunWorkerTests
                                 </Reference>
                               </ItemGroup>
                             </Project>
-                            """);
+                            """.SetEOL(EOL));
                         var packagesConfigPath = Path.Join(Path.GetDirectoryName(projectPath)!, "packages.config");
                         await File.WriteAllTextAsync(packagesConfigPath, """
                             <?xml version="1.0" encoding="utf-8"?>
                             <packages>
                               <package id="Some.Package2" version="2.0.1" targetFramework="net8.0" />
                             </packages>
-                            """);
+                            """.SetEOL(EOL));
                         break;
                     default:
                         throw new NotSupportedException();
@@ -676,7 +690,7 @@ public class RunWorkerTests
                             <packages>
                               <package id="Some.Package2" version="2.0.0" targetFramework="net8.0" />
                             </packages>
-                            """))
+                            """.SetEOL(EOL)))
                     },
                     new DependencyFile()
                     {
@@ -691,7 +705,7 @@ public class RunWorkerTests
                                 <PackageReference Include="Some.Package" Version="1.0.0" />
                               </ItemGroup>
                             </Project>
-                            """))
+                            """.SetEOL(EOL)))
                     },
                 ],
                 BaseCommitSha = "TEST-COMMIT-SHA",
@@ -815,7 +829,7 @@ public class RunWorkerTests
                                 <packages>
                                   <package id="Some.Package2" version="2.0.1" targetFramework="net8.0" />
                                 </packages>
-                                """,
+                                """.SetEOL(EOL),
                         },
                         new DependencyFile()
                         {
@@ -836,7 +850,7 @@ public class RunWorkerTests
                                     </Reference>
                                   </ItemGroup>
                                 </Project>
-                                """,
+                                """.SetEOL(EOL),
                         },
                     ],
                     BaseCommitSha = "TEST-COMMIT-SHA",
@@ -849,11 +863,14 @@ public class RunWorkerTests
         );
     }
 
-    [Fact]
-    public async Task UpdateHandlesPackagesConfigFromReferencedCsprojFiles()
+    [Theory]
+    [InlineData(EOLType.CR)]
+    [InlineData(EOLType.LF)]
+    [InlineData(EOLType.CRLF)]
+    public async Task UpdateHandlesPackagesConfigFromReferencedCsprojFiles(EOLType EOL)
     {
-        var repoMetadata = XElement.Parse("""<repository type="git" url="https://nuget.example.com/some-package" />""");
-        var repoMetadata2 = XElement.Parse("""<repository type="git" url="https://nuget.example.com/some-package2" />""");
+        var repoMetadata = XElement.Parse("""<repository type="git" url="https://nuget.example.com/some-package" />""".SetEOL(EOL));
+        var repoMetadata2 = XElement.Parse("""<repository type="git" url="https://nuget.example.com/some-package2" />""".SetEOL(EOL));
         await RunAsync(
             packages:
             [
@@ -886,13 +903,13 @@ public class RunWorkerTests
                         <ProjectReference Include="../ProjectB/ProjectB.csproj" />
                       </ItemGroup>
                     </Project>
-                    """),
+                    """.SetEOL(EOL)),
                 ("some-dir/ProjectA/packages.config", """
                     <?xml version="1.0" encoding="utf-8"?>
                     <packages>
                       <package id="Some.Package2" version="2.0.0" targetFramework="net8.0" />
                     </packages>
-                    """),
+                    """.SetEOL(EOL)),
                 ("some-dir/ProjectB/ProjectB.csproj", """
                     <Project Sdk="Microsoft.NET.Sdk">
                       <PropertyGroup>
@@ -902,13 +919,13 @@ public class RunWorkerTests
                         <PackageReference Include="Some.Package" Version="1.0.0" />
                       </ItemGroup>
                     </Project>
-                    """),
+                    """.SetEOL(EOL)),
                 ("some-dir/ProjectB/packages.config", """
                     <?xml version="1.0" encoding="utf-8"?>
                     <packages>
                       <package id="Some.Package2" version="2.0.0" targetFramework="net8.0" />
                     </packages>
-                    """),
+                    """.SetEOL(EOL)),
             ],
             discoveryWorker: new TestDiscoveryWorker(_input =>
             {
@@ -999,7 +1016,7 @@ public class RunWorkerTests
                                 <ProjectReference Include="../ProjectB/ProjectB.csproj" />
                               </ItemGroup>
                             </Project>
-                            """);
+                            """.SetEOL(EOL));
                         break;
                     case ("ProjectA.csproj", "Some.Package2"):
                         await File.WriteAllTextAsync(projectPath, """
@@ -1020,13 +1037,13 @@ public class RunWorkerTests
                                 </Reference>
                               </ItemGroup>
                             </Project>
-                            """);
+                            """.SetEOL(EOL));
                         await File.WriteAllTextAsync(packagesConfigPath, """
                             <?xml version="1.0" encoding="utf-8"?>
                             <packages>
                               <package id="Some.Package2" version="2.0.1" targetFramework="net8.0" />
                             </packages>
-                            """);
+                            """.SetEOL(EOL));
                         break;
                     case ("ProjectB.csproj", "Some.Package"):
                         await File.WriteAllTextAsync(projectPath, """
@@ -1038,7 +1055,7 @@ public class RunWorkerTests
                                 <PackageReference Include="Some.Package" Version="1.0.1" />
                               </ItemGroup>
                             </Project>
-                            """);
+                            """.SetEOL(EOL));
                         break;
                     case ("ProjectB.csproj", "Some.Package2"):
                         await File.WriteAllTextAsync(projectPath, """
@@ -1056,13 +1073,13 @@ public class RunWorkerTests
                                 </Reference>
                               </ItemGroup>
                             </Project>
-                            """);
+                            """.SetEOL(EOL));
                         await File.WriteAllTextAsync(packagesConfigPath, """
                             <?xml version="1.0" encoding="utf-8"?>
                             <packages>
                               <package id="Some.Package2" version="2.0.1" targetFramework="net8.0" />
                             </packages>
-                            """);
+                            """.SetEOL(EOL));
                         break;
                     default:
                         throw new NotSupportedException();
@@ -1083,7 +1100,7 @@ public class RunWorkerTests
                             <packages>
                               <package id="Some.Package2" version="2.0.0" targetFramework="net8.0" />
                             </packages>
-                            """))
+                            """.SetEOL(EOL)))
                     },
                     new DependencyFile()
                     {
@@ -1101,7 +1118,7 @@ public class RunWorkerTests
                                 <ProjectReference Include="../ProjectB/ProjectB.csproj" />
                               </ItemGroup>
                             </Project>
-                            """))
+                            """.SetEOL(EOL)))
                     },
                     new DependencyFile()
                     {
@@ -1112,7 +1129,7 @@ public class RunWorkerTests
                             <packages>
                               <package id="Some.Package2" version="2.0.0" targetFramework="net8.0" />
                             </packages>
-                            """))
+                            """.SetEOL(EOL)))
                     },
                     new DependencyFile()
                     {
@@ -1127,7 +1144,7 @@ public class RunWorkerTests
                                 <PackageReference Include="Some.Package" Version="1.0.0" />
                               </ItemGroup>
                             </Project>
-                            """))
+                            """.SetEOL(EOL)))
                     },
                 ],
                 BaseCommitSha = "TEST-COMMIT-SHA",
@@ -1337,7 +1354,7 @@ public class RunWorkerTests
                                 <packages>
                                   <package id="Some.Package2" version="2.0.1" targetFramework="net8.0" />
                                 </packages>
-                                """,
+                                """.SetEOL(EOL),
                         },
                         new DependencyFile()
                         {
@@ -1361,7 +1378,7 @@ public class RunWorkerTests
                                     </Reference>
                                   </ItemGroup>
                                 </Project>
-                                """,
+                                """.SetEOL(EOL),
                         },
                         new DependencyFile()
                         {
@@ -1372,7 +1389,7 @@ public class RunWorkerTests
                                 <packages>
                                   <package id="Some.Package2" version="2.0.1" targetFramework="net8.0" />
                                 </packages>
-                                """,
+                                """.SetEOL(EOL),
                         },
                         new DependencyFile()
                         {
@@ -1393,7 +1410,7 @@ public class RunWorkerTests
                                     </Reference>
                                   </ItemGroup>
                                 </Project>
-                                """,
+                                """.SetEOL(EOL),
                         },
                     ],
                     BaseCommitSha = "TEST-COMMIT-SHA",
@@ -1406,8 +1423,11 @@ public class RunWorkerTests
         );
     }
 
-    [Fact]
-    public async Task UpdatedFilesAreOnlyReportedOnce()
+    [Theory]
+    [InlineData(EOLType.CR)]
+    [InlineData(EOLType.LF)]
+    [InlineData(EOLType.CRLF)]
+    public async Task UpdatedFilesAreOnlyReportedOnce(EOLType EOL)
     {
         await RunAsync(
             job: new()
@@ -1434,14 +1454,14 @@ public class RunWorkerTests
                         <ProjectFile Include="project2/project2.csproj" />
                       </ItemGroup>
                     </Project>
-                    """),
+                    """.SetEOL(EOL)),
                 ("Directory.Build.props", """
                     <Project>
                       <PropertyGroup>
                         <SomePackageVersion>1.0.0</SomePackageVersion>
                       </PropertyGroup>
                     </Project>
-                    """),
+                    """.SetEOL(EOL)),
                 ("project1/project1.csproj", """
                     <Project Sdk="Microsoft.NET.Sdk">
                       <PropertyGroup>
@@ -1451,7 +1471,7 @@ public class RunWorkerTests
                         <PackageReference Include="Some.Package" Version="$(SomePackageVersion)" />
                       </ItemGroup>
                     </Project>
-                    """),
+                    """.SetEOL(EOL)),
                 ("project2/project2.csproj", """
                     <Project Sdk="Microsoft.NET.Sdk">
                       <PropertyGroup>
@@ -1461,7 +1481,7 @@ public class RunWorkerTests
                         <PackageReference Include="Some.Package" Version="$(SomePackageVersion)" />
                       </ItemGroup>
                     </Project>
-                    """)
+                    """.SetEOL(EOL))
             ],
             discoveryWorker: new TestDiscoveryWorker(_input =>
             {
@@ -1526,7 +1546,7 @@ public class RunWorkerTests
                         <SomePackageVersion>1.1.0</SomePackageVersion>
                       </PropertyGroup>
                     </Project>
-                    """);
+                    """.SetEOL(EOL));
                 return new UpdateOperationResult();
             }),
             expectedResult: new RunResult()
@@ -1543,7 +1563,7 @@ public class RunWorkerTests
                                 <SomePackageVersion>1.0.0</SomePackageVersion>
                               </PropertyGroup>
                             </Project>
-                            """))
+                            """.SetEOL(EOL)))
                     },
                     new DependencyFile()
                     {
@@ -1558,7 +1578,7 @@ public class RunWorkerTests
                                 <PackageReference Include="Some.Package" Version="$(SomePackageVersion)" />
                               </ItemGroup>
                             </Project>
-                            """))
+                            """.SetEOL(EOL)))
                     },
                     new DependencyFile()
                     {
@@ -1573,7 +1593,7 @@ public class RunWorkerTests
                                 <PackageReference Include="Some.Package" Version="$(SomePackageVersion)" />
                               </ItemGroup>
                             </Project>
-                            """))
+                            """.SetEOL(EOL)))
                     },
                 ],
                 BaseCommitSha = "TEST-COMMIT-SHA",
@@ -1698,7 +1718,7 @@ public class RunWorkerTests
                                     <SomePackageVersion>1.1.0</SomePackageVersion>
                                   </PropertyGroup>
                                 </Project>
-                                """,
+                                """.SetEOL(EOL),
                         }
                     ],
                     BaseCommitSha = "TEST-COMMIT-SHA",
@@ -1711,8 +1731,11 @@ public class RunWorkerTests
         );
     }
 
-    [Fact]
-    public async Task UpdatePackageWithDifferentVersionsInDifferentDirectories()
+    [Theory]
+    [InlineData(EOLType.CR)]
+    [InlineData(EOLType.LF)]
+    [InlineData(EOLType.CRLF)]
+    public async Task UpdatePackageWithDifferentVersionsInDifferentDirectories(EOLType EOL)
     {
         // this test passes `null` for discovery, analyze, and update workers to fully test the desired behavior
 
@@ -1754,7 +1777,7 @@ public class RunWorkerTests
                         <ProjectFile Include="library3\library3.csproj" />
                       </ItemGroup>
                     </Project>
-                    """),
+                    """.SetEOL(EOL)),
                 ("Directory.Build.props", "<Project />"),
                 ("Directory.Build.targets", "<Project />"),
                 ("Directory.Packages.props", """
@@ -1763,7 +1786,7 @@ public class RunWorkerTests
                         <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
                       </PropertyGroup>
                     </Project>
-                    """),
+                    """.SetEOL(EOL)),
                 ("library1/library1.csproj", """
                     <Project Sdk="Microsoft.NET.Sdk">
                       <PropertyGroup>
@@ -1773,7 +1796,7 @@ public class RunWorkerTests
                         <PackageReference Include="Some.Package" Version="2.0.0" />
                       </ItemGroup>
                     </Project>
-                    """),
+                    """.SetEOL(EOL)),
                 ("library2/library2.csproj", """
                     <Project Sdk="Microsoft.NET.Sdk">
                       <PropertyGroup>
@@ -1783,7 +1806,7 @@ public class RunWorkerTests
                         <PackageReference Include="Some.Package" Version="1.0.0" />
                       </ItemGroup>
                     </Project>
-                    """),
+                    """.SetEOL(EOL)),
                 ("library3/library3.csproj", """
                     <Project Sdk="Microsoft.NET.Sdk">
                       <PropertyGroup>
@@ -1793,7 +1816,7 @@ public class RunWorkerTests
                         <PackageReference Include="Package.With.Transitive.Dependency" Version="0.1.0" />
                       </ItemGroup>
                     </Project>
-                    """),
+                    """.SetEOL(EOL)),
             ],
             discoveryWorker: null,
             analyzeWorker: null,
@@ -1824,7 +1847,7 @@ public class RunWorkerTests
                                 <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
                               </PropertyGroup>
                             </Project>
-                            """))
+                            """.SetEOL(EOL)))
                     },
                     new DependencyFile()
                     {
@@ -1839,7 +1862,7 @@ public class RunWorkerTests
                                 <PackageReference Include="Some.Package" Version="2.0.0" />
                               </ItemGroup>
                             </Project>
-                            """))
+                            """.SetEOL(EOL)))
                     },
                     new DependencyFile()
                     {
@@ -1854,7 +1877,7 @@ public class RunWorkerTests
                                 <PackageReference Include="Some.Package" Version="1.0.0" />
                               </ItemGroup>
                             </Project>
-                            """))
+                            """.SetEOL(EOL)))
                     },
                     new DependencyFile()
                     {
@@ -1869,7 +1892,7 @@ public class RunWorkerTests
                                 <PackageReference Include="Package.With.Transitive.Dependency" Version="0.1.0" />
                               </ItemGroup>
                             </Project>
-                            """))
+                            """.SetEOL(EOL)))
                     }
                 ],
                 BaseCommitSha = "TEST-COMMIT-SHA",
@@ -2020,7 +2043,7 @@ public class RunWorkerTests
                                     <PackageReference Include="Some.Package" Version="2.0.0" />
                                   </ItemGroup>
                                 </Project>
-                                """
+                                """.SetEOL(EOL)
                         },
                         new()
                         {
@@ -2036,7 +2059,7 @@ public class RunWorkerTests
                                     <PackageReference Include="Some.Package" Version="2.0.0" />
                                   </ItemGroup>
                                 </Project>
-                                """
+                                """.SetEOL(EOL)
                         }
                     ],
                     BaseCommitSha = "TEST-COMMIT-SHA",

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Utilities/EOLHandlingTests.cs

@@ -0,0 +1,23 @@
+using System.Text.RegularExpressions;
+
+using Xunit;
+
+using static NuGetUpdater.Core.Utilities.EOLHandling;
+
+namespace NuGetUpdater.Core.Test.Utilities
+{
+    public class EOLHandlingTests
+    {
+        [Theory]
+        [InlineData(EOLType.LF, "\n")]
+        [InlineData(EOLType.CR, "\r")]
+        [InlineData(EOLType.CRLF, "\r\n")]
+        public void ValidateEOLNormalizesFromLF(EOLType eolType, string literal)
+        {
+            var teststring = "this\ris\na\r\nstring\rwith\nmixed\r\nline\rendings\n.";
+            var changed = teststring.SetEOL(eolType);
+            var lineEndings = Regex.Split(changed, "\\S+");
+            Assert.All(lineEndings, lineEnding => lineEnding.Equals(literal));
+        }
+    }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.297.2
+  version: 0.298.0
 platform: ruby
 authors:
 - Dependabot
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-19 00:00:00.000000000 Z
+date: 2025-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.297.2
+        version: 0.298.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.297.2
+        version: 0.298.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -375,6 +375,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.PackagesConfig.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Utilities/AssertEx.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Utilities/DiffUtil.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Utilities/EOLHandlingTests.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Utilities/JsonHelperTests.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Utilities/LinuxOnlyAttribute.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Utilities/MSBuildHelperTests.cs
@@ -493,6 +494,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/ConsoleLogger.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/DependencyConflictResolver.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/DotNetPackageCorrelationManager.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/EOLHandling.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/HashSetExtensions.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/ILogger.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/ImmutableArrayExtensions.cs
@@ -535,7 +537,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.297.2
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.298.0
 post_install_message:
 rdoc_options: []
 require_paths: