Skip to content

Commit 78aa9ae

Browse files
author
Paweł Andruszkiewicz
committed
BUG#37049411 mysqlsh fails to start after msi installation on windows 11
Shell failed to start when VS redistributable 14.3x was installed on the system. With this fix, when Shell is built with VS 17.1x (VS C++ 19.4x), a VS redistributable 14.40 or newer is required when installing the MSI package. See also: https://devblogs.microsoft.com/cppblog/msvc-toolset-minor-version-number-14-40-in-vs-2022-v17-10/ Change-Id: I851e1ba78cbfcad128203f61795b4e24331fc931
1 parent 202f9b9 commit 78aa9ae

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

cmake/WIX.template.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
<!-- This is a string-based comparison, but we should be OK, given the versioning scheme used, since we only care about major.minor part. -->
100100
<Launch
101101
Condition="Installed OR VS14REDIST &gt;= &quot;@CPACK_WIX_REDIST_VERSION@&quot;"
102-
Message="This application requires Visual Studio @CPACK_WIX_REDIST_YEAR@ Redistributable. Please install the Redistributable then run this installer again." />
102+
Message="This application requires Visual Studio @CPACK_WIX_REDIST_YEAR@ Redistributable version @CPACK_WIX_REDIST_VERSION@ or newer. Please install the Redistributable then run this installer again." />
103103
<?endif?>
104104

105105
<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch MySQL Shell" />

cmake/packaging.cmake

+4-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@ if(WIN32)
7171
set(CPACK_WIX_PROGRAM_MENU_FOLDER "MySQL")
7272
if(NOT BUNDLE_RUNTIME_LIBRARIES)
7373
set(CPACK_WIX_VS_REDIST_CHECK "1")
74-
if(MSVC_VERSION GREATER_EQUAL 1930 AND MSVC_VERSION LESS_EQUAL 1941)
74+
if(MSVC_VERSION GREATER_EQUAL 1940 AND MSVC_VERSION LESS_EQUAL 1949)
75+
set(CPACK_WIX_REDIST_YEAR "2022")
76+
set(CPACK_WIX_REDIST_VERSION "14.40.0")
77+
elseif(MSVC_VERSION GREATER_EQUAL 1930 AND MSVC_VERSION LESS_EQUAL 1939)
7578
set(CPACK_WIX_REDIST_YEAR "2022")
7679
set(CPACK_WIX_REDIST_VERSION "14.30.0")
7780
elseif(MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS_EQUAL 1929)

0 commit comments

Comments
 (0)