Update consolecommand.cpp

[icinga2] / icinga-installer / icinga2.wixpatch.cmake

diff --git a/icinga-installer/icinga2.wixpatch.cmake b/icinga-installer/icinga2.wixpatch.cmake
index f181979d1c07f6bacba74ed878c6867d630b0cd4..0666261d2a827ea387803b0cf0e4776ea2e13bb7 100644 (file)
--- a/icinga-installer/icinga2.wixpatch.cmake
+++ b/icinga-installer/icinga2.wixpatch.cmake
@@ -10,9 +10,6 @@
     <Binary Id="icinga2_installer" SourceFile="$<TARGET_FILE:icinga-installer>" />
     
     <InstallExecuteSequence>
-      <Custom Action='CheckForUCRT' Before='LaunchConditions'>
-        <![CDATA[Not REMOVE="ALL" AND Not PREVIOUSFOUND AND UCRTINSTALLED = ""]]>
-      </Custom>
       <Custom Action="XtraUpgradeNSIS" After="InstallInitialize">$CM_CP_sbin.icinga2_installer.exe&gt;2</Custom>
       <Custom Action="XtraInstall" Before="InstallFinalize">$CM_CP_sbin.icinga2_installer.exe&gt;2</Custom>
       <Custom Action="XtraUninstall" Before="RemoveExistingProducts">$CM_CP_sbin.icinga2_installer.exe=2</Custom>
@@ -24,7 +21,6 @@
     <CustomAction Id="LaunchIcinga2Wizard"
         BinaryKey="WixCA"
         DllEntry="WixShellExec"
-        Execute="deferred"
         Impersonate="no" />
 
     <UI>
@@ -33,15 +29,5 @@
             Event="DoAction" 
             Value="LaunchIcinga2Wizard">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
     </UI>
-
-    <Property Id="UCRTINSTALLED" Secure="yes">
-      <DirectorySearch Id="searchSystem2" Path="[SystemFolder]" Depth="0">
-        <FileSearch Id="UCRT_FileSearch"
-                    Name="ucrtbase.dll"
-                    MinVersion="6.2.10585.0"/>
-      </DirectorySearch>
-    </Property>
-
-    <CustomAction Id="CheckForUCRT" Error="Installation cannot continue because the Microsoft Universal C Runtime is not installed. Please see https://support.microsoft.com/en-us/kb/2999226 for more details." />
   </CPackWiXFragment>
 </CPackWiXPatch>