Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MP1-5219: Install Outdated SQL Server for Outdated Windows like Windows 7 x86 #316

Merged
merged 11 commits into from
Jun 11, 2024
Merged

MP1-5219: Install Outdated SQL Server for Outdated Windows like Windows 7 x86 #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9041114
MP1-5219: Install Outdated SQL Server for Outdated Windows like Windo…
andrewjswan May 28, 2024
f1af3c6
MP1-5219: Tune MySQL Service Name
andrewjswan May 28, 2024
2f824ae
MP1-5219: Add Manifest foe Windows 10+
andrewjswan May 28, 2024
cce1e11
MP1-5219: Add SQL Service Dependencies
andrewjswan May 28, 2024
d5bb483
MP1-5219: Attempt to fix Timeout Error
andrewjswan May 29, 2024
daa4b2d
MP1-5219: Second attempt to fix Timeout Error
andrewjswan May 29, 2024
7eb2000
MP1-5219: Cosmetic
andrewjswan May 29, 2024
61dce49
MP1-5219: Monkey patch
andrewjswan May 29, 2024
d671f22
MP1-5219: Chore: Move SQL to Folder
andrewjswan May 29, 2024
bc9d9ba
MP1-5019: Bump MariaDB version to MariaDB 10.11.8
andrewjswan May 31, 2024
6046adf
MP1-5219: For older OS we use the old connection string
andrewjswan May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions Tools/MediaPortal.DeployTool/ApplicationLocations.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -43,8 +63,6 @@
<X64 />
</VCRedist2013>

<!-- VCRedistr 2015-2022 -->

<VCRedist2015>
<URL>https://install.team-mediaportal.com/VcRedist2015</URL>
<FILE>vcredist2015_x86.exe</FILE>
Expand Down
2 changes: 1 addition & 1 deletion Tools/MediaPortal.DeployTool/InstallationChecks/MariaDBChecker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading
Loading