diff --git a/.gitignore b/.gitignore index 6946e9478d..14c5b4c12b 100644 --- a/.gitignore +++ b/.gitignore @@ -336,4 +336,8 @@ src/settings/settings-html/200.html src/settings/settings-html/404.html # Temp telemetry files. -src/common/Telemetry/*.etl \ No newline at end of file +src/common/Telemetry/*.etl + +# Don't ignore MergeModules +!**/MergeModules/Release/ +!**/MergeModules/Debug/ \ No newline at end of file diff --git a/installer/MergeModules/Debug/Microsoft_VC142_CRT_x64.msm b/installer/MergeModules/Debug/Microsoft_VC142_CRT_x64.msm new file mode 100644 index 0000000000..ad68639c66 Binary files /dev/null and b/installer/MergeModules/Debug/Microsoft_VC142_CRT_x64.msm differ diff --git a/installer/MergeModules/Release/Microsoft_VC142_CRT_x64.msm b/installer/MergeModules/Release/Microsoft_VC142_CRT_x64.msm new file mode 100644 index 0000000000..e8dd42d05a Binary files /dev/null and b/installer/MergeModules/Release/Microsoft_VC142_CRT_x64.msm differ diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs index 820d043ca1..3ebb100629 100644 --- a/installer/PowerToysSetup/Product.wxs +++ b/installer/PowerToysSetup/Product.wxs @@ -185,6 +185,14 @@ BinaryKey="PTCustomActions" DllEntry="DetectPrevInstallPathCA" /> + + + + + + + +