cleanup

nkolev92 · nkolev92 · commit 198bee18c4f8 · 2025-10-02T12:39:31.000-07:00
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Projects/PackageReferenceProject.cs b/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Projects/PackageReferenceProject.cs
@@ -383,7 +383,7 @@ internal static Dictionary<string, TransitiveEntry> ComputeTransitivePackageOrig
             // For each target framework graph (Framework, RID)-pair:
             foreach (LockFileTarget targetFxGraph in targetsList)
             {
-                var key = new FrameworkRuntimePair(targetFxGraph.TargetAlias, targetFxGraph.TargetFramework, targetFxGraph.RuntimeIdentifier);
+                var key = new FrameworkRuntimePair(targetFxGraph.TargetFramework, targetFxGraph.RuntimeIdentifier);
 
                 foreach (var directPkg in installedPackages) // 3.1 For each direct dependency
                 {
diff --git a/src/NuGet.Core/NuGet.Commands/PublicAPI/net472/PublicAPI.Unshipped.txt b/src/NuGet.Core/NuGet.Commands/PublicAPI/net472/PublicAPI.Unshipped.txt
@@ -1,4 +1,5 @@
 #nullable enable
 ~NuGet.Commands.IRestoreTargetGraph.TargetAlias.get -> string
+~NuGet.Commands.IRestoreTargetGraph.TargetGraphNameWithAlias.get -> string
 ~NuGet.Commands.RestoreTargetGraph.TargetAlias.get -> string
 ~NuGet.Commands.RestoreTargetGraph.TargetGraphNameWithAlias.get -> string
diff --git a/src/NuGet.Core/NuGet.Commands/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/NuGet.Core/NuGet.Commands/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -1,4 +1,5 @@
 #nullable enable
 ~NuGet.Commands.IRestoreTargetGraph.TargetAlias.get -> string
+~NuGet.Commands.IRestoreTargetGraph.TargetGraphNameWithAlias.get -> string
 ~NuGet.Commands.RestoreTargetGraph.TargetAlias.get -> string
 ~NuGet.Commands.RestoreTargetGraph.TargetGraphNameWithAlias.get -> string
diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/RestoreTargetGraph.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/RestoreTargetGraph.cs
@@ -1,8 +1,10 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.Linq;
 using NuGet.Client;
 using NuGet.Common;
@@ -81,7 +83,7 @@ internal RestoreTargetGraph(IEnumerable<ResolverConflict> conflicts,
             Framework = framework;
             Graphs = graphs;
             TargetGraphName = FrameworkRuntimePair.GetTargetGraphName(Framework, RuntimeIdentifier);
-            TargetGraphNameWithAlias = FrameworkRuntimePair.GetTargetGraphName(TargetAlias, RuntimeIdentifier);
+            TargetGraphNameWithAlias = GetTargetGraphName(TargetAlias, RuntimeIdentifier);
             Conventions = new ManagedCodeConventions(runtimeGraph);
 
             Install = install;
@@ -91,6 +93,24 @@ internal RestoreTargetGraph(IEnumerable<ResolverConflict> conflicts,
             ResolvedDependencies = resolvedDependencies;
         }
 
+        internal static string GetTargetGraphName(string targetAlias, string runtimeIdentifier)
+        {
+            if (targetAlias is null) throw new ArgumentNullException(nameof(targetAlias));
+
+            if (string.IsNullOrEmpty(runtimeIdentifier))
+            {
+                return targetAlias;
+            }
+            else
+            {
+                return string.Format(
+                    CultureInfo.InvariantCulture,
+                    "{0}/{1}",
+                    targetAlias,
+                    runtimeIdentifier);
+            }
+        }
+
         internal static RestoreTargetGraph Create(IEnumerable<GraphNode<RemoteResolveResult>> graphs, RemoteWalkContext context, ILogger logger, string targetAlias, NuGetFramework framework)
         {
             return Create(RuntimeGraph.Empty, graphs, context, logger, targetAlias, framework, runtimeIdentifier: null);
diff --git a/src/NuGet.Core/NuGet.Frameworks/PublicAPI.Shipped.txt b/src/NuGet.Core/NuGet.Frameworks/PublicAPI.Shipped.txt
@@ -120,6 +120,7 @@ NuGet.Frameworks.FrameworkRuntimePair
 NuGet.Frameworks.FrameworkRuntimePair.CompareTo(NuGet.Frameworks.FrameworkRuntimePair? other) -> int
 NuGet.Frameworks.FrameworkRuntimePair.Equals(NuGet.Frameworks.FrameworkRuntimePair? other) -> bool
 NuGet.Frameworks.FrameworkRuntimePair.Framework.get -> NuGet.Frameworks.NuGetFramework!
+NuGet.Frameworks.FrameworkRuntimePair.FrameworkRuntimePair(NuGet.Frameworks.NuGetFramework! framework, string? runtimeIdentifier) -> void
 NuGet.Frameworks.FrameworkRuntimePair.Name.get -> string!
 NuGet.Frameworks.FrameworkRuntimePair.RuntimeIdentifier.get -> string!
 NuGet.Frameworks.FrameworkSpecificMapping
diff --git a/src/NuGet.Core/NuGet.Packaging/RuntimeModel/JsonRuntimeFormat.cs b/src/NuGet.Core/NuGet.Packaging/RuntimeModel/JsonRuntimeFormat.cs
@@ -185,11 +185,11 @@ private static IEnumerable<FrameworkRuntimePair> ReadCompatibilitySets(KeyValueP
                 case JTokenType.Array:
                     foreach (var value in (JArray)property.Value)
                     {
-                        yield return new FrameworkRuntimePair(framework.GetShortFolderName(), framework, value.Value<string>());
+                        yield return new FrameworkRuntimePair(framework, value.Value<string>());
                     }
                     break;
                 case JTokenType.String:
-                    yield return new FrameworkRuntimePair(framework.GetShortFolderName(), framework, property.Value.ToString());
+                    yield return new FrameworkRuntimePair(framework, property.Value.ToString());
                     break;
                     // Other token types are not supported
             }
diff --git a/src/NuGet.Core/NuGet.ProjectModel/JsonPackageSpecReader.Utf8JsonStreamReader.cs b/src/NuGet.Core/NuGet.ProjectModel/JsonPackageSpecReader.Utf8JsonStreamReader.cs
@@ -575,7 +575,7 @@ private static IEnumerable<FrameworkRuntimePair> ReadCompatibilitySets(IReadOnly
 
             foreach (string value in values)
             {
-                yield return new FrameworkRuntimePair(string.Empty, framework, value);
+                yield return new FrameworkRuntimePair(framework, value);
             }
         }
 
diff --git a/test/NuGet.Clients.Tests/NuGet.PackageManagement.VisualStudio.Test/Projects/PackageReferenceProjectTests.cs b/test/NuGet.Clients.Tests/NuGet.PackageManagement.VisualStudio.Test/Projects/PackageReferenceProjectTests.cs
@@ -23,7 +23,7 @@ public void MergeTransitiveOrigin_DuplicateTransitiveOrigins_Merges()
             var te = new Dictionary<FrameworkRuntimePair, IList<PackageReference>>
             {
                 {
-                    new FrameworkRuntimePair("net472", net472, string.Empty),
+                    new FrameworkRuntimePair(net472, string.Empty),
                     new List<PackageReference>()
                     {
                         new PackageReference(new PackageIdentity("package1", new NuGetVersion("0.0.1")), net472),
@@ -47,15 +47,15 @@ public void MergeTransitiveOrigin_MultiTargeting_MergesLatest()
             var te = new Dictionary<FrameworkRuntimePair, IList<PackageReference>>
             {
                 {
-                    new FrameworkRuntimePair("net472", net472, string.Empty),
+                    new FrameworkRuntimePair(net472, string.Empty),
                     new List<PackageReference>()
                     {
                         new PackageReference(new PackageIdentity("package1", new NuGetVersion("0.0.1")), net472),
                         new PackageReference(new PackageIdentity("package1", new NuGetVersion("0.0.2")), net472),
                     }
                 },
                 {
-                    new FrameworkRuntimePair("net6.0", net60, string.Empty),
+                    new FrameworkRuntimePair(net60, string.Empty),
                     new List<PackageReference>()
                     {
                         new PackageReference(new PackageIdentity("package1", new NuGetVersion("0.0.3")), net60),
diff --git a/test/NuGet.Core.Tests/NuGet.Packaging.Test/RuntimeModelTests/JsonRuntimeFormatTests.cs b/test/NuGet.Core.Tests/NuGet.Packaging.Test/RuntimeModelTests/JsonRuntimeFormatTests.cs
@@ -34,8 +34,8 @@ public void CanParseSupportsSection()
                     {
                         new CompatibilityProfile("windows-frob", new []
                             {
-                                new FrameworkRuntimePair("netcore5.0", FrameworkConstants.CommonFrameworks.NetCore50, "winfrob-x86"),
-                                new FrameworkRuntimePair("netcore5.0", FrameworkConstants.CommonFrameworks.NetCore50, "winfrob-x64")
+                                new FrameworkRuntimePair(FrameworkConstants.CommonFrameworks.NetCore50, "winfrob-x86"),
+                                new FrameworkRuntimePair(FrameworkConstants.CommonFrameworks.NetCore50, "winfrob-x64")
                             })
                     }),
                 ParseRuntimeJsonString(content));
@@ -73,7 +73,7 @@ public void CanParseCompatProfilesWithoutRuntimeIDs()
                 new RuntimeGraph(new[]
                     {
                         new CompatibilityProfile("windows-phone-8", new [] {
-                            new FrameworkRuntimePair("wp-8", FrameworkConstants.CommonFrameworks.WP8, null)
+                            new FrameworkRuntimePair(FrameworkConstants.CommonFrameworks.WP8, null)
                         })
                     }),
                 ParseRuntimeJsonString(content));
diff --git a/test/NuGet.Core.Tests/NuGet.Packaging.Test/RuntimeModelTests/RuntimeGraphTests.cs b/test/NuGet.Core.Tests/NuGet.Packaging.Test/RuntimeModelTests/RuntimeGraphTests.cs
@@ -512,14 +512,14 @@ public void MergeReplacesCompatibilityProfilesDefinedInRightWithValuesFromLeftIf
             {
                 new CompatibilityProfile("frob", new []
                 {
-                    new FrameworkRuntimePair("dnx452", FrameworkConstants.CommonFrameworks.Dnx452, "frob")
+                    new FrameworkRuntimePair(FrameworkConstants.CommonFrameworks.Dnx452, "frob")
                 })
             });
             var rightGraph = new RuntimeGraph(new[]
             {
                 new CompatibilityProfile("frob", new []
                 {
-                    new FrameworkRuntimePair("dnxcore50", FrameworkConstants.CommonFrameworks.DnxCore50, "blob")
+                    new FrameworkRuntimePair(FrameworkConstants.CommonFrameworks.DnxCore50, "blob")
                 })
             });
             var graph = RuntimeGraph.Merge(leftGraph, rightGraph);
@@ -537,7 +537,7 @@ public void MergeReplacesCompatibilityProfilesDefinedInRightIntoLeftIfLeftIsEmpt
             {
                 new CompatibilityProfile("frob", new []
                 {
-                    new FrameworkRuntimePair("dnxcore50", FrameworkConstants.CommonFrameworks.DnxCore50, "blob")
+                    new FrameworkRuntimePair(FrameworkConstants.CommonFrameworks.DnxCore50, "blob")
                 })
             });
             var graph = RuntimeGraph.Merge(leftGraph, rightGraph);
diff --git a/test/NuGet.Core.Tests/NuGet.ProjectModel.Test/JsonPackageSpecReaderTests.cs b/test/NuGet.Core.Tests/NuGet.ProjectModel.Test/JsonPackageSpecReaderTests.cs
@@ -2497,8 +2497,8 @@ public void GetPackageSpec_WhenSupportsValueIsValidWithCompatibilityProfilesAndF
         {
             FrameworkRuntimePair[] restoreContexts = new[]
             {
-                        new FrameworkRuntimePair("net472", NuGetFramework.Parse("net472"), "b"),
-                        new FrameworkRuntimePair("net48", NuGetFramework.Parse("net48"), "c")
+                        new FrameworkRuntimePair(NuGetFramework.Parse("net472"), "b"),
+                        new FrameworkRuntimePair(NuGetFramework.Parse("net48"), "c")
                     };
             var profile = new CompatibilityProfile(name: "a", restoreContexts);
             var expectedResult = new RuntimeGraph(new[] { profile });
diff --git a/test/NuGet.Core.Tests/NuGet.ProjectModel.Test/PackageSpecTests.cs b/test/NuGet.Core.Tests/NuGet.ProjectModel.Test/PackageSpecTests.cs
@@ -640,7 +640,7 @@ public void WarningPropertiesCloneTest()
 
         private static FrameworkRuntimePair CreateFrameworkRuntimePair(string tfm = "net461", string rid = "win-x64")
         {
-            return new FrameworkRuntimePair(tfm, NuGetFramework.Parse(tfm), rid);
+            return new FrameworkRuntimePair(NuGetFramework.Parse(tfm), rid);
         }
 
         private static CompatibilityProfile CreateCompatibilityProfile(string name, string tfm = "net461")
diff --git a/test/NuGet.Core.Tests/NuGet.ProjectModel.Test/PackageSpecWriterTests.cs b/test/NuGet.Core.Tests/NuGet.ProjectModel.Test/PackageSpecWriterTests.cs
@@ -875,7 +875,7 @@ private static PackageSpec CreatePackageSpec(bool withRestoreSettings, WarningPr
             };
             var compatibilityProfiles = new List<CompatibilityProfile>()
             {
-                new CompatibilityProfile("name", new[] { new FrameworkRuntimePair(nugetFramework.GetShortFolderName(), nugetFramework, "runtimeIdentifier")})
+                new CompatibilityProfile("name", new[] { new FrameworkRuntimePair(nugetFramework, "runtimeIdentifier")})
             };
 
             packageSpec.RuntimeGraph = new RuntimeGraph(runtimes, compatibilityProfiles);

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ internal static Dictionary<string, TransitiveEntry> ComputeTransitivePackageOrig`
`383`	`383`	`// For each target framework graph (Framework, RID)-pair:`
`384`	`384`	`foreach (LockFileTarget targetFxGraph in targetsList)`
`385`	`385`	`{`
`386`		`- var key = new FrameworkRuntimePair(targetFxGraph.TargetAlias, targetFxGraph.TargetFramework, targetFxGraph.RuntimeIdentifier);`
	`386`	`+ var key = new FrameworkRuntimePair(targetFxGraph.TargetFramework, targetFxGraph.RuntimeIdentifier);`
`387`	`387`
`388`	`388`	`foreach (var directPkg in installedPackages) // 3.1 For each direct dependency`
`389`	`389`	`{`
Original file line number	Diff line number	Diff line change
`@@ -185,11 +185,11 @@ private static IEnumerable<FrameworkRuntimePair> ReadCompatibilitySets(KeyValueP`
`185`	`185`	`case JTokenType.Array:`
`186`	`186`	`foreach (var value in (JArray)property.Value)`
`187`	`187`	`{`
`188`		`- yield return new FrameworkRuntimePair(framework.GetShortFolderName(), framework, value.Value<string>());`
	`188`	`+ yield return new FrameworkRuntimePair(framework, value.Value<string>());`
`189`	`189`	`}`
`190`	`190`	`break;`
`191`	`191`	`case JTokenType.String:`
`192`		`- yield return new FrameworkRuntimePair(framework.GetShortFolderName(), framework, property.Value.ToString());`
	`192`	`+ yield return new FrameworkRuntimePair(framework, property.Value.ToString());`
`193`	`193`	`break;`
`194`	`194`	`// Other token types are not supported`
`195`	`195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -575,7 +575,7 @@ private static IEnumerable<FrameworkRuntimePair> ReadCompatibilitySets(IReadOnly`
`575`	`575`
`576`	`576`	`foreach (string value in values)`
`577`	`577`	`{`
`578`		`- yield return new FrameworkRuntimePair(string.Empty, framework, value);`
	`578`	`+ yield return new FrameworkRuntimePair(framework, value);`
`579`	`579`	`}`
`580`	`580`	`}`
`581`	`581`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public void MergeTransitiveOrigin_DuplicateTransitiveOrigins_Merges()`
`23`	`23`	`var te = new Dictionary<FrameworkRuntimePair, IList<PackageReference>>`
`24`	`24`	`{`
`25`	`25`	`{`
`26`		`- new FrameworkRuntimePair("net472", net472, string.Empty),`
	`26`	`+ new FrameworkRuntimePair(net472, string.Empty),`
`27`	`27`	`new List<PackageReference>()`
`28`	`28`	`{`
`29`	`29`	`new PackageReference(new PackageIdentity("package1", new NuGetVersion("0.0.1")), net472),`
`@@ -47,15 +47,15 @@ public void MergeTransitiveOrigin_MultiTargeting_MergesLatest()`
`47`	`47`	`var te = new Dictionary<FrameworkRuntimePair, IList<PackageReference>>`
`48`	`48`	`{`
`49`	`49`	`{`
`50`		`- new FrameworkRuntimePair("net472", net472, string.Empty),`
	`50`	`+ new FrameworkRuntimePair(net472, string.Empty),`
`51`	`51`	`new List<PackageReference>()`
`52`	`52`	`{`
`53`	`53`	`new PackageReference(new PackageIdentity("package1", new NuGetVersion("0.0.1")), net472),`
`54`	`54`	`new PackageReference(new PackageIdentity("package1", new NuGetVersion("0.0.2")), net472),`
`55`	`55`	`}`
`56`	`56`	`},`
`57`	`57`	`{`
`58`		`- new FrameworkRuntimePair("net6.0", net60, string.Empty),`
	`58`	`+ new FrameworkRuntimePair(net60, string.Empty),`
`59`	`59`	`new List<PackageReference>()`
`60`	`60`	`{`
`61`	`61`	`new PackageReference(new PackageIdentity("package1", new NuGetVersion("0.0.3")), net60),`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ public void CanParseSupportsSection()`
`34`	`34`	`{`
`35`	`35`	`new CompatibilityProfile("windows-frob", new []`
`36`	`36`	`{`
`37`		`- new FrameworkRuntimePair("netcore5.0", FrameworkConstants.CommonFrameworks.NetCore50, "winfrob-x86"),`
`38`		`- new FrameworkRuntimePair("netcore5.0", FrameworkConstants.CommonFrameworks.NetCore50, "winfrob-x64")`
	`37`	`+ new FrameworkRuntimePair(FrameworkConstants.CommonFrameworks.NetCore50, "winfrob-x86"),`
	`38`	`+ new FrameworkRuntimePair(FrameworkConstants.CommonFrameworks.NetCore50, "winfrob-x64")`
`39`	`39`	`})`
`40`	`40`	`}),`
`41`	`41`	`ParseRuntimeJsonString(content));`
`@@ -73,7 +73,7 @@ public void CanParseCompatProfilesWithoutRuntimeIDs()`
`73`	`73`	`new RuntimeGraph(new[]`
`74`	`74`	`{`
`75`	`75`	`new CompatibilityProfile("windows-phone-8", new [] {`
`76`		`- new FrameworkRuntimePair("wp-8", FrameworkConstants.CommonFrameworks.WP8, null)`
	`76`	`+ new FrameworkRuntimePair(FrameworkConstants.CommonFrameworks.WP8, null)`
`77`	`77`	`})`
`78`	`78`	`}),`
`79`	`79`	`ParseRuntimeJsonString(content));`
Original file line number	Diff line number	Diff line change
`@@ -512,14 +512,14 @@ public void MergeReplacesCompatibilityProfilesDefinedInRightWithValuesFromLeftIf`
`512`	`512`	`{`
`513`	`513`	`new CompatibilityProfile("frob", new []`
`514`	`514`	`{`
`515`		`- new FrameworkRuntimePair("dnx452", FrameworkConstants.CommonFrameworks.Dnx452, "frob")`
	`515`	`+ new FrameworkRuntimePair(FrameworkConstants.CommonFrameworks.Dnx452, "frob")`
`516`	`516`	`})`
`517`	`517`	`});`
`518`	`518`	`var rightGraph = new RuntimeGraph(new[]`
`519`	`519`	`{`
`520`	`520`	`new CompatibilityProfile("frob", new []`
`521`	`521`	`{`
`522`		`- new FrameworkRuntimePair("dnxcore50", FrameworkConstants.CommonFrameworks.DnxCore50, "blob")`
	`522`	`+ new FrameworkRuntimePair(FrameworkConstants.CommonFrameworks.DnxCore50, "blob")`
`523`	`523`	`})`
`524`	`524`	`});`
`525`	`525`	`var graph = RuntimeGraph.Merge(leftGraph, rightGraph);`
`@@ -537,7 +537,7 @@ public void MergeReplacesCompatibilityProfilesDefinedInRightIntoLeftIfLeftIsEmpt`
`537`	`537`	`{`
`538`	`538`	`new CompatibilityProfile("frob", new []`
`539`	`539`	`{`
`540`		`- new FrameworkRuntimePair("dnxcore50", FrameworkConstants.CommonFrameworks.DnxCore50, "blob")`
	`540`	`+ new FrameworkRuntimePair(FrameworkConstants.CommonFrameworks.DnxCore50, "blob")`
`541`	`541`	`})`
`542`	`542`	`});`
`543`	`543`	`var graph = RuntimeGraph.Merge(leftGraph, rightGraph);`