dependabot-nuget 0.308.0 → 0.310.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b510a9d8fdeba70a85b5eeab842a16642ec8e7beab71caa0e99f7e39bab6fd97
-  data.tar.gz: c7ef1903b20b5eda9eb1e02153cedc3972a00c574e0acb4ad212cbaf16e673e4
+  metadata.gz: 60d194f7c1aa9c0a61df000bad1d3030110a66a73cb86615c97fe0a3d053cc56
+  data.tar.gz: d87118a0fb76c9b571b27ec5a66a3ae65d808e17daa9d68cb734962ee3aa5fd7
 SHA512:
-  metadata.gz: '077584f16e3e95b98e69e74c67e3105dbf09455c19674bbc21929a91236fd5ba18b465f90103557e046ea867227bd6209e52d2faa958296234b020b0b24d09dc'
-  data.tar.gz: b55391c84e09601c30a4046cf4b29263ea40f17360de2f70d7830978d7a8dca8994aec472bc92fcf5c813ceac235c003c0b449b3e08759d2e99f507c275df64e
+  metadata.gz: 6d9fcc54e90b7c3ea93eedab675ce512a989176b02c676d442f9b9edcbbb5653dd9bacc777d77c52f1061ede4048523dfc9693a50c01ce089c5205dcf1cdfddb
+  data.tar.gz: 12abc6e3b3c04933d6d341ea9532d9dbae1cc121310c1f4252e0f7d9f2776861c1b3cb696d813a1c37717363c219c4196743665001ecf7ade03d8bf40aaf58bc

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.Cli.Test/EntryPointTests.Run.cs

@@ -50,10 +50,10 @@ public partial class EntryPointTests
                 },
                 expectedUrls:
                 [
-                    "/update_jobs/TEST-ID/update_dependency_list",
-                    "/update_jobs/TEST-ID/increment_metric",
-                    "/update_jobs/TEST-ID/create_pull_request",
-                    "/update_jobs/TEST-ID/mark_as_processed",
+                    "POST /update_jobs/TEST-ID/update_dependency_list",
+                    "POST /update_jobs/TEST-ID/increment_metric",
+                    "POST /update_jobs/TEST-ID/create_pull_request",
+                    "PATCH /update_jobs/TEST-ID/mark_as_processed",
                 ]
             );
         }
@@ -79,9 +79,9 @@ public partial class EntryPointTests
             await UpdateWorkerTestBase.MockNuGetPackagesInDirectory(packages, tempDirectory.DirectoryPath);
 
             var actualUrls = new List<string>();
-            using var http = TestHttpServer.CreateTestStringServer(url =>
+            using var http = TestHttpServer.CreateTestStringServer((method, url) =>
             {
-                actualUrls.Add(new Uri(url).PathAndQuery);
+                actualUrls.Add($"{method} {new Uri(url).PathAndQuery}");
                 return (200, "ok");
             });
             var args = new List<string>()

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/HttpApiHandler.cs

@@ -57,7 +57,7 @@ public class HttpApiHandler : IApiHandler
 
     public async Task MarkAsProcessed(MarkAsProcessed markAsProcessed)
     {
-        await PostAsJson("mark_as_processed", markAsProcessed);
+        await PatchAsJson("mark_as_processed", markAsProcessed);
     }
 
     internal static string Serialize(object body)
@@ -70,11 +70,20 @@ public class HttpApiHandler : IApiHandler
         return payload;
     }
 
-    private async Task PostAsJson(string endpoint, object body)
+    private Task PostAsJson(string endpoint, object body) => SendAsJson(endpoint, body, "POST");
+    private Task PatchAsJson(string endpoint, object body) => SendAsJson(endpoint, body, "PATCH");
+
+    private async Task SendAsJson(string endpoint, object body, string method)
     {
+        var uri = $"{_apiUrl}/update_jobs/{_jobId}/{endpoint}";
         var payload = Serialize(body);
         var content = new StringContent(payload, Encoding.UTF8, "application/json");
-        var response = await HttpClient.PostAsync($"{_apiUrl}/update_jobs/{_jobId}/{endpoint}", content);
+        var httpMethod = new HttpMethod(method);
+        var message = new HttpRequestMessage(httpMethod, uri)
+        {
+            Content = content
+        };
+        var response = await HttpClient.SendAsync(message);
         var _ = response.EnsureSuccessStatusCode();
     }
 }

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/Utilities/DependencyConflictResolver.cs

@@ -467,14 +467,6 @@ public class PackageManager
                             // Loop from the current version to the latest version, use next patch as a limit (unless there's a limit) so it doesn't look for versions that don't exist
                             for (NuGetVersion version = currentVersionParent; version <= latestVersion; version = NextPatch(version, versions))
                             {
-                                NuGetVersion nextPatch = NextPatch(version, versions);
-
-                                // If the next patch is the same as the currentVersioon, then the update is a Success
-                                if (nextPatch == version)
-                                {
-                                    return "Success";
-                                }
-
                                 string parentVersion = version.ToString();
                                 parent.NewVersion = parentVersion;
 

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Analyze/AnalyzeWorkerTests.cs

@@ -702,7 +702,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
 
                     // nothing else is found
                     return (404, Encoding.UTF8.GetBytes("{}"));
-            };
+            }
         }
         using var http1 = TestHttpServer.CreateTestServer(TestHttpHandler1);
         using var http2 = TestHttpServer.CreateTestServer(TestHttpHandler2);
@@ -874,7 +874,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
 
                     // nothing else is found
                     return (404, Encoding.UTF8.GetBytes("{}"));
-            };
+            }
         }
         using var http1 = TestHttpServer.CreateTestServer(TestHttpHandler1);
         using var http2 = TestHttpServer.CreateTestServer(TestHttpHandler2);
@@ -1064,7 +1064,7 @@ public partial class AnalyzeWorkerTests : AnalyzeWorkerTestBase
 
                     // nothing else is found
                     return (404, Encoding.UTF8.GetBytes("{}"));
-            };
+            }
         }
         using var http = TestHttpServer.CreateTestServer(TestHttpHandler);
         await TestAnalyzeAsync(