MP1-5019: Bump MariaDB version to MariaDB 10.11.8

MediaPortal · May 31, 2024 · bc9d9ba · bc9d9ba
1 parent d671f22
commit bc9d9ba
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/Tools/MediaPortal.DeployTool/ApplicationLocations.xml b/Tools/MediaPortal.DeployTool/ApplicationLocations.xml
@@ -34,6 +34,26 @@
     <TYPE>Manual</TYPE>
   </WindowsMediaPlayer>
 
+  <!-- Section used by 1.33.100+ installer -->
+
+  <MySQL83>
+    <URL>https://install.team-mediaportal.com/MySql_8_3</URL>
+    <FILE>mysql-8.3.0-winx64.msi</FILE>
+    <TYPE>Automatic</TYPE>
+  </MySQL83>
+
+  <MariaDB10>
+    <URL>https://install.team-mediaportal.com/MariaDB_10</URL>
+    <FILE>mariadb-10.11.8-winx64.msi</FILE>
+    <TYPE>Automatic</TYPE>
+  </MariaDB10>
+
+  <DotNetFramework>
+    <URL>https://install.team-mediaportal.com/DotNetFramework</URL>
+    <FILE>dotNetFx40_Full_x86_x64.exe</FILE>
+    <TYPE>Automatic</TYPE>
+  </DotNetFramework>
+
   <!-- Section used by 1.31.100+ installer -->
 
   <VCRedist2013>
@@ -43,8 +63,6 @@
     <X64 />
   </VCRedist2013>
 
-  <!-- VCRedistr 2015-2022 -->
-
   <VCRedist2015>
     <URL>https://install.team-mediaportal.com/VcRedist2015</URL>
     <FILE>vcredist2015_x86.exe</FILE>

diff --git a/Tools/MediaPortal.DeployTool/InstallationChecks/MariaDBChecker.cs b/Tools/MediaPortal.DeployTool/InstallationChecks/MariaDBChecker.cs
@@ -330,7 +330,7 @@ public CheckResult CheckStatus()
         return result;
       }
 
-      RegistryKey key = Utils.LMOpenSubKey("SOFTWARE\\MariaDB 10.0 (x64)");
+      RegistryKey key = Utils.LMOpenSubKey("SOFTWARE\\MariaDB 10.11 (x64)");
       if (key == null)
       {
         result.state = CheckState.NOT_INSTALLED;