diff --git a/.github/labeler.yml b/.github/labeler.yml index 52f0aff7cd1..c14244acb17 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -15,3 +15,6 @@ Tuning: MPE: - 'MPE' + +Skin: + - '(Titan|DWHD|skin)' diff --git a/.github/workflows/mediaportal.yml b/.github/workflows/mediaportal.yml index 59451437d47..52726d40325 100644 --- a/.github/workflows/mediaportal.yml +++ b/.github/workflows/mediaportal.yml @@ -52,7 +52,7 @@ jobs: - name: Setup NSIS run: | - choco install --yes nsis --version=3.09 --force + choco install --yes nsis --version=3.10 --force - name: Git Checkout uses: actions/checkout@v4 @@ -73,7 +73,7 @@ jobs: with: name: Build result file ${{ matrix.architecture }} path: | - ${{ github.workspace }}\Build\BuildFullInstaller.log + ${{ github.workspace }}\Build\*.log retention-days: ${{ inputs.retention-logs || 3 }} - name: Upload Artifact / Mediaportal setup file diff --git a/.github/workflows/workflow_codeql.yml b/.github/workflows/workflow_codeql.yml index 8d0adacb788..342a1430e53 100644 --- a/.github/workflows/workflow_codeql.yml +++ b/.github/workflows/workflow_codeql.yml @@ -33,7 +33,7 @@ jobs: - name: Setup NSIS run: | - choco install --yes nsis --version=3.09 --force + choco install --yes nsis --version=3.10 --force - name: Git Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/workflow_xml_validate.yml b/.github/workflows/workflow_xml_validate.yml index 97233590751..2e87d58c7da 100644 --- a/.github/workflows/workflow_xml_validate.yml +++ b/.github/workflows/workflow_xml_validate.yml @@ -18,6 +18,7 @@ jobs: - name: ⤵️ Check out configuration from GitHub uses: actions/checkout@v4 - name: 🚀 Run XML Validate - uses: action-pack/valid-xml@v1 + uses: kehoecj/validate-configs-action@v4 with: - file-endings: ".xml" + exclude-dirs: "MediaPortal.Tests" + exclude-file-types: "yaml,yml" diff --git a/Common-MP-TVE3/External/Gentle.NET/Documentation/Help/H2Reg.ini b/Common-MP-TVE3/External/Gentle.NET/Documentation/Help/H2Reg.help similarity index 100% rename from Common-MP-TVE3/External/Gentle.NET/Documentation/Help/H2Reg.ini rename to Common-MP-TVE3/External/Gentle.NET/Documentation/Help/H2Reg.help diff --git a/Common-MP-TVE3/External/Gentle.NET/Documentation/Help/Register.bat b/Common-MP-TVE3/External/Gentle.NET/Documentation/Help/Register.bat index f7cc248cdac..86251dc0d72 100644 --- a/Common-MP-TVE3/External/Gentle.NET/Documentation/Help/Register.bat +++ b/Common-MP-TVE3/External/Gentle.NET/Documentation/Help/Register.bat @@ -4,4 +4,4 @@ REM *** EDIT THE PATHS BELOW IF NEEDED REM REM Registers Gentle.Framework in HTML 2 Help REM -"C:\Program Files\Helpware\H2Reg\H2Reg.exe" -r cmdfile="C:\Code\Gentle.NET\Documentation\Help\H2Reg.ini" +"C:\Program Files\Helpware\H2Reg\H2Reg.exe" -r cmdfile="C:\Code\Gentle.NET\Documentation\Help\H2Reg.help" diff --git a/Common-MP-TVE3/External/Gentle.NET/Documentation/Help/Unregister.bat b/Common-MP-TVE3/External/Gentle.NET/Documentation/Help/Unregister.bat index 122f7cc1f1a..6ce018c149a 100644 --- a/Common-MP-TVE3/External/Gentle.NET/Documentation/Help/Unregister.bat +++ b/Common-MP-TVE3/External/Gentle.NET/Documentation/Help/Unregister.bat @@ -1,3 +1,3 @@ @echo off REM Unregisters Gentle.Framework in HTML 2 Help -"C:\Program Files\H2Reg\H2Reg.exe" -u cmdfile="C:\Code\Gentle.NET\Documentation\Help\H2Reg.ini" +"C:\Program Files\H2Reg\H2Reg.exe" -u cmdfile="C:\Code\Gentle.NET\Documentation\Help\H2Reg.help" diff --git a/Common-MP-TVE3/SolutionInfo.cs b/Common-MP-TVE3/SolutionInfo.cs index cade7bf9dc8..7528cfb9726 100644 --- 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.35.000.0")] -[assembly: AssemblyFileVersion("1.35.000.0")] +[assembly: AssemblyVersion("1.36.000.0")] +[assembly: AssemblyFileVersion("1.36.000.0")] //[assembly: AssemblyInformationalVersion("")] //[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")] diff --git a/Tools/InstallationScripts/XML-plugin/Example/test.xml b/Tools/InstallationScripts/XML-plugin/Example/test.xml index ffba3d99ee7..706cae725a5 100644 --- a/Tools/InstallationScripts/XML-plugin/Example/test.xml +++ b/Tools/InstallationScripts/XML-plugin/Example/test.xml @@ -1,5 +1,6 @@ + AAA @@ -17,3 +18,4 @@ HHH + diff --git a/Tools/InstallationScripts/include-MP-PreBuild.nsh b/Tools/InstallationScripts/include-MP-PreBuild.nsh index 4f4d094cce6..85fe707a4db 100644 --- a/Tools/InstallationScripts/include-MP-PreBuild.nsh +++ b/Tools/InstallationScripts/include-MP-PreBuild.nsh @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2023 Team MediaPortal +#region Copyright (C) 2005-2024 Team MediaPortal /* -// Copyright (C) 2005-2023 Team MediaPortal +// Copyright (C) 2005-2024 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify @@ -110,7 +110,7 @@ ; Build MP installer !ifdef BUILD_Installer ;!system '${git_ROOT}\Build\MSBUILD_MP_LargeAddressAware.bat Release' = 0 -!system '"${NSISDIR}\makensis.exe" /DBUILD_TYPE=Release /DArchitecture=${Architecture} "${git_MP}\Setup\setup.nsi"' = 0 +!system '"${NSISDIR}\makensis.exe" /V3 /DBUILD_TYPE=Release /DArchitecture=${Architecture} "${git_MP}\Setup\setup.nsi" > ${git_ROOT}\Build\BuildMediaportal.log' = 0 !endif ; Build TV server @@ -139,5 +139,5 @@ ; Build TV installer !ifdef BUILD_Installer -!system '"${NSISDIR}\makensis.exe" /DBUILD_TYPE=Release /DArchitecture=${Architecture} "${git_TVServer}\Setup\setup.nsi"' = 0 +!system '"${NSISDIR}\makensis.exe" /V3 /DBUILD_TYPE=Release /DArchitecture=${Architecture} "${git_TVServer}\Setup\setup.nsi" > ${git_ROOT}\Build\BuildTVServer.log' = 0 !endif diff --git a/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh b/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh index bb65427ecb4..5a1e87e2cee 100644 --- a/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh +++ b/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh @@ -31,7 +31,7 @@ !define VER_MAJOR 1 -!define VER_MINOR 35 +!define VER_MINOR 36 !define VER_REVISION 000 #**********************************************************************************************************# diff --git a/Tools/InstallationScripts/include/MediaPortalMacros.nsh b/Tools/InstallationScripts/include/MediaPortalMacros.nsh index bffd3d616eb..9ea6934c194 100644 --- a/Tools/InstallationScripts/include/MediaPortalMacros.nsh +++ b/Tools/InstallationScripts/include/MediaPortalMacros.nsh @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2023 Team MediaPortal +#region Copyright (C) 2005-2024 Team MediaPortal /* -// Copyright (C) 2005-2023 Team MediaPortal +// Copyright (C) 2005-2024 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify @@ -18,8 +18,8 @@ */ #endregion -!if "${NSIS_VERSION}" != "v3.09" - !error "$\r$\n$\r$\nUnsupported NSIS version: ${NSIS_VERSION}. Please use NSIS v3.09, http://nsis.sourceforge.net$\r$\n$\r$\n" +!if "${NSIS_VERSION}" != "v3.10" + !error "$\r$\n$\r$\nUnsupported NSIS version: ${NSIS_VERSION}. Please use NSIS v3.10, http://nsis.sourceforge.net$\r$\n$\r$\n" !endif !ifndef ___COMMON_MP_MACROS__NSH___ diff --git a/Tools/MediaPortal.DeployTool/Utils.cs b/Tools/MediaPortal.DeployTool/Utils.cs index 439b3befffc..e5c5b81dc9f 100644 --- a/Tools/MediaPortal.DeployTool/Utils.cs +++ b/Tools/MediaPortal.DeployTool/Utils.cs @@ -781,7 +781,7 @@ public static Version GetPackageVersion(string type) break; case "max": major = 1; - minor = 34; + minor = 35; revision = 100; break; } @@ -802,7 +802,7 @@ public static bool IsPackageUpdatabled(Version pkgVer) public static Version GetCurrentPackageVersion() { int major = 1; - int minor = 35; + int minor = 36; int revision = 000; Version ver = new Version(major, minor, revision); @@ -853,7 +853,7 @@ public static Version VersionFromRegistry(string regkey) public static string GetDisplayVersion() { - return "1.35 Horizon"; + return "1.36 Polar Express"; } /// diff --git a/Tools/SkinEditor/config.xml b/Tools/SkinEditor/config.xml index bcf3ed5bffa..6097facfa5b 100644 Binary files a/Tools/SkinEditor/config.xml and b/Tools/SkinEditor/config.xml differ diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Croatia.D3 - sjeverna hrvatska.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Croatia.D3 - sjeverna hrvatska.xml index 4f2ea01e4fd..93ceb8fe938 100644 --- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Croatia.D3 - sjeverna hrvatska.xml +++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Croatia.D3 - sjeverna hrvatska.xml @@ -4,6 +4,7 @@ 658000 8 0 + 690000 8 diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Ireland.Donegal - Holywell Hill.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Ireland.Donegal - Holywell Hill.xml index b918e8f8af3..cdf0785dcf8 100644 --- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Ireland.Donegal - Holywell Hill.xml +++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Ireland.Donegal - Holywell Hill.xml @@ -5,6 +5,7 @@ 8 167 + 506000 8 167 diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Beacon Hill.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Beacon Hill.xml index accf7d2f24b..cf8dd6a2100 100644 --- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Beacon Hill.xml +++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Beacon Hill.xml @@ -36,4 +36,4 @@ 8 167 -3 \ No newline at end of file + diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Bluebell Hill.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Bluebell Hill.xml index 51940ffe01d..3ab6ae0f22d 100644 --- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Bluebell Hill.xml +++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Bluebell Hill.xml @@ -1,6 +1,7 @@ + 562000 8 167 @@ -47,4 +48,4 @@ 8 167 - \ No newline at end of file + diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Rosneath.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Rosneath.xml index 8bdc993fc1c..97ce5d62130 100644 --- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Rosneath.xml +++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Rosneath.xml @@ -1,6 +1,7 @@ + 618000 8 167 @@ -35,4 +36,4 @@ 8 167 - \ No newline at end of file + diff --git a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Tunbridge Wells.xml b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Tunbridge Wells.xml index 5d5db3c8c68..361a06a7024 100644 --- a/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Tunbridge Wells.xml +++ b/TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Tunbridge Wells.xml @@ -1,6 +1,7 @@ + 634000 8 167 @@ -41,4 +42,4 @@ 8 167 - \ No newline at end of file + diff --git a/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/FR/linternaute_com.xml b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/FR/linternaute_com.xml index e4947f53c80..612abc3f4b2 100644 --- a/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/FR/linternaute_com.xml +++ b/TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/FR/linternaute_com.xml @@ -7,8 +7,8 @@ - - + + @@ -18,13 +18,13 @@ - - + + - + @@ -34,7 +34,7 @@ - + @@ -42,33 +42,33 @@ - - - + + + - + - + - - + + - - - + + + - + - + @@ -76,7 +76,7 @@ - + @@ -87,7 +87,7 @@ -