cleaup

Author: nkolev92

src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Projects/LegacyPackageReferenceProject.cs

@@ -479,6 +479,7 @@ private async Task<PackageSpec> GetPackageSpecAsync(ISettings settings)
                 FrameworkName = targetFramework,
                 Warn = warn,
                 PackagesToPrune = packagesToPrune,
+                TargetAlias = targetFramework.ToString(),
             };
 
             // Build up runtime information.

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.TargetFramework, targetFxGraph.RuntimeIdentifier);
+                var key = new FrameworkRuntimePair(targetFxGraph.TargetAlias, targetFxGraph.TargetFramework, targetFxGraph.RuntimeIdentifier);
 
                 foreach (var directPkg in installedPackages) // 3.1 For each direct dependency
                 {

src/NuGet.Clients/NuGet.VisualStudio.Implementation/SolutionExplorer/Models/AssetsFileDependenciesSnapshot.cs

@@ -96,11 +96,11 @@ private AssetsFileDependenciesSnapshot(LockFile? lockFile, AssetsFileDependencie
                     continue;
                 }
 
-                string targetAlias = GetTargetAlias(lockFileTarget.Name);
+                string targetAlias = lockFileTarget.TargetAlias;
 
                 previous.DataByTarget.TryGetValue(targetAlias, out AssetsFileTarget? previousTarget);
 
-                ImmutableArray<AssetsFileLogMessage> logMessages = ParseLogMessages(lockFile, previousTarget, lockFileTarget.Name);
+                ImmutableArray<AssetsFileLogMessage> logMessages = ParseLogMessages(lockFile, previousTarget, targetAlias);
 
                 dataByTarget.Add(
                     targetAlias,
@@ -114,34 +114,6 @@ private AssetsFileDependenciesSnapshot(LockFile? lockFile, AssetsFileDependencie
             DataByTarget = dataByTarget.ToImmutable();
             return;
 
-            string GetTargetAlias(string lockFileTargetName)
-            {
-                // In some places, the target alias specified in the project file (e.g. "net472") will not
-                // match the target name used throughout the lock file (e.g. ".NETFramework,Version=v4.7.2").
-                // The dependencies tree only uses the target alias (what's in the project file) so we need
-                // to map back to that. See https://github.com/dotnet/project-system/issues/6832.
-
-                if (lockFile.PackageSpec.TargetFrameworks.Any(t => t.TargetAlias == lockFileTargetName))
-                {
-                    // The target name used in the assets file matches the target alias in the project file.
-                    return lockFileTargetName;
-                }
-
-                // The target name used in the assets file does NOT match any target alias in the project.
-                // Attempt to find the name used in the project.
-                foreach (TargetFrameworkInformation targetInfo in lockFile.PackageSpec.TargetFrameworks)
-                {
-                    if (targetInfo.FrameworkName.DotNetFrameworkName == lockFileTargetName)
-                    {
-                        // We found a match, so return the alias.
-                        return targetInfo.TargetAlias;
-                    }
-                }
-
-                // No match was found. Not ideal. Nothing to do but return the original value.
-                return lockFileTargetName;
-            }
-
             static ImmutableArray<AssetsFileLogMessage> ParseLogMessages(LockFile lockFile, AssetsFileTarget? previousTarget, string target)
             {
                 if (lockFile.LogMessages.Count == 0)

src/NuGet.Core/NuGet.Build.Tasks.Console/MSBuildStaticGraphRestore.cs

@@ -752,7 +752,7 @@ internal static List<TargetFrameworkInformation> GetTargetFrameworkInfos(IReadOn
                     FrameworkReferences = GetFrameworkReferences(msBuildProjectInstance),
                     PackagesToPrune = prunedReferences,
                     RuntimeIdentifierGraphPath = msBuildProjectInstance.GetProperty(nameof(TargetFrameworkInformation.RuntimeIdentifierGraphPath)),
-                    TargetAlias = targetAlias,
+                    TargetAlias = string.IsNullOrEmpty(targetAlias) ? targetFramework.ToString() : targetAlias,
                     Warn = warn
                 };
 

src/NuGet.Core/NuGet.Commands/PublicAPI/net472/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.Commands/RestoreCommand/CompatibilityChecker.cs

@@ -230,7 +230,7 @@ internal async Task<CompatibilityCheckResult> CheckAsync(
         /// </summary>
         private static RestoreLogMessage GetErrorMessage(NuGetLogCode logCode, CompatibilityIssue issue, RestoreTargetGraph graph)
         {
-            return RestoreLogMessage.CreateError(logCode, issue.Format(), issue.Package.Id, graph.TargetGraphName);
+            return RestoreLogMessage.CreateError(logCode, issue.Format(), issue.Package.Id, graph.TargetGraphNameWithAlias);
         }
 
         private static IEnumerable<NuGetFramework> GetPackageFrameworks(

src/NuGet.Core/NuGet.Commands/RestoreCommand/DependencyGraphResolver.cs

@@ -281,7 +281,7 @@ public async Task<ValueTuple<bool, List<RestoreTargetGraph>, RuntimeGraph>> Reso
                 foreach (FrameworkRuntimePair? frameworkRuntimePair in compatProfile.RestoreContexts)
                 {
                     _logger.LogDebug($" {profile.Value.Name} -> +{frameworkRuntimePair}");
-                    _request.CompatibilityProfiles.Add(frameworkRuntimePair);
+                    _request.CompatibilityProfiles.Add(frameworkRuntimePair); // TODO NK - double chekc.
                 }
             }
 

src/NuGet.Core/NuGet.Commands/RestoreCommand/Diagnostics/UnexpectedDependencyMessages.cs

@@ -78,7 +78,7 @@ public static IEnumerable<RestoreLogMessage> GetMissingLowerBounds(IEnumerable<I
                                             .OrderBy(e => e.Child.Name, StringComparer.OrdinalIgnoreCase)
                                             .ThenBy(e => e.Child.Version)
                                             .ThenBy(e => e.Parent.Name, StringComparer.OrdinalIgnoreCase)
-                                            .Select(e => GetMissingLowerBoundMessage(e, graph.TargetGraphName)));
+                                            .Select(e => GetMissingLowerBoundMessage(e, graph.TargetGraphNameWithAlias)));
             }
 
             return messages;
@@ -159,7 +159,7 @@ public static IEnumerable<RestoreLogMessage> GetBumpedUpDependencies(
                                     match.Key.Name,
                                     match.Key.Version);
 
-                                var graphName = indexedGraph.Graph.TargetGraphName;
+                                var graphName = indexedGraph.Graph.TargetGraphNameWithAlias;
 
                                 messages.Add(RestoreLogMessage.CreateWarning(NuGetLogCode.NU1601, message, match.Key.Name, graphName));
                             }
@@ -290,7 +290,7 @@ public static IEnumerable<RestoreLogMessage> GetDependenciesAboveUpperBounds(Lis
                                             child,
                                             actual);
 
-                                        messages.Add(RestoreLogMessage.CreateWarning(NuGetLogCode.NU1608, message, dependencyId, graph.TargetGraphName));
+                                        messages.Add(RestoreLogMessage.CreateWarning(NuGetLogCode.NU1608, message, dependencyId, graph.TargetGraphNameWithAlias));
                                     }
                                 }
                             }

src/NuGet.Core/NuGet.Commands/RestoreCommand/Diagnostics/UnresolvedMessages.cs

@@ -33,7 +33,7 @@ internal static async Task LogAsync(IEnumerable<IRestoreTargetGraph> graphs, Rem
         {
             var tasks = graphs.SelectMany(graph => graph.Unresolved.Select(e =>
             GetMessageAsync(
-                graph.TargetGraphName,
+                graph.TargetGraphNameWithAlias,
                 e,
                 context.FilterDependencyProvidersForLibrary(e),
                 context.PackageSourceMapping.IsEnabled,

src/NuGet.Core/NuGet.Commands/RestoreCommand/IRestoreTargetGraph.cs

@@ -12,6 +12,8 @@ namespace NuGet.Commands
 {
     public interface IRestoreTargetGraph
     {
+        string TargetGraphNameWithAlias { get; }
+
         string TargetGraphName { get; }
 
         /// <summary>