diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
index cfcb712ed9..f5877b1a4d 100644
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -1649,6 +1649,7 @@ rects
recyclebin
redirectedfrom
Redist
+Redistributable
reencode
reencoded
refactor
diff --git a/.github/actions/spell-check/patterns.txt b/.github/actions/spell-check/patterns.txt
index 5c9c1d4d22..68b06a098d 100644
--- a/.github/actions/spell-check/patterns.txt
+++ b/.github/actions/spell-check/patterns.txt
@@ -37,6 +37,8 @@ std::wregex\(L"[^"]*"\)
# hash
Hash="[0-9A-F]{40}"
+# SHA256 hash
+'[0-9A-F]{64}'
# hex digits including css/html color classes:
(?:[\\0][xX]|\\u|[uU]\+|#x?|\%23|L")[0-9a-fA-FgGrR_]{2,}(?:[uU]?[lL]{0,2}|u\d+)\b
diff --git a/.pipelines/ci/templates/build-powertoys-steps.yml b/.pipelines/ci/templates/build-powertoys-steps.yml
index 17c9e783e2..153f0e8138 100644
--- a/.pipelines/ci/templates/build-powertoys-steps.yml
+++ b/.pipelines/ci/templates/build-powertoys-steps.yml
@@ -95,6 +95,12 @@ steps:
msbuildArgs: ${{ parameters.additionalBuildArguments }}
maximumCpuCount: true
+- task: PowerShell@2
+ displayName: Download and install WiX 3.14 development build
+ inputs:
+ targetType: filePath
+ filePath: '$(build.sourcesdirectory)\.pipelines\installWiX.ps1'
+
- task: NuGetCommand@2
displayName: Restore NuGet packages for PowerToysSetup.sln
inputs:
diff --git a/.pipelines/installWiX.ps1 b/.pipelines/installWiX.ps1
new file mode 100644
index 0000000000..5147cbb8ce
--- /dev/null
+++ b/.pipelines/installWiX.ps1
@@ -0,0 +1,26 @@
+$ProgressPreference = 'SilentlyContinue'
+
+$WixDownloadUrl = "https://wixtoolset.org/downloads/v3.14.0.5722/wix314.exe"
+$WixBinariesDownloadUrl = "https://wixtoolset.org/downloads/v3.14.0.5722/wix314-binaries.zip"
+
+# Download WiX binaries and verify their hash sums
+Invoke-WebRequest -Uri $WixDownloadUrl -OutFile "$($ENV:Temp)\wix314.exe"
+$Hash = (Get-FileHash -Algorithm SHA256 "$($ENV:Temp)\wix314.exe").Hash
+if ($Hash -ne 'B74ED29F1377AA759E764EDEF43B1E4C4312A7A4CED77108D2446F7117EF5D3B')
+{
+ Write-Error "$WixHash"
+ throw "wix314.exe has unexpected SHA256 hash: $Hash"
+}
+Invoke-WebRequest -Uri $WixBinariesDownloadUrl -OutFile "$($ENV:Temp)\wix314-binaries.zip"
+$Hash = (Get-FileHash -Algorithm SHA256 "$($ENV:Temp)\wix314-binaries.zip").Hash
+if($Hash -ne 'FCBE136AB3D616B983C5BE19B46521745F842B7327BF2BC7011FD26DBE277F93')
+{
+ throw "wix314-binaries.zip has unexpected SHA256 hash: $Hash"
+}
+
+# Install WiX
+Start-Process -Wait -FilePath "$($ENV:Temp)\wix314.exe" -ArgumentList "/install /quiet"
+
+# Extract WiX binaries and copy wix.targets to the installed dir
+Expand-Archive -Path "$($ENV:Temp)\wix314-binaries.zip" -Force -DestinationPath "$($ENV:Temp)"
+Copy-Item -Path "$($ENV:Temp)\wix.targets" -Destination "C:\Program Files (x86)\WiX Toolset v3.14\"
\ No newline at end of file
diff --git a/.pipelines/release.yml b/.pipelines/release.yml
index a1dbdcc3f4..6d93a0f4ac 100644
--- a/.pipelines/release.yml
+++ b/.pipelines/release.yml
@@ -87,7 +87,13 @@ jobs:
restoreSolution: '**/*.sln'
selectOrConfig: config
nugetConfigPath: .pipelines/release-nuget.config
-
+
+ - task: PowerShell@2
+ displayName: Download and install WiX 3.14 development build
+ inputs:
+ targetType: filePath
+ filePath: '$(build.sourcesdirectory)\.pipelines\installWiX.ps1'
+
- task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@1
displayName: 'Download Localization Files -- PowerToys 37400'
inputs:
@@ -313,7 +319,7 @@ jobs:
displayName: 'Extracting MSI to verify contents'
inputs:
script: |
- .\installer\packages\WiX.3.11.2\tools\dark.exe -x $(build.sourcesdirectory)\extractedMsi installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).msi
+ "C:\Program Files (x86)\WiX Toolset v3.14\bin\dark.exe" -x $(build.sourcesdirectory)\extractedMsi installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).msi
dir $(build.sourcesdirectory)\extractedMsi
# Did we sign all files
@@ -348,7 +354,7 @@ jobs:
- task: CmdLine@2
displayName: 'Insignia: Extract Engine from Bundle'
inputs:
- script: '.\installer\packages\WiX.3.11.2\tools\insignia.exe -ib installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\engine.exe'
+ script: '"C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ib installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\engine.exe'
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
@@ -385,7 +391,7 @@ jobs:
- task: CmdLine@2
displayName: 'Insignia: Merge Engine into Bundle'
inputs:
- script: '.\installer\packages\WiX.3.11.2\tools\insignia.exe -ab installer\engine.exe installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe'
+ script: '"C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ab installer\engine.exe installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe'
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
displayName: Sign Bootstrapper
diff --git a/doc/devdocs/readme.md b/doc/devdocs/readme.md
index f2d1905a5a..afc49b1688 100644
--- a/doc/devdocs/readme.md
+++ b/doc/devdocs/readme.md
@@ -72,7 +72,8 @@ The installer can only be compiled in `Release` mode, step 1 and 2 must be done
### Prerequisites for building the MSI installer
1. Install the [WiX Toolset Visual Studio 2022 Extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2022Extension).
-2. Install the [WiX Toolset build tools](https://wixtoolset.org/releases/).
+2. Install the [WiX Toolset build tools](https://wixtoolset.org/releases/v3-14-0-6526/).
+3. Download [WiX binaries](https://wixtoolset.org/downloads/v3.14.0.6526/wix314-binaries.zip) and extract `wix.targets` to `C:\Program Files (x86)\WiX Toolset v3.14`.
### Locally compiling the Bug reporting tool
diff --git a/installer/PowerToysSetup.sln b/installer/PowerToysSetup.sln
index ac20fd87cb..58be67fb18 100644
--- a/installer/PowerToysSetup.sln
+++ b/installer/PowerToysSetup.sln
@@ -16,68 +16,46 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM64 = Debug|ARM64
- Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|ARM64 = Release|ARM64
- Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Debug|ARM64.ActiveCfg = Debug|x86
- {022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Debug|ARM64.Build.0 = Debug|x86
- {022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Debug|Win32.ActiveCfg = Debug|x64
- {022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Debug|Win32.Build.0 = Debug|x64
+ {022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Debug|ARM64.Build.0 = Debug|ARM64
{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Debug|x64.ActiveCfg = Debug|x64
{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Debug|x64.Build.0 = Debug|x64
- {022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Release|ARM64.ActiveCfg = Release|x86
- {022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Release|ARM64.Build.0 = Release|x86
- {022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Release|Win32.ActiveCfg = Release|x64
- {022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Release|Win32.Build.0 = Release|x64
+ {022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Release|ARM64.ActiveCfg = Release|ARM64
+ {022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Release|ARM64.Build.0 = Release|ARM64
{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Release|x64.ActiveCfg = Release|x64
{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Release|x64.Build.0 = Release|x64
- {32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Debug|ARM64.ActiveCfg = Debug|Win32
- {32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Debug|Win32.ActiveCfg = Debug|Win32
- {32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Debug|Win32.Build.0 = Debug|Win32
+ {32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Debug|ARM64.ActiveCfg = Debug|ARM64
{32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Debug|x64.ActiveCfg = Debug|x64
{32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Debug|x64.Build.0 = Debug|x64
- {32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Release|ARM64.ActiveCfg = Release|Win32
- {32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Release|ARM64.Build.0 = Release|Win32
- {32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Release|Win32.ActiveCfg = Release|x64
- {32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Release|Win32.Build.0 = Release|x64
+ {32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Release|ARM64.ActiveCfg = Release|ARM64
+ {32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Release|ARM64.Build.0 = Release|ARM64
{32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Release|x64.ActiveCfg = Release|x64
{32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Release|x64.Build.0 = Release|x64
- {7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|ARM64.ActiveCfg = Debug|Win32
- {7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|Win32.ActiveCfg = Debug|Win32
- {7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|Win32.Build.0 = Debug|Win32
+ {7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|ARM64.ActiveCfg = Debug|ARM64
{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|x64.ActiveCfg = Debug|x64
{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|x64.Build.0 = Debug|x64
- {7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Release|ARM64.ActiveCfg = Release|Win32
- {7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Release|ARM64.Build.0 = Release|Win32
- {7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Release|Win32.ActiveCfg = Release|Win32
- {7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Release|Win32.Build.0 = Release|Win32
+ {7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Release|ARM64.ActiveCfg = Release|ARM64
+ {7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Release|ARM64.Build.0 = Release|ARM64
{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Release|x64.ActiveCfg = Release|x64
{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Release|x64.Build.0 = Release|x64
- {D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Debug|ARM64.ActiveCfg = Debug|Win32
- {D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Debug|Win32.ActiveCfg = Debug|Win32
- {D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Debug|Win32.Build.0 = Debug|Win32
+ {D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Debug|ARM64.ActiveCfg = Debug|ARM64
{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Debug|x64.ActiveCfg = Debug|x64
{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Debug|x64.Build.0 = Debug|x64
- {D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|ARM64.ActiveCfg = Release|Win32
- {D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|ARM64.Build.0 = Release|Win32
- {D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|Win32.ActiveCfg = Release|Win32
- {D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|Win32.Build.0 = Release|Win32
+ {D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|ARM64.ActiveCfg = Release|ARM64
+ {D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|ARM64.Build.0 = Release|ARM64
{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|x64.ActiveCfg = Release|x64
{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|x64.Build.0 = Release|x64
- {31D72625-43C1-41B1-B784-BCE4A8DC5543}.Debug|ARM64.ActiveCfg = Debug|x86
- {31D72625-43C1-41B1-B784-BCE4A8DC5543}.Debug|ARM64.Build.0 = Debug|x86
- {31D72625-43C1-41B1-B784-BCE4A8DC5543}.Debug|Win32.ActiveCfg = Debug|x64
- {31D72625-43C1-41B1-B784-BCE4A8DC5543}.Debug|Win32.Build.0 = Debug|x64
+ {31D72625-43C1-41B1-B784-BCE4A8DC5543}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {31D72625-43C1-41B1-B784-BCE4A8DC5543}.Debug|ARM64.Build.0 = Debug|ARM64
{31D72625-43C1-41B1-B784-BCE4A8DC5543}.Debug|x64.ActiveCfg = Debug|x64
{31D72625-43C1-41B1-B784-BCE4A8DC5543}.Debug|x64.Build.0 = Debug|x64
- {31D72625-43C1-41B1-B784-BCE4A8DC5543}.Release|ARM64.ActiveCfg = Release|x86
- {31D72625-43C1-41B1-B784-BCE4A8DC5543}.Release|ARM64.Build.0 = Release|x86
- {31D72625-43C1-41B1-B784-BCE4A8DC5543}.Release|Win32.ActiveCfg = Release|x64
- {31D72625-43C1-41B1-B784-BCE4A8DC5543}.Release|Win32.Build.0 = Release|x64
+ {31D72625-43C1-41B1-B784-BCE4A8DC5543}.Release|ARM64.ActiveCfg = Release|ARM64
+ {31D72625-43C1-41B1-B784-BCE4A8DC5543}.Release|ARM64.Build.0 = Release|ARM64
{31D72625-43C1-41B1-B784-BCE4A8DC5543}.Release|x64.ActiveCfg = Release|x64
{31D72625-43C1-41B1-B784-BCE4A8DC5543}.Release|x64.Build.0 = Release|x64
EndGlobalSection
diff --git a/installer/PowerToysSetup/PowerToys.wxs b/installer/PowerToysSetup/PowerToys.wxs
index 91f749c96f..5b401b2015 100644
--- a/installer/PowerToysSetup/PowerToys.wxs
+++ b/installer/PowerToysSetup/PowerToys.wxs
@@ -13,6 +13,10 @@
+
+
+
+
@@ -26,7 +30,11 @@
-
+
+
+
+
+
@@ -66,6 +74,8 @@
DetectedWindowsBuildNumber >= 18362 OR WixBundleInstalled
+
+
+
+
+
-
+
Version=$(Version)
@@ -14,17 +14,14 @@
Release
x64
- x86
+ arm64
3.10
2.0
PowerToysSetup-$(Version)-$(Platform)
Bundle
True
-
- PowerToysSetup-$(Version)-arm64
- PowerToysSetup-$(Version)-$(Platform)
- arm64\$(Configuration)\
- $(Platform)\$(Configuration)\
+ PowerToysSetup-$(Version)-$(Platform)
+ $(Platform)\$(Configuration)\
obj\$(Platform)\$(Configuration)\
@@ -68,7 +65,7 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
+
\ No newline at end of file
diff --git a/installer/PowerToysSetup/PowerToysInstaller.wixproj b/installer/PowerToysSetup/PowerToysInstaller.wixproj
index c94e074e08..6793c89242 100644
--- a/installer/PowerToysSetup/PowerToysInstaller.wixproj
+++ b/installer/PowerToysSetup/PowerToysInstaller.wixproj
@@ -1,6 +1,6 @@
-
+
@@ -35,17 +35,14 @@ call "..\..\publish.cmd" arm64
3.10
022a9d30-7c4f-416d-a9df-5ff2661cc0ad
2.0
-
- PowerToysSetup-$(Version)-arm64
- PowerToysSetup-$(Version)-$(Platform)
+ PowerToysSetup-$(Version)-$(Platform)
Package
True
- arm64\$(Configuration)\
- $(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
obj\$(Platform)\$(Configuration)\
ICE91
True
@@ -96,7 +93,7 @@ call "..\..\publish.cmd" arm64
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
+
-
-
-
-
-
@@ -635,13 +630,6 @@
-
-
-
-
-
-
-
@@ -724,10 +712,6 @@
-
-
-
-
@@ -976,7 +960,6 @@
-
@@ -996,7 +979,6 @@
-
@@ -1350,14 +1332,10 @@
-
+
-
-
-
-
diff --git a/installer/PowerToysSetup/packages.config b/installer/PowerToysSetup/packages.config
index d260a32fa0..569e1bea86 100644
--- a/installer/PowerToysSetup/packages.config
+++ b/installer/PowerToysSetup/packages.config
@@ -1,4 +1,3 @@
-
diff --git a/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj b/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj
index b44a0f75fa..f43503577e 100644
--- a/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj
+++ b/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj
@@ -1,24 +1,7 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
+
+
{32f3882b-f2d6-4586-b5ed-11e39e522bd3}
Win32Proj
@@ -63,7 +46,7 @@
- inc;..\..\src\;..\..\src\common\Telemetry;telemetry;$(WIX)sdk\$(WixPlatformToolset)\inc;$(SolutionDir)\packages\WiX.3.11.2\tools\sdk\inc;%(AdditionalIncludeDirectories)
+ inc;..\..\src\;..\..\src\common\Telemetry;telemetry;$(WixSdkPath)VS2017\inc;%(AdditionalIncludeDirectories)
/await /Zc:twoPhase- /Wv:18 %(AdditionalOptions)
Level4
ProgramDatabase
@@ -73,24 +56,16 @@
CustomAction.def
-
-
+
+
WIN64;%(PreprocessorDefinitions)
- MachineX64
- $(WIX)sdk\$(WixPlatformToolset)\lib\x64;$(SolutionDir)\packages\WiX.3.11.2\tools\sdk\vs2017\lib\x64;%(AdditionalLibraryDirectories)
+ $(WixSdkPath)VS2017\lib\$(Platform);%(AdditionalLibraryDirectories)
-
-
- MachineX86
- $(WIX)sdk\$(WixPlatformToolset)\lib\x86;$(SolutionDir)\packages\WiX.3.11.2\tools\sdk\vs2017\lib\x86;%(AdditionalLibraryDirectories)
-
-
-
Disabled
@@ -153,10 +128,4 @@
-
-
- This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
\ No newline at end of file
diff --git a/installer/PowerToysSetupCustomActions/packages.config b/installer/PowerToysSetupCustomActions/packages.config
index 9fb1b39ab7..6b8deb9c96 100644
--- a/installer/PowerToysSetupCustomActions/packages.config
+++ b/installer/PowerToysSetupCustomActions/packages.config
@@ -1,4 +1,3 @@
-
\ No newline at end of file
diff --git a/installer/VCRuntime/concrt140.dll b/installer/VCRuntime/concrt140.dll
deleted file mode 100644
index e1fad948cb..0000000000
Binary files a/installer/VCRuntime/concrt140.dll and /dev/null differ
diff --git a/installer/VCRuntime/msvcp140.dll b/installer/VCRuntime/msvcp140.dll
deleted file mode 100644
index 94cbba79a1..0000000000
Binary files a/installer/VCRuntime/msvcp140.dll and /dev/null differ
diff --git a/installer/VCRuntime/msvcp140_1.dll b/installer/VCRuntime/msvcp140_1.dll
deleted file mode 100644
index efb7d98dd0..0000000000
Binary files a/installer/VCRuntime/msvcp140_1.dll and /dev/null differ
diff --git a/installer/VCRuntime/msvcp140_2.dll b/installer/VCRuntime/msvcp140_2.dll
deleted file mode 100644
index d135c2a4cc..0000000000
Binary files a/installer/VCRuntime/msvcp140_2.dll and /dev/null differ
diff --git a/installer/VCRuntime/msvcp140_codecvt_ids.dll b/installer/VCRuntime/msvcp140_codecvt_ids.dll
deleted file mode 100644
index 606446ca23..0000000000
Binary files a/installer/VCRuntime/msvcp140_codecvt_ids.dll and /dev/null differ
diff --git a/installer/VCRuntime/vccorlib140.dll b/installer/VCRuntime/vccorlib140.dll
deleted file mode 100644
index 07c5f4b9fb..0000000000
Binary files a/installer/VCRuntime/vccorlib140.dll and /dev/null differ
diff --git a/installer/VCRuntime/vcruntime140.dll b/installer/VCRuntime/vcruntime140.dll
deleted file mode 100644
index f59e67e97f..0000000000
Binary files a/installer/VCRuntime/vcruntime140.dll and /dev/null differ
diff --git a/installer/VCRuntime/vcruntime140_1.dll b/installer/VCRuntime/vcruntime140_1.dll
deleted file mode 100644
index f564204746..0000000000
Binary files a/installer/VCRuntime/vcruntime140_1.dll and /dev/null differ
diff --git a/installer/wix.props b/installer/wix.props
new file mode 100644
index 0000000000..d33624a8c7
--- /dev/null
+++ b/installer/wix.props
@@ -0,0 +1,14 @@
+
+
+
+ C:\Program Files (x86)\WiX Toolset v3.14\bin\
+ $(WixInstallPath)\
+
+ $(WixInstallPath)\..\wix.targets
+ $(WixInstallPath)\..\lux.targets
+
+ $(WixInstallPath)\WixTasks.dll
+ $(WixInstallPath)\..\sdk\
+ $(WixSdkPath)\..\wix.ca.targets
+
+
\ No newline at end of file
diff --git a/src/common/version/version.cpp b/src/common/version/version.cpp
index 39a5616084..465ffbd941 100644
--- a/src/common/version/version.cpp
+++ b/src/common/version/version.cpp
@@ -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");
}