mirror of
https://github.com/velopack/velopack.git
synced 2025-10-25 15:19:22 +00:00
Add support for language neutral VersionInfo in target .exes
Fixes #1644
This commit is contained in:
@@ -70,8 +70,21 @@ namespace Squirrel
|
||||
var buf = new byte[size];
|
||||
if (!NativeMethods.GetFileVersionInfo(executable, 0, size, buf)) return null;
|
||||
|
||||
IntPtr result; int resultSize;
|
||||
if (!NativeMethods.VerQueryValue(buf, "\\StringFileInfo\\040904B0\\SquirrelAwareVersion", out result, out resultSize)) {
|
||||
const string englishUS = "040904B0";
|
||||
const string neutral = "000004B0";
|
||||
var supportedLanguageCodes = new[] {englishUS, neutral};
|
||||
|
||||
IntPtr result;
|
||||
int resultSize;
|
||||
if (!supportedLanguageCodes.Any(
|
||||
languageCode =>
|
||||
NativeMethods.VerQueryValue(
|
||||
buf,
|
||||
$"\\StringFileInfo\\{languageCode}\\SquirrelAwareVersion",
|
||||
out result, out resultSize
|
||||
)
|
||||
))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@@ -41,6 +41,17 @@ namespace Squirrel.Tests
|
||||
Assert.Equal(1, ret.Value);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SquirrelAwareViaLanguageNeutralVersionBlock()
|
||||
{
|
||||
var target = IntegrationTestHelper.GetPath("fixtures", "SquirrelAwareNetCoreApp.exe");
|
||||
Assert.True(File.Exists(target));
|
||||
|
||||
var ret = SquirrelAwareExecutableDetector.GetPESquirrelAwareVersion(target);
|
||||
Assert.Equal(1, ret.Value);
|
||||
}
|
||||
|
||||
|
||||
[Fact]
|
||||
public void SquirrelAwareViaAssemblyAttribute()
|
||||
{
|
||||
|
||||
BIN
test/fixtures/SquirrelAwareNetCoreApp.dll
vendored
Normal file
BIN
test/fixtures/SquirrelAwareNetCoreApp.dll
vendored
Normal file
Binary file not shown.
BIN
test/fixtures/SquirrelAwareNetCoreApp.exe
vendored
Normal file
BIN
test/fixtures/SquirrelAwareNetCoreApp.exe
vendored
Normal file
Binary file not shown.
Reference in New Issue
Block a user