From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Fri, 17 Nov 2017 09:58:31 +0000 (+0100)
Subject: Revert "Windows: Remove requirement for KB2999226 (VS2015)"
X-Git-Tag: v2.8.1~35^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d25afad211012963e97b36d596d3cfb8dd35c86;p=icinga2

Revert "Windows: Remove requirement for KB2999226 (VS2015)"

This reverts commit 5c4a833116654c9f742ffec3bbcd5e593c57f80b.
---

diff --git a/icinga-installer/icinga2.wixpatch.cmake b/icinga-installer/icinga2.wixpatch.cmake
index cc4aef13a..099d940c4 100644
--- a/icinga-installer/icinga2.wixpatch.cmake
+++ b/icinga-installer/icinga2.wixpatch.cmake
@@ -10,12 +10,9 @@
     <Binary Id="icinga2_installer" SourceFile="$<TARGET_FILE:icinga-installer>" />
     
     <InstallExecuteSequence>
-      <!-- Removed for builds with VS2013, kept intact for VS2015 --> 
-      <!--
       <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>
@@ -36,8 +33,6 @@
             Value="LaunchIcinga2Wizard">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
     </UI>
 
-    <!-- Removed for builds with VS2013, kept intact for VS2015 --> 
-    <!--
     <Property Id="UCRTINSTALLED" Secure="yes">
       <DirectorySearch Id="searchSystem2" Path="[SystemFolder]" Depth="0">
         <FileSearch Id="UCRT_FileSearch"
@@ -47,6 +42,5 @@
     </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>