cleanup

Author: nkolev92

src/NuGet.Core/NuGet.Commands/PublicAPI/net8.0/PublicAPI.Unshipped.txt

@@ -1,3 +1,4 @@
 #nullable enable
 ~NuGet.Commands.IRestoreTargetGraph.TargetAlias.get -> string
 ~NuGet.Commands.RestoreTargetGraph.TargetAlias.get -> string
+~NuGet.Commands.RestoreTargetGraph.TargetGraphNameWithAlias.get -> string

src/NuGet.Core/NuGet.Frameworks/FrameworkRuntimePair.cs

@@ -12,26 +12,22 @@ namespace NuGet.Frameworks
     /// </remarks>
     public sealed class FrameworkRuntimePair : IEquatable<FrameworkRuntimePair>, IComparable<FrameworkRuntimePair>
     {
-        public string TargetAlias { get; }
-
         public NuGetFramework Framework { get; }
 
         public string RuntimeIdentifier { get; }
 
         public string Name { get; }
 
-        public FrameworkRuntimePair(string targetAlias, NuGetFramework framework, string? runtimeIdentifier)
+        public FrameworkRuntimePair(NuGetFramework framework, string? runtimeIdentifier)
         {
-            TargetAlias = targetAlias ?? throw new ArgumentNullException(nameof(targetAlias));
             Framework = framework ?? throw new ArgumentNullException(nameof(framework));
             RuntimeIdentifier = runtimeIdentifier ?? string.Empty;
-            Name = GetTargetGraphName(targetAlias, runtimeIdentifier);
+            Name = GetTargetGraphName(framework, runtimeIdentifier);
         }
 
         public bool Equals(FrameworkRuntimePair? other)
         {
             return other != null &&
-                string.Equals(TargetAlias, other.TargetAlias, StringComparison.Ordinal) &&
                 Equals(Framework, other.Framework) &&
                 string.Equals(RuntimeIdentifier, other.RuntimeIdentifier, StringComparison.Ordinal);
         }
@@ -43,15 +39,14 @@ public override bool Equals(object? obj)
 
         public override int GetHashCode()
         {
-            return HashCodeCombiner.GetHashCode(Framework, TargetAlias, RuntimeIdentifier);
+            return HashCodeCombiner.GetHashCode(Framework, RuntimeIdentifier);
         }
 
         public override string ToString()
         {
             return string.Format(
                 CultureInfo.CurrentCulture,
-                "{0}~{1}~{2}",
-                TargetAlias,
+                "{0}~{1}",
                 Framework.GetShortFolderName(),
                 RuntimeIdentifier);
         }
@@ -65,15 +60,9 @@ public int CompareTo(FrameworkRuntimePair? other)
             {
                 return fxCompare;
             }
-            fxCompare = string.Compare(TargetAlias, other.TargetAlias, StringComparison.Ordinal);
-            if (fxCompare != 0)
-            {
-                return fxCompare;
-            }
             return string.Compare(RuntimeIdentifier, other.RuntimeIdentifier, StringComparison.Ordinal);
         }
 
-        // TODO NK - What should this be.
         public static string GetTargetGraphName(NuGetFramework framework, string? runtimeIdentifier)
         {
             if (framework is null) throw new ArgumentNullException(nameof(framework));
@@ -91,23 +80,5 @@ public static string GetTargetGraphName(NuGetFramework framework, string? runtim
                     runtimeIdentifier);
             }
         }
-
-        public 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);
-            }
-        }
     }
 }

src/NuGet.Core/NuGet.Frameworks/PublicAPI.Unshipped.txt

@@ -1,4 +1 @@
 #nullable enable
-NuGet.Frameworks.FrameworkRuntimePair.FrameworkRuntimePair(string! targetAlias, NuGet.Frameworks.NuGetFramework! framework, string? runtimeIdentifier) -> void
-NuGet.Frameworks.FrameworkRuntimePair.TargetAlias.get -> string!
-static NuGet.Frameworks.FrameworkRuntimePair.GetTargetGraphName(string! targetAlias, string? runtimeIdentifier) -> string!