From: konekoneko <jbh03215@hotmail.co.jp>
Date: Mon, 17 Dec 2012 06:52:12 +0000 (+0900)
Subject: Wix3.6に対応した
X-Git-Url: http://git.osdn.net/view?p=completeeraser%2FCompleteEraser.git;a=commitdiff_plain;h=9caef4b8417ae4f7668b01668186d6994108ceca

Wix3.6に対応した
---

diff --git a/Installer/build.cmd b/Installer/build.cmd
index 14cfd6d..a106d89 100644
--- a/Installer/build.cmd
+++ b/Installer/build.cmd
@@ -1,6 +1,6 @@
 setlocal
 
-set WIX_PATH=C:\Program Files (x86)\Windows Installer XML v3.5\bin
+set WIX_PATH=C:\Program Files (x86)\WiX Toolset v3.6\bin
 set OUTPUTX86=completeeraer_setup_x86.msi
 set OUTPUTX64=completeeraer_setup_x64.msi
 set TYPE=%1
diff --git a/Installer/installer.xml b/Installer/installer.xml
index 72a8ff8..a440550 100644
--- a/Installer/installer.xml
+++ b/Installer/installer.xml
@@ -41,27 +41,22 @@
       <Directory Id="INSTALLDIR" Name="CompleteEraser">
         <Component Id="RegistryEntries" Guid="0B8DCAC5-6CB0-402A-9D39-66E63A886656" KeyPath="yes">
          <RegistryKey Root="HKLM"
-          Key="Software\Classes\CLSID\{112143A6-62C1-4478-9E8F-872699255E2E}"
-          Action="createAndRemoveOnUninstall">
+          Key="Software\Classes\CLSID\{112143A6-62C1-4478-9E8F-872699255E2E}">
           <RegistryValue Type="string" Value="ShellExtension Sample"/>
          </RegistryKey>
          <RegistryKey Root="HKLM"
-          Key="Software\Classes\CLSID\{112143A6-62C1-4478-9E8F-872699255E2E}\InprocServer32"
-          Action="createAndRemoveOnUninstall">
+          Key="Software\Classes\CLSID\{112143A6-62C1-4478-9E8F-872699255E2E}\InprocServer32">
           <RegistryValue Type="string" Value="[!File1]"/>
           <RegistryValue Type="string" Name="ThreadingModel" Value="Apartment"/>
          </RegistryKey>
          <RegistryKey Root="HKLM"
-          Key="Software\Classes\*\shellex\ContextMenuHandlers\{112143A6-62C1-4478-9E8F-872699255E2E}"
-          Action="createAndRemoveOnUninstall">
+          Key="Software\Classes\*\shellex\ContextMenuHandlers\{112143A6-62C1-4478-9E8F-872699255E2E}">
          </RegistryKey>
          <RegistryKey Root="HKLM"
-          Key="Software\Classes\Directory\shellex\ContextMenuHandlers\{112143A6-62C1-4478-9E8F-872699255E2E}"
-          Action="createAndRemoveOnUninstall">
+          Key="Software\Classes\Directory\shellex\ContextMenuHandlers\{112143A6-62C1-4478-9E8F-872699255E2E}">
          </RegistryKey>
          <RegistryKey Root="HKLM"
-          Key="Software\Classes\CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\shellex\ContextMenuHandlers\{112143A6-62C1-4478-9E8F-872699255E2E}"
-          Action="createAndRemoveOnUninstall">
+          Key="Software\Classes\CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\shellex\ContextMenuHandlers\{112143A6-62C1-4478-9E8F-872699255E2E}">
          </RegistryKey>
         </Component>