tk/spectre.console
1
0
Fork 0
mirror of https://github.com/nsnail/spectre.console.git synced 2025-06-20 13:48:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

GH-242: Fix version retrieval for single file applications (#245)

Browse Source
This commit is contained in:
Milosz Krajewski
2021-01-25 23:45:38 +00:00
committed by GitHub
parent 31a5e17a45
commit ad49b6aa67
7 changed files with 53 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Spectre.Console/Cli/Internal/Modelling/CommandModel.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Reflection;
@ -28,7 +29,23 @@ namespace Spectre.Console.Cli
public string GetApplicationName()
{
return ApplicationName ?? Path.GetFileName(Assembly.GetEntryAssembly()?.Location) ?? "?";
return
ApplicationName ??
Path.GetFileName(GetApplicationFile()) ?? // null is propagated by GetFileName
"?";
}
private static string? GetApplicationFile()
{
var location = Assembly.GetEntryAssembly()?.Location;
if (string.IsNullOrWhiteSpace(location))
{
// this is special case for single file executable
// (Assembly.Location returns empty string)
return Process.GetCurrentProcess().MainModule?.FileName;
}
return location;
}
}
}