From b6ccbe9e6e3ad951bae72ae88c39a17d5a8a6a04 Mon Sep 17 00:00:00 2001 From: "Andrew J.Swan" Date: Wed, 16 Jun 2021 23:19:50 +0300 Subject: [PATCH] MP1-1.28Final: Bump version number and set DEBUG level to INFO --- Common-MP-TVE3/SolutionInfo.cs | 4 ++-- .../include/MediaPortalCurrentVersion.nsh | 4 ++-- Tools/MediaPortal.DeployTool/Utils.cs | 8 ++++---- .../TVLibrary/TVDatabase/TvBusinessLayer/BusinessLayer.cs | 2 +- appveyor.yml | 2 +- mediaportal/Configuration/App.config | 2 +- mediaportal/Configuration/Sections/General.cs | 4 ++-- mediaportal/MediaPortal.Application/App.config | 2 +- mediaportal/Utils/ServiceImplementations/LogImpl.cs | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Common-MP-TVE3/SolutionInfo.cs b/Common-MP-TVE3/SolutionInfo.cs index c9d52277a32..6dcb78c2efc 100644 --- a/Common-MP-TVE3/SolutionInfo.cs +++ b/Common-MP-TVE3/SolutionInfo.cs @@ -51,8 +51,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.27.100.0")] -[assembly: AssemblyFileVersion("1.27.100.0")] +[assembly: AssemblyVersion("1.28.000.0")] +[assembly: AssemblyFileVersion("1.28.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 index eb98d303c37..1a01bd3aed4 100644 --- a/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh +++ b/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh @@ -31,8 +31,8 @@ !define VER_MAJOR 1 -!define VER_MINOR 27 -!define VER_REVISION 100 +!define VER_MINOR 28 +!define VER_REVISION 000 #**********************************************************************************************************# diff --git a/Tools/MediaPortal.DeployTool/Utils.cs b/Tools/MediaPortal.DeployTool/Utils.cs index 9e74d1d5e2f..da2291cc10d 100644 --- a/Tools/MediaPortal.DeployTool/Utils.cs +++ b/Tools/MediaPortal.DeployTool/Utils.cs @@ -718,7 +718,7 @@ public static Version GetPackageVersion(string type) case "max": major = 1; minor = 27; - revision = 000; + revision = 100; break; } Version ver = new Version(major, minor, revision); @@ -738,8 +738,8 @@ public static bool IsPackageUpdatabled(Version pkgVer) public static Version GetCurrentPackageVersion() { int major = 1; - int minor = 27; - int revision = 100; + int minor = 28; + int revision = 000; Version ver = new Version(major, minor, revision); return ver; @@ -812,7 +812,7 @@ public static Version VersionFromRegistry(string regkey) public static string GetDisplayVersion() { - return "1.28 Pre Release"; + return "1.28"; } /// diff --git a/TvEngine3/TVLibrary/TVDatabase/TvBusinessLayer/BusinessLayer.cs b/TvEngine3/TVLibrary/TVDatabase/TvBusinessLayer/BusinessLayer.cs index 557428d085f..17894e52eaf 100644 --- a/TvEngine3/TVLibrary/TVDatabase/TvBusinessLayer/BusinessLayer.cs +++ b/TvEngine3/TVLibrary/TVDatabase/TvBusinessLayer/BusinessLayer.cs @@ -3393,7 +3393,7 @@ public bool IsChannelMappedToCard(Channel dbChannel, Card card, bool forEpg) /// public void SetLogLevel() { - var logLevel = (LogLevel)int.Parse(GetSetting("loglevel", "5").Value); // debug is "5", info is "4" + var logLevel = (LogLevel)int.Parse(GetSetting("loglevel", "4").Value); // debug is "5", info is "4" Log.SetLogLevel(logLevel); } } diff --git a/appveyor.yml b/appveyor.yml index cce7378459b..1759d41affc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.28.Pre.Release.{build} +version: 1.28.Final.{build} image: Visual Studio 2019 clone_folder: c:\project\mediaportal environment: diff --git a/mediaportal/Configuration/App.config b/mediaportal/Configuration/App.config index 38be410cd67..18b81036e13 100644 --- a/mediaportal/Configuration/App.config +++ b/mediaportal/Configuration/App.config @@ -23,7 +23,7 @@ - + diff --git a/mediaportal/Configuration/Sections/General.cs b/mediaportal/Configuration/Sections/General.cs index 18b8b256dc3..1c1fe38d8c8 100644 --- a/mediaportal/Configuration/Sections/General.cs +++ b/mediaportal/Configuration/Sections/General.cs @@ -42,7 +42,7 @@ public General(string name) InitializeComponent(); } - private string loglevel = "3"; // 1= error, 2 = info, 3 = debug + private string loglevel = "2"; // 1= error, 2 = info, 3 = debug /// /// Erforderliche Designervariable. @@ -53,7 +53,7 @@ public override void LoadSettings() { using (Settings xmlreader = new MPSettings()) { - loglevel = xmlreader.GetValueAsString("general", "loglevel", "3"); // set loglevel to 2:info 3:debug + loglevel = xmlreader.GetValueAsString("general", "loglevel", "2"); // set loglevel to 2:info 3:debug cbDebug.SelectedIndex = Convert.ToInt16(loglevel); string prio = xmlreader.GetValueAsString("general", "ThreadPriority", "Normal"); diff --git a/mediaportal/MediaPortal.Application/App.config b/mediaportal/MediaPortal.Application/App.config index 9080e9d565f..4335164e3f3 100644 --- a/mediaportal/MediaPortal.Application/App.config +++ b/mediaportal/MediaPortal.Application/App.config @@ -35,7 +35,7 @@ - + diff --git a/mediaportal/Utils/ServiceImplementations/LogImpl.cs b/mediaportal/Utils/ServiceImplementations/LogImpl.cs index 6888fa6d48a..2f77c7b3aae 100644 --- a/mediaportal/Utils/ServiceImplementations/LogImpl.cs +++ b/mediaportal/Utils/ServiceImplementations/LogImpl.cs @@ -64,7 +64,7 @@ public LogImpl() using (Settings xmlreader = new MPSettings()) { _minLevel = - (Level)Enum.Parse(typeof (Level), xmlreader.GetValueAsString("general", "loglevel", "3")); // set loglevel to 2:info 3:debug + (Level)Enum.Parse(typeof (Level), xmlreader.GetValueAsString("general", "loglevel", "2")); // set loglevel to 2:info 3:debug } bConfiguration = false; }