Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 19:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ARM64][Installer]Install vcredist and upgrade wix to 3.14(#18500)

Browse Source 
* [ARM64] Install VCRedist using bootstrapper and fix autoupdate

* [ARM64] Use system-wide WiX toolset instead of a nuget package

* [CI] Install WiX 3.14

* [CI] add wix install script for release.yml

* [Doc] Update WiX install steps

* [CI]Fix Wix path

* Double quotes for full wix path

* fixup: verify wix hashes

* ignore sha256s

* spellcheck

* updated vcredist name

* norestart for vcredist
This commit is contained in:
Andrey Nekrasov
2022-05-30 12:38:36 +03:00
committed by GitHub
parent 25cfd07ae1
commit ba4b9cf549
24 changed files with 132 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/version/version.cpp
View File

@@ -4,8 +4,11 @@
version_architecture get_current_architecture()
{
// TODO: detect ARM build with #ifdef
#ifdef _M_ARM64
return version_architecture::arm;
#else
return version_architecture::x64;
#endif
}
const wchar_t* get_architecture_string(const version_architecture v)
@@ -15,7 +18,7 @@ const wchar_t* get_architecture_string(const version_architecture v)
case version_architecture::x64:
return L"x64";
case version_architecture::arm:
return L"arm";
return L"arm64";
default:
throw std::runtime_error("unknown architecture");
}