Skip to content

Use TargetAlias in AssetsFileDependencies snapshot #6843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nkolev92 merged 3 commits into from
Oct 13, 2025
Merged

Use TargetAlias in AssetsFileDependencies snapshot #6843

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0c9cd3
Use TargetAlias in AssetsFileDependencies snapshot
nkolev92 Oct 4, 2025
096bfaa
cleanup
nkolev92 Oct 7, 2025
99d8fb2
remove test
nkolev92 Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 2 additions & 30 deletions ...Get.VisualStudio.Implementation/SolutionExplorer/Models/AssetsFileDependenciesSnapshot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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)
Expand Down