From 75622172d19ed8b463cc0132839a494ab7fee8d8 Mon Sep 17 00:00:00 2001 From: Genelle Miffleton <137794979+GenelleM@users.noreply.github.com> Date: Tue, 23 Jan 2024 17:10:28 -0800 Subject: [PATCH 1/2] Update PackageSpecWriter.cs Resolves issues 13182 and 13183 to set a comparer and avoid allocating a new version string in SetCentralDependencies method --- src/NuGet.Core/NuGet.ProjectModel/PackageSpecWriter.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NuGet.Core/NuGet.ProjectModel/PackageSpecWriter.cs b/src/NuGet.Core/NuGet.ProjectModel/PackageSpecWriter.cs index 7c88d3ef8b2..f0a9b9fe2a1 100644 --- a/src/NuGet.Core/NuGet.ProjectModel/PackageSpecWriter.cs +++ b/src/NuGet.Core/NuGet.ProjectModel/PackageSpecWriter.cs @@ -663,9 +663,9 @@ private static void SetCentralDependencies(IObjectWriter writer, ICollection dep.Name)) + foreach (var dependency in centralPackageVersions.OrderBy(dep => dep.Name, StringComparer.OrdinalIgnoreCase)) { - writer.WriteNameValue(name: dependency.Name, value: dependency.VersionRange.ToNormalizedString()); + writer.WriteNameValue(name: dependency.Name, value: dependency.VersionRange.OriginalString ?? dependency.VersionRange.ToNormalizedString()); } } From c39391fa80479460da97e93635da2afb5a1ca620 Mon Sep 17 00:00:00 2001 From: Genelle Miffleton <137794979+GenelleM@users.noreply.github.com> Date: Tue, 30 Jan 2024 19:34:51 -0800 Subject: [PATCH 2/2] Update DependencyGraphSpec_CentralVersionDependencies.json Updating test to reflect change in how the dgspec centralpackageversions is written. --- .../DependencyGraphSpec_CentralVersionDependencies.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/NuGet.Core.Tests/NuGet.ProjectModel.Test/compiler/resources/DependencyGraphSpec_CentralVersionDependencies.json b/test/NuGet.Core.Tests/NuGet.ProjectModel.Test/compiler/resources/DependencyGraphSpec_CentralVersionDependencies.json index cc056a3774c..7b789762bf9 100644 --- a/test/NuGet.Core.Tests/NuGet.ProjectModel.Test/compiler/resources/DependencyGraphSpec_CentralVersionDependencies.json +++ b/test/NuGet.Core.Tests/NuGet.ProjectModel.Test/compiler/resources/DependencyGraphSpec_CentralVersionDependencies.json @@ -21,8 +21,8 @@ } }, "centralPackageVersions": { - "bar": "[2.0.0, )", - "foo": "[1.0.0, )" + "bar": "2.0.0", + "foo": "1.0.0" }, "assetTargetFallback": true }