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

Revert 3d9d59f and align more closely with the Linux arch detection

Browse Source
This commit is contained in:
Caelan Sayler
2025-10-19 16:09:23 +01:00
parent 097c1df2cc
commit f90ad8bb42
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/vpk/Velopack.Packaging.Windows/Commands/WindowsPackCommandRunner.cs
View File

@@ -1,5 +1,6 @@
using System.Runtime.Versioning;
using System.Text.RegularExpressions;
using AsmResolver.PE;
using Microsoft.Extensions.Logging;
using Velopack.Core;
using Velopack.Core.Abstractions;
@@ -83,6 +84,10 @@ public class WindowsPackCommandRunner : PackageBuilder<WindowsPackOptions>
var stubPath = Path.Combine(packDir, Path.GetFileNameWithoutExtension(mainExeName) + "_ExecutionStub.exe");
CreateExecutableStubForExe(mainPath, stubPath);
Options.TargetRuntime.Architecture = Options.TargetRuntime.HasArchitecture
? Options.TargetRuntime.Architecture
: GetMachineForBinary(MainExePath);
return Task.FromResult(packDir);
}
@@ -339,7 +344,6 @@ public class WindowsPackCommandRunner : PackageBuilder<WindowsPackOptions>
private void CompileWixTemplateToMsi(Action<int> progress, DirectoryInfo portableDirectory, string msiFilePath)
{
var templateData = MsiBuilder.ConvertOptionsToTemplateData(
MainExePath,
portableDirectory,
GetShortcuts(),
GetRuntimeDependencies(),
@@ -347,6 +351,19 @@ public class WindowsPackCommandRunner : PackageBuilder<WindowsPackOptions>
MsiBuilder.CompileWixMsi(Log, templateData, progress, msiFilePath);
}
protected virtual RuntimeCpu GetMachineForBinary(string path)
{
var image = PEImage.FromFile(path);
if (image.MachineType.HasFlag(AsmResolver.PE.File.Headers.MachineType.Amd64))
return RuntimeCpu.x64;
if (image.MachineType.HasFlag(AsmResolver.PE.File.Headers.MachineType.Arm64))
return RuntimeCpu.arm64;
return RuntimeCpu.x86;
}
protected override string[] GetMainExeSearchPaths(string packDirectory, string mainExeName)
{
return [

26
src/vpk/Velopack.Packaging.Windows/Msi/MsiBuilder.cs
View File

@@ -4,7 +4,6 @@ using System.Runtime.Versioning;
using System.Text;
using System.Text.RegularExpressions;
using System.Xml;
using AsmResolver.PE;
using HandlebarsDotNet;
using Markdig;
using Microsoft.Extensions.Logging;
@@ -106,7 +105,7 @@ public static class MsiBuilder
return rv;
}
public static MsiTemplateData ConvertOptionsToTemplateData(string mainExePath, DirectoryInfo portableDir, ShortcutLocation shortcuts,
public static MsiTemplateData ConvertOptionsToTemplateData(DirectoryInfo portableDir, ShortcutLocation shortcuts,
string runtimeDeps, WindowsPackOptions options)
{
// WiX Identifiers may contain ASCII characters A-Z, a-z, digits, underscores (_), or
@@ -120,13 +119,7 @@ public static class MsiBuilder
if (string.IsNullOrWhiteSpace(msiVersion)) {
msiVersion = $"{parsedVersion.Major}.{parsedVersion.Minor}.{parsedVersion.Patch}.0";
}
RuntimeCpu runtimeCpu = options.TargetRuntime.Architecture;
if (runtimeCpu == RuntimeCpu.Unknown) {
runtimeCpu = GetMachineForBinary(mainExePath);
options.TargetRuntime.Architecture = runtimeCpu;
}
return new MsiTemplateData() {
WixId = wixId,
AppId = options.PackId,
@@ -135,8 +128,8 @@ public static class MsiBuilder
AppMsiVersion = msiVersion,
AppVersion = parsedVersion.ToFullString(),
SourceDirectoryPath = portableDir.FullName,
Is64Bit = runtimeCpu is RuntimeCpu.x64,
IsArm64 = runtimeCpu is RuntimeCpu.arm64,
Is64Bit = options.TargetRuntime.Architecture is not RuntimeCpu.x86 and not RuntimeCpu.Unknown,
IsArm64 = options.TargetRuntime.Architecture is RuntimeCpu.arm64,
InstallForAllUsers = options.InstLocation.HasFlag(InstallLocation.PerMachine),
InstallForCurrentUser = options.InstLocation.HasFlag(InstallLocation.PerUser),
UpgradeCodeGuid = GuidUtil.CreateGuidFromHash($"{options.PackId}:UpgradeCode").ToString(),
@@ -155,17 +148,6 @@ public static class MsiBuilder
WelcomeMessage = GetPlainTextMessage(options.InstWelcome),
LicenseRtfFilePath = GetLicenseRtfPath(options.InstLicense, portableDir.Parent),
};
static RuntimeCpu GetMachineForBinary(string path)
{
var image = PEImage.FromFile(path);
if (image.MachineType.HasFlag(AsmResolver.PE.File.Headers.MachineType.Amd64))
return RuntimeCpu.x64;
if (image.MachineType.HasFlag(AsmResolver.PE.File.Headers.MachineType.Arm64))
return RuntimeCpu.arm64;
return RuntimeCpu.x86;
}
}
[SupportedOSPlatform("windows")]