PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Add informational version type

Browse Source
This commit is contained in:
John Gross
2017-12-03 10:22:11 -08:00
parent 1be1c938cc
commit 74d9999202
6 changed files with 67 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Torch/TorchBase.cs
View File

@@ -85,12 +85,7 @@ namespace Torch
public ITorchConfig Config { get; protected set; }
/// <inheritdoc />
public Version TorchVersion { get; }
/// <summary>
/// The version of Torch used, with extra data.
/// </summary>
public string TorchVersionVerbose { get; }
public InformationalVersion TorchVersion { get; }
/// <inheritdoc />
public Version GameVersion { get; private set; }
@@ -139,10 +134,15 @@ namespace Torch
Instance = this;
TorchVersion = Assembly.GetExecutingAssembly().GetName().Version;
TorchVersionVerbose = Assembly.GetEntryAssembly()
var versionString = Assembly.GetEntryAssembly()
.GetCustomAttribute<AssemblyInformationalVersionAttribute>()
?.InformationalVersion ?? TorchVersion.ToString();
.InformationalVersion;
if (!InformationalVersion.TryParse(versionString, out InformationalVersion version))
throw new TypeLoadException("Unable to parse the Torch version from the assembly.");
TorchVersion = version;
RunArgs = new string[0];
Managers = new DependencyManager();
@@ -326,7 +326,7 @@ namespace Torch
#else
Log.Info("RELEASE");
#endif
Log.Info($"Torch Version: {TorchVersionVerbose}");
Log.Info($"Torch Version: {TorchVersion}");
Log.Info($"Game Version: {GameVersion}");
Log.Info($"Executing assembly: {Assembly.GetEntryAssembly().FullName}");
Log.Info($"Executing directory: {AppDomain.CurrentDomain.BaseDirectory}");