From: Michael Insel Date: Thu, 25 Apr 2019 16:14:04 +0000 (+0200) Subject: Use WixNetFxExtension to detect installed .NET X-Git-Tag: v2.11.0-rc1~122^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54d9470c6b3bd5de28cc2a160a0de627b5723229;p=icinga2 Use WixNetFxExtension to detect installed .NET This implements the use of the WixNetFxExtension for the WIX toolset, to detect the installed .NET Framework version. If the installed .NET version is lower than 4.6 the installation process will terminate with the note to install at least .NET Framework 4.6. refs #7090 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f8eb1217..ac57471fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -414,11 +414,11 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt") set(CPACK_PACKAGE_EXECUTABLES "Icinga2SetupAgent;Icinga 2 Agent Wizard") set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/icinga-app\\\\icinga.ico") set(CPACK_WIX_UPGRADE_GUID "52F2BEAA-4DF0-4C3E-ABDC-C0F61DE4DF8A") -set(CPACK_WIX_EXTENSIONS "WixUtilExtension") set(CPACK_WIX_UI_BANNER "${CMAKE_CURRENT_SOURCE_DIR}/icinga-installer/bannrbmp.bmp") set(CPACK_WIX_UI_DIALOG "${CMAKE_CURRENT_SOURCE_DIR}/icinga-installer/dlgbmp.bmp") set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_BINARY_DIR}/icinga-installer/icinga2.wixpatch.Debug") set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_BINARY_DIR}/icinga-installer/icinga2.wixpatch") +set(CPACK_WIX_EXTENSIONS "WixUtilExtension" "WixNetFxExtension") set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION "sbin") set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE) diff --git a/icinga-installer/icinga2.wixpatch.cmake b/icinga-installer/icinga2.wixpatch.cmake index 4232be01e..5ee6361ae 100644 --- a/icinga-installer/icinga2.wixpatch.cmake +++ b/icinga-installer/icinga2.wixpatch.cmake @@ -3,6 +3,11 @@ 1 Disable + + + + +