Wix3.6に対応した

diff --git a/Installer/build.cmd b/Installer/build.cmd
index 14cfd6d..a106d89 100644 (file)
--- a/Installer/build.cmd
+++ b/Installer/build.cmd
@@ -1,6 +1,6 @@
 setlocal\r
 \r
-set WIX_PATH=C:\Program Files (x86)\Windows Installer XML v3.5\bin\r
+set WIX_PATH=C:\Program Files (x86)\WiX Toolset v3.6\bin\r
 set OUTPUTX86=completeeraer_setup_x86.msi\r
 set OUTPUTX64=completeeraer_setup_x64.msi\r
 set TYPE=%1\r

diff --git a/Installer/installer.xml b/Installer/installer.xml
index 72a8ff8..a440550 100644 (file)
--- a/Installer/installer.xml
+++ b/Installer/installer.xml
@@ -41,27 +41,22 @@
       <Directory Id="INSTALLDIR" Name="CompleteEraser">\r
         <Component Id="RegistryEntries" Guid="0B8DCAC5-6CB0-402A-9D39-66E63A886656" KeyPath="yes">\r
          <RegistryKey Root="HKLM"\r
-          Key="Software\Classes\CLSID\{112143A6-62C1-4478-9E8F-872699255E2E}"\r
-          Action="createAndRemoveOnUninstall">\r
+          Key="Software\Classes\CLSID\{112143A6-62C1-4478-9E8F-872699255E2E}">\r
           <RegistryValue Type="string" Value="ShellExtension Sample"/>\r
          </RegistryKey>\r
          <RegistryKey Root="HKLM"\r
-          Key="Software\Classes\CLSID\{112143A6-62C1-4478-9E8F-872699255E2E}\InprocServer32"\r
-          Action="createAndRemoveOnUninstall">\r
+          Key="Software\Classes\CLSID\{112143A6-62C1-4478-9E8F-872699255E2E}\InprocServer32">\r
           <RegistryValue Type="string" Value="[!File1]"/>\r
           <RegistryValue Type="string" Name="ThreadingModel" Value="Apartment"/>\r
          </RegistryKey>\r
          <RegistryKey Root="HKLM"\r
-          Key="Software\Classes\*\shellex\ContextMenuHandlers\{112143A6-62C1-4478-9E8F-872699255E2E}"\r
-          Action="createAndRemoveOnUninstall">\r
+          Key="Software\Classes\*\shellex\ContextMenuHandlers\{112143A6-62C1-4478-9E8F-872699255E2E}">\r
          </RegistryKey>\r
          <RegistryKey Root="HKLM"\r
-          Key="Software\Classes\Directory\shellex\ContextMenuHandlers\{112143A6-62C1-4478-9E8F-872699255E2E}"\r
-          Action="createAndRemoveOnUninstall">\r
+          Key="Software\Classes\Directory\shellex\ContextMenuHandlers\{112143A6-62C1-4478-9E8F-872699255E2E}">\r
          </RegistryKey>\r
          <RegistryKey Root="HKLM"\r
-          Key="Software\Classes\CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\shellex\ContextMenuHandlers\{112143A6-62C1-4478-9E8F-872699255E2E}"\r
-          Action="createAndRemoveOnUninstall">\r
+          Key="Software\Classes\CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\shellex\ContextMenuHandlers\{112143A6-62C1-4478-9E8F-872699255E2E}">\r
          </RegistryKey>\r
         </Component>\r
 \r