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

Support arm64 msi's

Browse Source
This commit is contained in:
Caelan Sayler
2025-05-26 20:45:55 +01:00
parent d200d6f44b
commit a2640a354e
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,8 @@ public static class MsiBuilder
AppMsiVersion = msiVersion, AppMsiVersion = msiVersion,
AppVersion = parsedVersion.ToFullString(), AppVersion = parsedVersion.ToFullString(),
SourceDirectoryPath = portableDir.FullName, SourceDirectoryPath = portableDir.FullName,
Is64Bit = options.TargetRuntime.Architecture is not RuntimeCpu.x86, Is64Bit = options.TargetRuntime.Architecture is not RuntimeCpu.x86 and not RuntimeCpu.Unknown,
IsArm64 = options.TargetRuntime.Architecture is RuntimeCpu.arm64,
CultureLCID = CultureInfo.GetCultureInfo("en-US").TextInfo.ANSICodePage, CultureLCID = CultureInfo.GetCultureInfo("en-US").TextInfo.ANSICodePage,
InstallForAllUsers = options.InstLocation.HasFlag(InstallLocation.PerMachine), InstallForAllUsers = options.InstLocation.HasFlag(InstallLocation.PerMachine),
InstallForCurrentUser = options.InstLocation.HasFlag(InstallLocation.PerUser), InstallForCurrentUser = options.InstLocation.HasFlag(InstallLocation.PerUser),
@@ -81,8 +82,8 @@ public static class MsiBuilder
[SupportedOSPlatform("windows")] [SupportedOSPlatform("windows")]
public static void CompileWixMsi(ILogger Log, MsiTemplateData data, Action<int> progress, string outputFilePath) public static void CompileWixMsi(ILogger Log, MsiTemplateData data, Action<int> progress, string outputFilePath)
{ {
bool as64Bit = data.Is64Bit; var wixArch = data.IsArm64 ? "arm64" : data.Is64Bit ? "x64" : "x86";
Log.Info($"Configuring WiX in {(as64Bit ? "64-bit" : "32-bit")} mode"); Log.Info($"Configuring WiX in {wixArch} mode");
var _1 = TempUtil.GetTempDirectory(out var outputDir); var _1 = TempUtil.GetTempDirectory(out var outputDir);
var wixId = data.WixId; var wixId = data.WixId;
@@ -91,6 +92,7 @@ public static class MsiBuilder
var (wxsContent, localizationContent) = GenerateWixTemplate(data); var (wxsContent, localizationContent) = GenerateWixTemplate(data);
// File.WriteAllText(@"C:\Source\velopack\samples\CSharpAvalonia\releases\test.wxs", wxsContent, Encoding.UTF8);
File.WriteAllText(wxsPath, wxsContent, Encoding.UTF8); File.WriteAllText(wxsPath, wxsContent, Encoding.UTF8);
File.WriteAllText(localizationPath, localizationContent, Encoding.UTF8); File.WriteAllText(localizationPath, localizationContent, Encoding.UTF8);
@@ -103,7 +105,7 @@ public static class MsiBuilder
//When localization is supported in Velopack, we will need to add -culture here: //When localization is supported in Velopack, we will need to add -culture here:
//https://docs.firegiant.com/wix/tools/wixext/wixui/ //https://docs.firegiant.com/wix/tools/wixext/wixui/
var buildCommand = var buildCommand =
$"\"{HelperFile.WixPath}\" build -platform {(as64Bit ? "x64" : "x86")} -outputType Package " + $"\"{HelperFile.WixPath}\" build -arch {wixArch} -outputType Package " +
$"-pdbType none {string.Join(" ", wixExtensions.Select(x => $"-ext \"{x}\""))} -loc \"{localizationPath}\" -out \"{outputFilePath}\" \"{wxsPath}\""; $"-pdbType none {string.Join(" ", wixExtensions.Select(x => $"-ext \"{x}\""))} -loc \"{localizationPath}\" -out \"{outputFilePath}\" \"{wxsPath}\"";
_ = Exe.RunHostedCommand(buildCommand); _ = Exe.RunHostedCommand(buildCommand);

1
src/vpk/Velopack.Packaging.Windows/Msi/MsiTemplateData.cs
View File

@@ -6,6 +6,7 @@ public class MsiTemplateData
public string SourceDirectoryPath; public string SourceDirectoryPath;
public string RustNativeModulePath; public string RustNativeModulePath;
public bool Is64Bit; public bool Is64Bit;
public bool IsArm64;
public int CultureLCID; public int CultureLCID;
public string UpgradeCodeGuid; public string UpgradeCodeGuid;
public string ComponentGenerationSeedGuid; public string ComponentGenerationSeedGuid;

1
src/vpk/Velopack.Packaging/HelperFile.cs
View File

@@ -42,6 +42,7 @@ public static class HelperFile
return FindHelperFile("velopack_wix.dll"); return FindHelperFile("velopack_wix.dll");
#else #else
return target.Architecture switch { return target.Architecture switch {
RuntimeCpu.Unknown => FindHelperFile("velopack_wix_x86.dll"),
RuntimeCpu.x86 => FindHelperFile("velopack_wix_x86.dll"), RuntimeCpu.x86 => FindHelperFile("velopack_wix_x86.dll"),
RuntimeCpu.x64 => FindHelperFile("velopack_wix_x64.dll"), RuntimeCpu.x64 => FindHelperFile("velopack_wix_x64.dll"),
RuntimeCpu.arm64 => FindHelperFile("velopack_wix_arm64.dll"), RuntimeCpu.arm64 => FindHelperFile("velopack_wix_arm64.dll"),