Skip to content
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

Make assembly version logic more robust Fixes #44042 #45518

Merged
merged 2 commits into from
Jan 10, 2025
Merged

Make assembly version logic more robust Fixes #44042 #45518

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a91161c
Make assembly version logic more robust
Forgind Dec 17, 2024
d71813e
Check existence first
Forgind Dec 19, 2024
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
10 changes: 4 additions & 6 deletions src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,12 +530,10 @@ private RuntimeLibrary GetRuntimeLibrary(DependencyLibrary library, string[] use
{
var fileName = Path.GetFileNameWithoutExtension(library.Path);
var assemblyPath = userRuntimeAssemblies?.FirstOrDefault(p => Path.GetFileNameWithoutExtension(p).Equals(fileName));
runtimeAssemblyGroups.Add(new RuntimeAssetGroup(string.Empty,
[ new RuntimeFile(
referenceProjectInfo.OutputName,
library.Version.ToString(),
assemblyPath is null || !File.Exists(assemblyPath) ? string.Empty : FileVersionInfo.GetVersionInfo(assemblyPath).FileVersion)
]));
var runtimeFile = !string.IsNullOrWhiteSpace(assemblyPath) && File.Exists(assemblyPath) ? CreateRuntimeFile(referenceProjectInfo.OutputName, assemblyPath) :
!string.IsNullOrWhiteSpace(library.Path) && File.Exists(library.Path) ? CreateRuntimeFile(referenceProjectInfo.OutputName, library.Path) :
new RuntimeFile(referenceProjectInfo.OutputName, string.Empty, string.Empty);
Comment on lines +533 to +535
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you know if there are cases where each of these clauses are true? (IE will it ever be the case that assemblyPath doesn't exist but libraryPath does, or that neither of them exist?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In theory, at least, yes. This gets run as part of a (publicly available/tweakable) Task, so the user can set, for instance, what userRuntimeAssemblies are available --> whether anything gets found for assemblyPath as well as whether a library really exists on disk. This should only be for things that get copied to the output directory, but given that users can customize the inputs, I wouldn't depend on that. Good question.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think in a case like this it would be OK to change task logic. The task isn't meant for public consumption, so it's probably OK to make a minor change that probably won't break people even if they are using it.

FYI @baronfel @marcpopMSFT

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think in a case like this it would be OK to change task logic. The task isn't meant for public consumption, so it's probably OK to make a minor change that probably won't break people even if they are using it.

FYI @baronfel @marcpopMSFT

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Totally agree with Daniel here.

runtimeAssemblyGroups.Add(new RuntimeAssetGroup(string.Empty, [runtimeFile]));

resourceAssemblies.AddRange(referenceProjectInfo.ResourceAssemblies
.Select(r => new ResourceAssembly(r.RelativePath, r.Culture)));
Expand Down