support same version upgrade for MSI

2 files changed, 7 insertions, 4 deletions

diff --git a/win/packaging/create_msi.cmake.in b/win/packaging/create_msi.cmake.in
index d02791d3b9f..a8ca35906e8 100644
--- a/win/packaging/create_msi.cmake.in
+++ b/win/packaging/create_msi.cmake.in
@@ -8,6 +8,7 @@ SET(VERSION "@VERSION@")
 SET(MAJOR_VERSION "@MAJOR_VERSION@")
 SET(MINOR_VERSION "@MINOR_VERSION@")
 SET(PATCH_VERSION "@PATCH_VERSION@")
+SET(TINY_VERSION "@TINY_VERSION@")
 SET(CMAKE_SIZEOF_VOID_P @CMAKE_SIZEOF_VOID_P@)
 SET(MANUFACTURER "@MANUFACTURER@")
 SET(WIXCA_LOCATION "@WIXCA_LOCATION@")
@@ -421,7 +422,7 @@ EXECUTE_PROCESS(
 
 EXECUTE_PROCESS(
  COMMAND ${LIGHT_EXECUTABLE} -ext WixUIExtension -ext WixUtilExtension 
- -ext WixFirewallExtension
+ -ext WixFirewallExtension -sice:ICE61
   mysql_server.wixobj  extra.wixobj -out  ${CPACK_PACKAGE_FILE_NAME}.msi
   ${EXTRA_LIGHT_ARGS}
 )
diff --git a/win/packaging/mysql_server.wxs.in b/win/packaging/mysql_server.wxs.in
index 82c17d7577c..79fde801cf5 100644
--- a/win/packaging/mysql_server.wxs.in
+++ b/win/packaging/mysql_server.wxs.in
@@ -4,7 +4,7 @@
     Id="*" 

     UpgradeCode="@CPACK_WIX_UPGRADE_CODE@"

     Name="@CPACK_WIX_PACKAGE_NAME@" 

-    Version="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@" 

+    Version="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@" 

     Language="1033" 

     Manufacturer="@MANUFACTURER@">

     

@@ -26,14 +26,16 @@
       <UpgradeVersion 

         Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.0"

         IncludeMinimum="yes"

-        Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@"

+        Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@"

+        IncludeMaximum="yes"

         Property="OLDERVERSIONBEINGUPGRADED"

         MigrateFeatures="yes"

         />

      <?endif?>

       <UpgradeVersion 

-        Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@"

+        Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@"

         Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.999"

+        IncludeMinimum="no"

         OnlyDetect="yes"

         Property="NEWERVERSIONDETECTED" />

     </Upgrade>