Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use 'OriginalFileName' to find .net core backing DLL

Browse Source
This commit is contained in:
Mark Adamson
2021-07-24 20:49:02 +01:00
parent d10c2eb45e
commit db6188044f
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Squirrel/SquirrelAwareExecutableDetector.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Linq;
@@ -28,8 +29,9 @@ namespace Squirrel
{
if (!File.Exists(executable)) return null;
var fullname = Path.GetFullPath(executable);
var backingDll = fullname.Substring(0, fullname.Length - 3) + "dll";
var backingDll = LookForNetCoreDll(fullname);
return Utility.Retry<int?>(() =>
{
var assemblySquirrelAwareVersion = GetAssemblySquirrelAwareVersion(fullname);
@@ -38,7 +40,7 @@ namespace Squirrel
return assemblySquirrelAwareVersion;
}
if (File.Exists(backingDll))
if (backingDll != null && File.Exists(backingDll))
{
var assemblyDllSquirrelAwareVersion = GetAssemblySquirrelAwareVersion(backingDll);
if (assemblyDllSquirrelAwareVersion != null)
@@ -51,6 +53,16 @@ namespace Squirrel
});
}
private static string LookForNetCoreDll(string fullname)
{
var exeFileVersionInfo = FileVersionInfo.GetVersionInfo(fullname);
var originalFilename = exeFileVersionInfo.OriginalFilename;
var backingDll = originalFilename == null ? null
: Path.Combine(Path.GetDirectoryName(fullname), originalFilename);
return backingDll;
}
static int? GetAssemblySquirrelAwareVersion(string executable)
{
try {