Skip to content

Ignore empty version directories of dotnet #3265

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
siegfriedpammer merged 2 commits into from
Aug 21, 2024
Merged

Ignore empty version directories of dotnet #3265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63c2bb0
Ignore empty version directories of dotnet
Herrmel Aug 19, 2024
0330f38
Include Subdirectories when checking for empty dotnet version directory
Herrmel Aug 21, 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
15 changes: 9 additions & 6 deletions ICSharpCode.Decompiler/Metadata/DotNetCorePathFinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,21 +249,24 @@ public string TryResolveDotNetCoreShared(IAssemblyReference name, out string run
static string GetClosestVersionFolder(string basePath, Version version)
{
var foundVersions = new DirectoryInfo(basePath).GetDirectories()
.Select(d => ConvertToVersion(d.Name))
.Select(ConvertToVersion)
.Where(v => v.version != null);
foreach (var folder in foundVersions.OrderBy(v => v.version))
{
if (folder.version >= version)
return folder.directoryName;
if (folder.version >= version
&& folder.directory.EnumerateFiles("*.dll", SearchOption.AllDirectories).Any())
{
return folder.directory.Name;
}
}
return version.ToString();
}

internal static (Version version, string directoryName) ConvertToVersion(string name)
internal static (Version version, DirectoryInfo directory) ConvertToVersion(DirectoryInfo directory)
{
string RemoveTrailingVersionInfo()
{
string shortName = name;
string shortName = directory.Name;
int dashIndex = shortName.IndexOf('-');
if (dashIndex > 0)
{
Expand All @@ -274,7 +277,7 @@ string RemoveTrailingVersionInfo()

try
{
return (new Version(RemoveTrailingVersionInfo()), name);
return (new Version(RemoveTrailingVersionInfo()), directory);
}
catch (Exception ex)
{
Expand Down
4 changes: 2 additions & 2 deletions ICSharpCode.Decompiler/Metadata/UniversalAssemblyResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,11 +386,11 @@ DotNetCorePathFinder InitDotNetCorePathFinder()
string FindClosestVersionDirectory(string basePath, Version? version)
{
string? path = null;
foreach (var folder in new DirectoryInfo(basePath).GetDirectories().Select(d => DotNetCorePathFinder.ConvertToVersion(d.Name))
foreach (var folder in new DirectoryInfo(basePath).GetDirectories().Select(DotNetCorePathFinder.ConvertToVersion)
.Where(v => v.Item1 != null).OrderByDescending(v => v.Item1))
{
if (path == null || version == null || folder.Item1 >= version)
path = folder.Item2;
path = folder.Item2.Name;
}
return path ?? version?.ToString() ?? ".";
}
Expand Down