Merge pull request #323 from MediaPortal/MP1.34_Final_Release

MP1.34: Final Release
MediaPortal · Jun 19, 2024 · 58c9558 · 58c9558
2 parents 19a06d1 + 9c14bf5
commit 58c9558
Show file tree

Hide file tree

Showing 102 changed files with 3,453 additions and 2,204 deletions.
diff --git a/Common-MP-TVE3/SolutionInfo.cs b/Common-MP-TVE3/SolutionInfo.cs
@@ -50,8 +50,8 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.33.100.0")]
-[assembly: AssemblyFileVersion("1.33.100.0")]
+[assembly: AssemblyVersion("1.34.000.0")]
+[assembly: AssemblyFileVersion("1.34.000.0")]
 
 //[assembly: AssemblyInformationalVersion("")]
 //[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")]
diff --git a/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh b/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh
@@ -31,8 +31,8 @@
 
 
 !define VER_MAJOR       1
-!define VER_MINOR       33
-!define VER_REVISION    100
+!define VER_MINOR       34
+!define VER_REVISION    000
 
 #**********************************************************************************************************#
 

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;