From f2d8fb7b6d40973b0c7a2844dccb4651aa8bf9c4 Mon Sep 17 00:00:00 2001
From: malte_langkabel <malte.langkabel@gmail.com>
Date: Tue, 13 Dec 2016 11:28:34 +0100
Subject: [PATCH] build: fixed duplicate GUIDs in installer

<description>
---
 deployment/windows/wixSetup/build.bat      | 4 ++--
 deployment/windows/wixSetup/coati.wxs      | 3 ---
 deployment/windows/wixSetup/installDir.wxs | 6 +++---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/deployment/windows/wixSetup/build.bat b/deployment/windows/wixSetup/build.bat
index 9ee19a6f..b7d33d3b 100644
--- a/deployment/windows/wixSetup/build.bat
+++ b/deployment/windows/wixSetup/build.bat
@@ -9,8 +9,8 @@ echo "installer version is $VERSION_STRING"
 rm -rf build
 mkdir build
 
-"devenv.com" Setup/build/Setup.sln /build "Release|x86"
-"devenv.com" CustomActions/CustomActions.sln /build "Release|x86"
+"devenv.com" Setup/build/Setup.sln //build "Release|x86"
+"devenv.com" CustomActions/CustomActions.sln //build "Release|x86"
 
 rm -rf bin
 mkdir bin
diff --git a/deployment/windows/wixSetup/coati.wxs b/deployment/windows/wixSetup/coati.wxs
index a9ca96ff..28d0e2ca 100644
--- a/deployment/windows/wixSetup/coati.wxs
+++ b/deployment/windows/wixSetup/coati.wxs
@@ -170,9 +170,6 @@
 				<ComponentRef Id='apiMsWinCrtTime_l1_1_0Dll'/>
 				<ComponentRef Id='apiMsWinCrtUtility_l1_1_0Dll'/>
 				<ComponentRef Id='ucrtbaseDll'/>
-				<ComponentRef Id='apiMsWinCrtString_l1_1_0Dll'/>
-				<ComponentRef Id='apiMsWinCrtString_l1_1_0Dll'/>
-				<ComponentRef Id='apiMsWinCrtString_l1_1_0Dll'/>
 				<ComponentRef Id='qtConf'/>
 				<ComponentRef Id='msvcp140_dll'/>
 				<ComponentRef Id='vcruntime140_dll'/>
diff --git a/deployment/windows/wixSetup/installDir.wxs b/deployment/windows/wixSetup/installDir.wxs
index bc8b4981..ae20b8d4 100644
--- a/deployment/windows/wixSetup/installDir.wxs
+++ b/deployment/windows/wixSetup/installDir.wxs
@@ -129,7 +129,7 @@
 				<File Id='apiMsWinCoreTimezone_l1_1_0' Name='api-ms-win-core-timezone-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-timezone-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreUtil_l1_1_0Dll' Guid='E9DF7695-E203-4CD3-AB80-DD2264C66A9C'>
+			<Component Id='apiMsWinCoreUtil_l1_1_0Dll' Guid='B428A873-4334-4139-81F7-3F8EF93DC2EB'>
 				<File Id='apiMsWinCoreUtil_l1_1_0' Name='api-ms-win-core-util-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-util-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
@@ -161,7 +161,7 @@
 				<File Id='apiMsWinCrtMath_l1_1_0' Name='api-ms-win-crt-math-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-math-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtMultibyte_l1_1_0Dll' Guid='115C6C2B-54DA-4F2A-986F-4E58043DE1F8'>
+			<Component Id='apiMsWinCrtMultibyte_l1_1_0Dll' Guid='95BD7652-C8C1-4C6F-8F58-AF4F16B8A7B9'>
 				<File Id='apiMsWinCrtMultibyte_l1_1_0' Name='api-ms-win-crt-multibyte-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-multibyte-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
@@ -193,7 +193,7 @@
 				<File Id='apiMsWinCrtUtility_l1_1_0' Name='api-ms-win-crt-utility-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-utility-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='ucrtbaseDll' Guid='56BCC0B1-2664-414A-AC29-DEE39CEAA845'>
+			<Component Id='ucrtbaseDll' Guid='83DABDC8-59D6-4D59-9FC1-F0C093BF5908'>
 				<File Id='ucrtbase' Name='ucrtbase.dll' DiskId='1' Source='./../../../bin/app/Release/ucrtbase.dll' KeyPath='yes' />
 			</Component>