dependabot-nuget 0.308.0 → 0.309.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b510a9d8fdeba70a85b5eeab842a16642ec8e7beab71caa0e99f7e39bab6fd97
-  data.tar.gz: c7ef1903b20b5eda9eb1e02153cedc3972a00c574e0acb4ad212cbaf16e673e4
+  metadata.gz: 77852ce632b0aebac74d328dc9b052115ac4dbe98aecb1db4e1cbc70b8fea2f6
+  data.tar.gz: 1a651c11a375578cc87717817d7c6d168abff9521c130f38e7a8caf098ba73a2
 SHA512:
-  metadata.gz: '077584f16e3e95b98e69e74c67e3105dbf09455c19674bbc21929a91236fd5ba18b465f90103557e046ea867227bd6209e52d2faa958296234b020b0b24d09dc'
-  data.tar.gz: b55391c84e09601c30a4046cf4b29263ea40f17360de2f70d7830978d7a8dca8994aec472bc92fcf5c813ceac235c003c0b449b3e08759d2e99f507c275df64e
+  metadata.gz: cd1387d4a376c66e6a22cfc498ac0ff17485a8d27e8644e6566fcd60478f52446614aa2563dc7bc0c07dfe2dc92f5604bc37cc5f66e5da2e0a457981443e4226
+  data.tar.gz: 230228595e7540a4de04d201b6d6cbd171ec73ef2259c20bd186d95652ed29477cebdced964ccecbde1bcdf481ce36819c0712f4ac8650b1595498931efdca00

data/helpers/lib/NuGetUpdater/NuGetUpdater.Cli/NuGetUpdater.Cli.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(CommonTargetFramework)</TargetFramework>
     <OutputType>Exe</OutputType>
+    <_NETFrameworkTargetingPacksVersion>[1.0.3]</_NETFrameworkTargetingPacksVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,6 +14,24 @@
     <PackageReference Include="System.CommandLine" />
   </ItemGroup>
 
+  <ItemGroup Label="Targeting packs required for .NET Framework in SDK-style projects">
+    <PackageDownload Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(_NETFrameworkTargetingPacksVersion)" />
+    <PackageDownload Include="Microsoft.NETFramework.ReferenceAssemblies.net20" Version="$(_NETFrameworkTargetingPacksVersion)" />
+    <PackageDownload Include="Microsoft.NETFramework.ReferenceAssemblies.net35" Version="$(_NETFrameworkTargetingPacksVersion)" />
+    <PackageDownload Include="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="$(_NETFrameworkTargetingPacksVersion)" />
+    <PackageDownload Include="Microsoft.NETFramework.ReferenceAssemblies.net45" Version="$(_NETFrameworkTargetingPacksVersion)" />
+    <PackageDownload Include="Microsoft.NETFramework.ReferenceAssemblies.net451" Version="$(_NETFrameworkTargetingPacksVersion)" />
+    <PackageDownload Include="Microsoft.NETFramework.ReferenceAssemblies.net452" Version="$(_NETFrameworkTargetingPacksVersion)" />
+    <PackageDownload Include="Microsoft.NETFramework.ReferenceAssemblies.net46" Version="$(_NETFrameworkTargetingPacksVersion)" />
+    <PackageDownload Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="$(_NETFrameworkTargetingPacksVersion)" />
+    <PackageDownload Include="Microsoft.NETFramework.ReferenceAssemblies.net462" Version="$(_NETFrameworkTargetingPacksVersion)" />
+    <PackageDownload Include="Microsoft.NETFramework.ReferenceAssemblies.net47" Version="$(_NETFrameworkTargetingPacksVersion)" />
+    <PackageDownload Include="Microsoft.NETFramework.ReferenceAssemblies.net471" Version="$(_NETFrameworkTargetingPacksVersion)" />
+    <PackageDownload Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="$(_NETFrameworkTargetingPacksVersion)" />
+    <PackageDownload Include="Microsoft.NETFramework.ReferenceAssemblies.net48" Version="$(_NETFrameworkTargetingPacksVersion)" />
+    <PackageDownload Include="Microsoft.NETFramework.ReferenceAssemblies.net481" Version="$(_NETFrameworkTargetingPacksVersion)" />
+  </ItemGroup>
+
   <ItemGroup>
     <InternalsVisibleTo Include="NuGetUpdater.Cli.Test"/>
   </ItemGroup>

data/helpers/lib/NuGetUpdater/NuGetUpdater.Cli/Program.cs

@@ -1,4 +1,5 @@
 using System.CommandLine;
+using System.Text;
 
 using NuGetUpdater.Cli.Commands;
 
@@ -8,6 +9,10 @@ internal sealed class Program
 {
     internal static async Task<int> Main(string[] args)
     {
+        // Allow loading of legacy code pages.  This is useful for being able to load XML files with
+        //   <?xml version="1.0" encoding="windows-1252"?>
+        Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+
         var exitCode = 0;
         Action<int> setExitCode = code => exitCode = code;
 

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/SdkProjectDiscovery.cs

@@ -652,6 +652,12 @@ internal static class SdkProjectDiscovery
             projectEvaluation = build.FindEvaluation(project.EvaluationId);
         }
 
+        if (!File.Exists(projectEvaluation?.ProjectFile))
+        {
+            // WPF creates temporary projects during evaluation that no longer exist on disk for analysis, but they're not necessary for our purposes.
+            return null;
+        }
+
         return projectEvaluation;
     }
 

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

@@ -125,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 originalDependencyFileBOMs = new Dictionary<string, bool>();
         var actualUpdatedDependencies = new List<ReportedDependency>();
 
         // track original contents for later handling
@@ -133,8 +134,10 @@ public class RunWorker
             var repoFullPath = Path.Join(directory, fileName).FullyNormalizedRootedPath();
             var localFullPath = Path.Join(repoContentsPath.FullName, repoFullPath);
             var content = await File.ReadAllTextAsync(localFullPath);
+            var rawContent = await File.ReadAllBytesAsync(localFullPath);
             originalDependencyFileContents[repoFullPath] = content;
             originalDependencyFileEOFs[repoFullPath] = content.GetPredominantEOL();
+            originalDependencyFileBOMs[repoFullPath] = rawContent.HasBOM();
         }
 
         foreach (var project in discoveryResult.Projects)
@@ -257,15 +260,25 @@ public class RunWorker
             var updatedContent = await File.ReadAllTextAsync(localFullPath);
 
             updatedContent = updatedContent.SetEOL(originalDependencyFileEOFs[repoFullPath]);
-            await File.WriteAllTextAsync(localFullPath, updatedContent);
+            var updatedRawContent = updatedContent.SetBOM(originalDependencyFileBOMs[repoFullPath]);
+            await File.WriteAllBytesAsync(localFullPath, updatedRawContent);
 
             if (updatedContent != originalContent)
             {
+                var reportedContent = updatedContent;
+                var encoding = "utf-8";
+                if (originalDependencyFileBOMs[repoFullPath])
+                {
+                    reportedContent = Convert.ToBase64String(updatedRawContent);
+                    encoding = "base64";
+                }
+
                 updatedDependencyFiles[localFullPath] = new DependencyFile()
                 {
                     Name = Path.GetFileName(repoFullPath),
                     Directory = Path.GetDirectoryName(repoFullPath)!.NormalizePathToUnix(),
-                    Content = updatedContent,
+                    Content = reportedContent,
+                    ContentEncoding = encoding,
                 };
             }
         }
@@ -331,10 +344,17 @@ public class RunWorker
             Base64DependencyFiles = originalDependencyFileContents.OrderBy(kvp => kvp.Key).Select(kvp =>
             {
                 var fullPath = kvp.Key.FullyNormalizedRootedPath();
+                var rawContent = Encoding.UTF8.GetBytes(kvp.Value);
+                if (originalDependencyFileBOMs[kvp.Key])
+                {
+                    rawContent = Encoding.UTF8.GetPreamble().Concat(rawContent).ToArray();
+                }
+
                 return new DependencyFile()
                 {
                     Name = Path.GetFileName(fullPath),
-                    Content = Convert.ToBase64String(Encoding.UTF8.GetBytes(kvp.Value)),
+                    Content = Convert.ToBase64String(rawContent),
+                    ContentEncoding = "base64",
                     Directory = Path.GetDirectoryName(fullPath)!.NormalizePathToUnix(),
                 };
             }).ToArray(),

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/SpecialImportsConditionPatcher.cs

@@ -1,3 +1,5 @@
+using System.Collections.Immutable;
+
 using Microsoft.Language.Xml;
 
 namespace NuGetUpdater.Core.Updater
@@ -7,12 +9,19 @@ namespace NuGetUpdater.Core.Updater
         private readonly List<string?> _capturedConditions = new List<string?>();
         private readonly XmlFilePreAndPostProcessor _processor;
 
+        // These files only ship with a full Visual Studio install
         private readonly HashSet<string> ImportedFilesToIgnore = new(StringComparer.OrdinalIgnoreCase)
         {
             "Microsoft.TextTemplating.targets",
             "Microsoft.WebApplication.targets"
         };
 
+        // PackageReference elements with `GeneratePathProperty="true"` will cause a special property to be created.
+        private readonly ImmutableArray<string> PathSegmentsToIgnore =
+        [
+            "$(Pkg"
+        ];
+
         public SpecialImportsConditionPatcher(string projectFilePath)
         {
             _processor = new XmlFilePreAndPostProcessor(
@@ -25,8 +34,11 @@ namespace NuGetUpdater.Core.Updater
                         var projectPath = e.GetAttributeValue("Project");
                         if (projectPath is not null)
                         {
-                            var projectFileName = Path.GetFileName(projectPath.NormalizePathToUnix());
-                            return ImportedFilesToIgnore.Contains(projectFileName);
+                            var normalizedProjectPath = projectPath.NormalizePathToUnix();
+                            var projectFileName = Path.GetFileName(normalizedProjectPath);
+                            var hasForbiddenFile = ImportedFilesToIgnore.Contains(projectFileName);
+                            var hasForbiddenPathSegment = PathSegmentsToIgnore.Any(p => normalizedProjectPath.Contains(p, StringComparison.OrdinalIgnoreCase));
+                            return hasForbiddenFile || hasForbiddenPathSegment;
                         }
 
                         return false;

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

@@ -0,0 +1,35 @@
+using System.Text;
+
+namespace NuGetUpdater.Core.Utilities;
+
+internal static class BOMHandling
+{
+    public static bool HasBOM(this byte[] rawContent)
+    {
+        var bom = Encoding.UTF8.GetPreamble();
+        if (rawContent.Length >= bom.Length)
+        {
+            for (int i = 0; i < bom.Length; i++)
+            {
+                if (rawContent[i] != bom[i])
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+    public static byte[] SetBOM(this string content, bool setBOM)
+    {
+        var rawContent = Encoding.UTF8.GetBytes(content);
+        if (setBOM)
+        {
+            rawContent = Encoding.UTF8.GetPreamble().Concat(rawContent).ToArray();
+        }
+
+        return rawContent;
+    }
+}

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

@@ -19,6 +19,7 @@ namespace NuGetUpdater.Core.Test.Run;
 using static NuGetUpdater.Core.Utilities.EOLHandling;
 
 using TestFile = (string Path, string Content);
+using RawTestFile = (string Path, byte[] Content);
 
 public class RunWorkerTests
 {
@@ -135,7 +136,8 @@ public class RunWorkerTests
                                 <PackageReference Include="Some.Package" Version="1.0.0" />
                               </ItemGroup>
                             </Project>
-                            """.SetEOL(EOL)))
+                            """.SetEOL(EOL))),
+                        ContentEncoding = "base64"
                     }
                 ],
                 BaseCommitSha = "TEST-COMMIT-SHA",
@@ -359,7 +361,8 @@ public class RunWorkerTests
                                 <PackageReference Include="Some.Package;Some.Package2" Version="1.0.0" />
                               </ItemGroup>
                             </Project>
-                            """.SetEOL(EOL)))
+                            """.SetEOL(EOL))),
+                        ContentEncoding = "base64"
                     }
                 ],
                 BaseCommitSha = "TEST-COMMIT-SHA",
@@ -732,7 +735,8 @@ public class RunWorkerTests
                             <packages>
                               <package id="Some.Package2" version="2.0.0" targetFramework="net8.0" />
                             </packages>
-                            """.SetEOL(EOL)))
+                            """.SetEOL(EOL))),
+                        ContentEncoding = "base64"
                     },
                     new DependencyFile()
                     {
@@ -747,7 +751,8 @@ public class RunWorkerTests
                                 <PackageReference Include="Some.Package" Version="1.0.0" />
                               </ItemGroup>
                             </Project>
-                            """.SetEOL(EOL)))
+                            """.SetEOL(EOL))),
+                        ContentEncoding = "base64"
                     },
                 ],
                 BaseCommitSha = "TEST-COMMIT-SHA",
@@ -1152,7 +1157,8 @@ public class RunWorkerTests
                             <packages>
                               <package id="Some.Package2" version="2.0.0" targetFramework="net8.0" />
                             </packages>
-                            """.SetEOL(EOL)))
+                            """.SetEOL(EOL))),
+                        ContentEncoding = "base64"
                     },
                     new DependencyFile()
                     {
@@ -1170,7 +1176,8 @@ public class RunWorkerTests
                                 <ProjectReference Include="../ProjectB/ProjectB.csproj" />
                               </ItemGroup>
                             </Project>
-                            """.SetEOL(EOL)))
+                            """.SetEOL(EOL))),
+                        ContentEncoding = "base64"
                     },
                     new DependencyFile()
                     {
@@ -1181,7 +1188,8 @@ public class RunWorkerTests
                             <packages>
                               <package id="Some.Package2" version="2.0.0" targetFramework="net8.0" />
                             </packages>
-                            """.SetEOL(EOL)))
+                            """.SetEOL(EOL))),
+                        ContentEncoding = "base64"
                     },
                     new DependencyFile()
                     {
@@ -1196,7 +1204,8 @@ public class RunWorkerTests
                                 <PackageReference Include="Some.Package" Version="1.0.0" />
                               </ItemGroup>
                             </Project>
-                            """.SetEOL(EOL)))
+                            """.SetEOL(EOL))),
+                        ContentEncoding = "base64"
                     },
                 ],
                 BaseCommitSha = "TEST-COMMIT-SHA",
@@ -1625,7 +1634,8 @@ public class RunWorkerTests
                                 <SomePackageVersion>1.0.0</SomePackageVersion>
                               </PropertyGroup>
                             </Project>
-                            """.SetEOL(EOL)))
+                            """.SetEOL(EOL))),
+                        ContentEncoding = "base64"
                     },
                     new DependencyFile()
                     {
@@ -1640,7 +1650,8 @@ public class RunWorkerTests
                                 <PackageReference Include="Some.Package" Version="$(SomePackageVersion)" />
                               </ItemGroup>
                             </Project>
-                            """.SetEOL(EOL)))
+                            """.SetEOL(EOL))),
+                        ContentEncoding = "base64"
                     },
                     new DependencyFile()
                     {
@@ -1655,7 +1666,8 @@ public class RunWorkerTests
                                 <PackageReference Include="Some.Package" Version="$(SomePackageVersion)" />
                               </ItemGroup>
                             </Project>
-                            """.SetEOL(EOL)))
+                            """.SetEOL(EOL))),
+                        ContentEncoding = "base64"
                     },
                 ],
                 BaseCommitSha = "TEST-COMMIT-SHA",
@@ -1891,13 +1903,15 @@ public class RunWorkerTests
                     {
                         Directory = "/",
                         Name = "Directory.Build.props",
-                        Content = Convert.ToBase64String(Encoding.UTF8.GetBytes("<Project />"))
+                        Content = Convert.ToBase64String(Encoding.UTF8.GetBytes("<Project />")),
+                        ContentEncoding = "base64"
                     },
                     new DependencyFile()
                     {
                         Directory = "/",
                         Name = "Directory.Build.targets",
-                        Content = Convert.ToBase64String(Encoding.UTF8.GetBytes("<Project />"))
+                        Content = Convert.ToBase64String(Encoding.UTF8.GetBytes("<Project />")),
+                        ContentEncoding = "base64"
                     },
                     new DependencyFile()
                     {
@@ -1909,7 +1923,8 @@ public class RunWorkerTests
                                 <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
                               </PropertyGroup>
                             </Project>
-                            """.SetEOL(EOL)))
+                            """.SetEOL(EOL))),
+                        ContentEncoding = "base64"
                     },
                     new DependencyFile()
                     {
@@ -1924,7 +1939,8 @@ public class RunWorkerTests
                                 <PackageReference Include="Some.Package" Version="2.0.0" />
                               </ItemGroup>
                             </Project>
-                            """.SetEOL(EOL)))
+                            """.SetEOL(EOL))),
+                        ContentEncoding = "base64"
                     },
                     new DependencyFile()
                     {
@@ -1939,7 +1955,8 @@ public class RunWorkerTests
                                 <PackageReference Include="Some.Package" Version="1.0.0" />
                               </ItemGroup>
                             </Project>
-                            """.SetEOL(EOL)))
+                            """.SetEOL(EOL))),
+                        ContentEncoding = "base64"
                     },
                     new DependencyFile()
                     {
@@ -1954,7 +1971,8 @@ public class RunWorkerTests
                                 <PackageReference Include="Package.With.Transitive.Dependency" Version="0.1.0" />
                               </ItemGroup>
                             </Project>
-                            """.SetEOL(EOL)))
+                            """.SetEOL(EOL))),
+                        ContentEncoding = "base64"
                     }
                 ],
                 BaseCommitSha = "TEST-COMMIT-SHA",
@@ -2184,7 +2202,8 @@ public class RunWorkerTests
                     {
                         Directory = "/",
                         Name = "project.csproj",
-                        Content = Convert.ToBase64String(Encoding.UTF8.GetBytes("contents irrelevant"))
+                        Content = Convert.ToBase64String(Encoding.UTF8.GetBytes("contents irrelevant")),
+                        ContentEncoding = "base64"
                     }
                 ],
                 BaseCommitSha = "TEST-COMMIT-SHA",
@@ -2273,7 +2292,8 @@ public class RunWorkerTests
                     {
                         Directory = "/",
                         Name = "project.csproj",
-                        Content = Convert.ToBase64String(Encoding.UTF8.GetBytes("contents irrelevant"))
+                        Content = Convert.ToBase64String(Encoding.UTF8.GetBytes("contents irrelevant")),
+                        ContentEncoding = "base64"
                     }
                 ],
                 BaseCommitSha = "TEST-COMMIT-SHA",
@@ -2391,13 +2411,15 @@ public class RunWorkerTests
                     {
                         Directory = "/.config",
                         Name = "dotnet-tools.json",
-                        Content = Convert.ToBase64String(Encoding.UTF8.GetBytes("dotnet-tools.json content old"))
+                        Content = Convert.ToBase64String(Encoding.UTF8.GetBytes("dotnet-tools.json content old")),
+                        ContentEncoding = "base64"
                     },
                     new()
                     {
                         Directory = "/",
                         Name = "global.json",
-                        Content = Convert.ToBase64String(Encoding.UTF8.GetBytes("global.json content old"))
+                        Content = Convert.ToBase64String(Encoding.UTF8.GetBytes("global.json content old")),
+                        ContentEncoding = "base64"
                     },
                 ],
                 BaseCommitSha = "TEST-COMMIT-SHA",
@@ -2598,7 +2620,8 @@ public class RunWorkerTests
                     {
                         Directory = "/",
                         Name = "project.csproj",
-                        Content = Convert.ToBase64String(Encoding.UTF8.GetBytes("contents irrelevant"))
+                        Content = Convert.ToBase64String(Encoding.UTF8.GetBytes("contents irrelevant")),
+                        ContentEncoding = "base64"
                     }
                 ],
                 BaseCommitSha = "TEST-COMMIT-SHA",
@@ -2637,18 +2660,258 @@ public class RunWorkerTests
         );
     }
 
-    private static async Task RunAsync(Job job, TestFile[] files, IDiscoveryWorker? discoveryWorker, IAnalyzeWorker? analyzeWorker, IUpdaterWorker? updaterWorker, RunResult expectedResult, object[] expectedApiMessages, MockNuGetPackage[]? packages = null, ExperimentsManager? experimentsManager = null, string? repoContentsPath = null)
+    [Fact]
+    public async Task ByteOrderMarksAreDetectedAndRestored()
+    {
+        var rawBOM = Encoding.UTF8.GetPreamble();
+
+        // file1 goes from BOM to no BOM
+        var file1ContentOriginal = rawBOM.Concat(Encoding.ASCII.GetBytes("content1")).ToArray();
+        var file1ContentUpdated = Encoding.ASCII.GetBytes("updated1");
+
+        // file2 goes from no BOM to BOM
+        var file2ContentOriginal = Encoding.ASCII.GetBytes("content2");
+        var file2ContentUpdated = rawBOM.Concat(Encoding.ASCII.GetBytes("updated2")).ToArray();
+
+        await RunAsync(
+            job: new Job()
+            {
+                Source = new()
+                {
+                    Provider = "github",
+                    Repo = "test/repo",
+                    Directory = "/",
+                }
+            },
+            rawFiles:
+            [
+                ("file1", file1ContentOriginal),
+                ("file2", file2ContentOriginal)
+            ],
+            discoveryWorker: TestDiscoveryWorker.FromResults(("/", new()
+            {
+                Path = "/",
+                Projects = [
+                    new()
+                    {
+                        FilePath = "file1",
+                        Dependencies = [new("Dependency1", "1.0.0", DependencyType.PackageReference)],
+                        ImportedFiles = [],
+                        AdditionalFiles = [],
+                    },
+                    new()
+                    {
+                        FilePath = "file2",
+                        Dependencies = [new("Dependency2", "2.0.0", DependencyType.PackageReference)],
+                        ImportedFiles = [],
+                        AdditionalFiles = [],
+                    }
+                ]
+            })),
+            analyzeWorker: new TestAnalyzeWorker(args =>
+            {
+                AnalysisResult result = args.Item3.Name switch
+                {
+                    "Dependency1" => new()
+                    {
+                        CanUpdate = true,
+                        UpdatedVersion = "1.0.1",
+                        UpdatedDependencies = [new("Dependency1", "1.0.1", DependencyType.PackageReference)],
+                    },
+                    "Dependency2" => new()
+                    {
+                        CanUpdate = true,
+                        UpdatedVersion = "2.0.1",
+                        UpdatedDependencies = [new("Dependency2", "2.0.1", DependencyType.PackageReference)],
+                    },
+                    _ => throw new NotImplementedException()
+                };
+                return Task.FromResult(result);
+            }),
+            updaterWorker: new TestUpdaterWorker(async args =>
+            {
+                var (repoRoot, filePath, dependencyName, _previousVersion, _newVersion, _isTransitive) = args;
+
+                // file1 is rewritten without BOM, file2 is rewritten with BOM
+                var (updatedFileContent, newVersion) = dependencyName switch
+                {
+                    "Dependency1" => (file1ContentUpdated, "1.0.1"),
+                    "Dependency2" => (file2ContentUpdated, "2.0.1"),
+                    _ => throw new NotImplementedException(),
+                };
+                var fullFilePath = Path.Join(repoRoot, filePath);
+                await File.WriteAllBytesAsync(fullFilePath, updatedFileContent);
+                return new UpdateOperationResult()
+                {
+                    UpdateOperations = [new DirectUpdate()
+                    {
+                        DependencyName = dependencyName,
+                        NewVersion = NuGetVersion.Parse(newVersion),
+                        UpdatedFiles = [filePath],
+                    }],
+                };
+            }),
+            expectedResult: new()
+            {
+                Base64DependencyFiles = [
+                    new()
+                    {
+                        Directory = "/",
+                        Name = "file1",
+                        Content = Convert.ToBase64String(file1ContentOriginal),
+                        ContentEncoding = "base64",
+                    },
+                    new()
+                    {
+                        Directory = "/",
+                        Name = "file2",
+                        Content = Convert.ToBase64String(file2ContentOriginal),
+                        ContentEncoding = "base64",
+                    }
+                ],
+                BaseCommitSha = "TEST-COMMIT-SHA",
+            },
+            expectedApiMessages: [
+                new UpdatedDependencyList()
+                {
+                    Dependencies = [
+                        new()
+                        {
+                            Name = "Dependency1",
+                            Version = "1.0.0",
+                            Requirements = [
+                                new()
+                                {
+                                    Requirement = "1.0.0",
+                                    File = "/file1",
+                                    Groups = ["dependencies"],
+                                }
+                            ]
+                        },
+                        new()
+                        {
+                            Name = "Dependency2",
+                            Version = "2.0.0",
+                            Requirements = [
+                                new()
+                                {
+                                    Requirement = "2.0.0",
+                                    File = "/file2",
+                                    Groups = ["dependencies"]
+                                }
+                            ]
+                        }
+                    ],
+                    DependencyFiles = ["/file1", "/file2"]
+                },
+                new IncrementMetric()
+                {
+                    Metric = "updater.started",
+                    Tags = new()
+                    {
+                        ["operation"] = "group_update_all_versions"
+                    }
+                },
+                new CreatePullRequest()
+                {
+                    Dependencies =
+                    [
+                        new ReportedDependency()
+                        {
+                            Name = "Dependency1",
+                            Version = "1.0.1",
+                            Requirements =
+                            [
+                                new ReportedRequirement()
+                                {
+                                    Requirement = "1.0.1",
+                                    File = "/file1",
+                                    Groups = ["dependencies"],
+                                    Source = new() { SourceUrl = null },
+                                }
+                            ],
+                            PreviousVersion = "1.0.0",
+                            PreviousRequirements =
+                            [
+                                new ReportedRequirement()
+                                {
+                                    Requirement = "1.0.0",
+                                    File = "/file1",
+                                    Groups = ["dependencies"],
+                                }
+                            ],
+                        },
+                        new ReportedDependency()
+                        {
+                            Name = "Dependency2",
+                            Version = "2.0.1",
+                            Requirements =
+                            [
+                                new ReportedRequirement()
+                                {
+                                    Requirement = "2.0.1",
+                                    File = "/file2",
+                                    Groups = ["dependencies"],
+                                    Source = new() { SourceUrl = null },
+                                }
+                            ],
+                            PreviousVersion = "2.0.0",
+                            PreviousRequirements =
+                            [
+                                new ReportedRequirement()
+                                {
+                                    Requirement = "2.0.0",
+                                    File = "/file2",
+                                    Groups = ["dependencies"],
+                                }
+                            ],
+                        },
+                    ],
+                    UpdatedDependencyFiles =
+                    [
+                        // original line endings have been restored
+                        new DependencyFile()
+                        {
+                            Name = "file1",
+                            Directory = "/",
+                            Content = Convert.ToBase64String(rawBOM.Concat(file1ContentUpdated).ToArray()),
+                            ContentEncoding = "base64",
+                        },
+                        new DependencyFile()
+                        {
+                            Name = "file2",
+                            Directory = "/",
+                            Content = "updated2",
+                        },
+                    ],
+                    BaseCommitSha = "TEST-COMMIT-SHA",
+                    CommitMessage = TestPullRequestCommitMessage,
+                    PrTitle = TestPullRequestTitle,
+                    PrBody = TestPullRequestBody,
+                },
+                new MarkAsProcessed("TEST-COMMIT-SHA"),
+            ]
+        );
+    }
+
+    private static Task RunAsync(Job job, TestFile[] files, IDiscoveryWorker? discoveryWorker, IAnalyzeWorker? analyzeWorker, IUpdaterWorker? updaterWorker, RunResult expectedResult, object[] expectedApiMessages, MockNuGetPackage[]? packages = null, ExperimentsManager? experimentsManager = null, string? repoContentsPath = null)
+    {
+        var rawTestFiles = files.Select(f => (f.Path, Encoding.UTF8.GetBytes(f.Content))).ToArray();
+        return RunAsync(job, rawTestFiles, discoveryWorker, analyzeWorker, updaterWorker, expectedResult, expectedApiMessages, packages, experimentsManager, repoContentsPath);
+    }
+
+    private static async Task RunAsync(Job job, RawTestFile[] rawFiles, IDiscoveryWorker? discoveryWorker, IAnalyzeWorker? analyzeWorker, IUpdaterWorker? updaterWorker, RunResult expectedResult, object[] expectedApiMessages, MockNuGetPackage[]? packages = null, ExperimentsManager? experimentsManager = null, string? repoContentsPath = null)
     {
         // arrange
         using var tempDirectory = new TemporaryDirectory();
         repoContentsPath ??= tempDirectory.DirectoryPath;
         await UpdateWorkerTestBase.MockNuGetPackagesInDirectory(packages, repoContentsPath);
-        foreach (var (path, content) in files)
+        foreach (var (path, content) in rawFiles)
         {
             var fullPath = Path.Combine(repoContentsPath, path);
             var directory = Path.GetDirectoryName(fullPath)!;
             Directory.CreateDirectory(directory);
-            await File.WriteAllTextAsync(fullPath, content);
+            await File.WriteAllBytesAsync(fullPath, content);
         }
 
         // act

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/TestDiscoveryWorker.cs

@@ -16,14 +16,13 @@ internal class TestDiscoveryWorker : IDiscoveryWorker
         return _getResult((repoRootPath, workspacePath));
     }
 
-    public static TestDiscoveryWorker FromResults(params (string RepoRootPath, string WorkspacePath, WorkspaceDiscoveryResult Result)[] results)
+    public static TestDiscoveryWorker FromResults(params (string WorkspacePath, WorkspaceDiscoveryResult Result)[] results)
     {
-        return new TestDiscoveryWorker(((string RepoRootPath, string WorkspacePath) input) =>
+        return new TestDiscoveryWorker(((string _RepoRootPath, string WorkspacePath) input) =>
         {
             foreach (var set in results)
             {
-                if (set.RepoRootPath == input.RepoRootPath &&
-                    set.WorkspacePath == input.WorkspacePath)
+                if (set.WorkspacePath == input.WorkspacePath)
                 {
                     return Task.FromResult(set.Result);
                 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/SpecialFilePatcherTests.cs

@@ -31,6 +31,8 @@ public class SpecialFilePatcherTests
 
     public static IEnumerable<object[]> SpecialImportsConditionPatcherTestData()
     {
+        // magic file names
+
         // one-off test to verify namespaces don't interfere
         yield return
         [
@@ -95,5 +97,22 @@ public class SpecialFilePatcherTests
             </Project>
             """
         ];
+
+        // magic property segments
+        yield return
+        [
+            // fileContent
+            """
+            <Project>
+              <Import Project="$(PkgSome_Package)\build\Some.Package.targets" />
+            </Project>
+            """,
+            // expectedPatchedContent
+            """
+            <Project>
+              <Import Project="$(PkgSome_Package)\build\Some.Package.targets" Condition="false" />
+            </Project>
+            """
+        ];
     }
 }

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

@@ -0,0 +1,66 @@
+using NuGetUpdater.Core.Utilities;
+
+using Xunit;
+
+namespace NuGetUpdater.Core.Test.Utilities;
+
+public class BOMHandlingTests
+{
+    [Theory]
+    [MemberData(nameof(HasBOMTestData))]
+    public void HasBOM(byte[] content, bool expectedHasBOM)
+    {
+        var actualHasBOM = content.HasBOM();
+        Assert.Equal(expectedHasBOM, actualHasBOM);
+    }
+
+    [Theory]
+    [MemberData(nameof(SetBOMTestData))]
+    public void SetBOM(string content, bool setBOM, byte[] expectedBytes)
+    {
+        var actualBytes = content.SetBOM(setBOM);
+        AssertEx.Equal(expectedBytes, actualBytes);
+    }
+
+    public static IEnumerable<object[]> HasBOMTestData()
+    {
+        yield return
+        [
+            // content
+            new byte[] { 0xEF, 0xBB, 0xBF, (byte)'A' },
+            // expectedHasBOM
+            true
+        ];
+
+        yield return
+        [
+            // content
+            new byte[] { (byte)'A' },
+            // expectedHasBOM
+            false
+        ];
+    }
+
+    public static IEnumerable<object[]> SetBOMTestData()
+    {
+        yield return
+        [
+            // content
+            "A",
+            // setBOM
+            true,
+            // expectedBytes
+            new byte[] { 0xEF, 0xBB, 0xBF, (byte)'A' }
+        ];
+
+        yield return
+        [
+            // content
+            "A",
+            // setBOM
+            false,
+            // expectedBytes
+            new byte[] { (byte)'A' }
+        ];
+    }
+}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.308.0
+  version: 0.309.0
 platform: ruby
 authors:
 - Dependabot
 bindir: bin
 cert_chain: []
-date: 2025-04-12 00:00:00.000000000 Z
+date: 2025-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.308.0
+        version: 0.309.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.308.0
+        version: 0.309.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -378,6 +378,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.PackageReference.cs
 - 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/BOMHandlingTests.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
@@ -503,6 +504,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/UpdateResult.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/UpdaterWorker.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/XmlFilePreAndPostProcessor.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/BOMHandling.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/CollectionExtensions.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/ConsoleLogger.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/DependencyConflictResolver.cs
@@ -551,7 +553,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.308.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.309.0
 rdoc_options: []
 require_paths:
 - lib