Merge remote-tracking branch 'remotes/Mediaportal/MP1-1.26Final-Bump_…

…version_number_and_set_DEBUG_level_to_INFO_for_MP_1.26_Full_Release'
MediaPortal · Oct 25, 2020 · 80653d2 · 80653d2
2 parents 3c403a9 + f67cb3c
commit 80653d2
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 25 deletions.
diff --git a/Common-MP-TVE3/SolutionInfo.cs b/Common-MP-TVE3/SolutionInfo.cs
@@ -1,6 +1,6 @@
-#region Copyright (C) 2005-2019 Team MediaPortal
+#region Copyright (C) 2005-2020 Team MediaPortal
 
-// Copyright (C) 2005-2019 Team MediaPortal
+// Copyright (C) 2005-2020 Team MediaPortal
 // http://www.team-mediaportal.com
 // 
 // MediaPortal is free software: you can redistribute it and/or modify
@@ -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.25.100.0")]
-[assembly: AssemblyFileVersion("1.25.100.0")]
+[assembly: AssemblyVersion("1.26.000.0")]
+[assembly: AssemblyFileVersion("1.26.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
@@ -1,6 +1,6 @@
-#region Copyright (C) 2005-2019 Team MediaPortal
+#region Copyright (C) 2005-2020 Team MediaPortal
 /*
-// Copyright (C) 2005-2019 Team MediaPortal
+// Copyright (C) 2005-2020 Team MediaPortal
 // http://www.team-mediaportal.com
 // 
 // MediaPortal is free software: you can redistribute it and/or modify
@@ -31,8 +31,8 @@
 
 
 !define VER_MAJOR       1
-!define VER_MINOR       25
-!define VER_REVISION    100
+!define VER_MINOR       26
+!define VER_REVISION    000
 
 #**********************************************************************************************************#
 

diff --git a/Tools/MediaPortal.DeployTool/Utils.cs b/Tools/MediaPortal.DeployTool/Utils.cs
@@ -706,7 +706,7 @@ public static Version GetPackageVersion(string type)
     {
       int major = 0;
       int minor = 0;
-      int revision = 0;
+      int revision = 100;
 
       switch (type)
       {
@@ -718,7 +718,7 @@ public static Version GetPackageVersion(string type)
         case "max":
           major = 1;
           minor = 25;
-          revision = 0;
+          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 = 25;
-      int revision = 100;
+      int minor = 26;
+      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.26 Pre Release";
+      return "1.26";
     }
 
     /// <summary>

diff --git 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)
     /// </summary>
     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/mediaportal/Configuration/App.config b/mediaportal/Configuration/App.config
@@ -23,7 +23,7 @@
     <loadFromRemoteSources enabled="true" />
   </runtime>
   <appSettings>
-    <add key="version" value="1.26 Pre Release" />
+    <add key="version" value="1.26" />
   </appSettings>
   <startup useLegacyV2RuntimeActivationPolicy="true">
     <supportedRuntime version="v4.0.30319" />

diff --git 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
 
     /// <summary> 
     /// 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/Databases/Pictures/ADO/PictureDatabaseADO.cs b/mediaportal/Databases/Pictures/ADO/PictureDatabaseADO.cs
@@ -123,7 +123,7 @@ public int AddPicture(string strPicture, int iRotation)
             }
             catch (Exception ex)
             {
-              Log.Error("MediaPortal.Picture.Database: {0}", ex.Message);
+              Log.Error("MediaPortal.Picture.ADO: {0}", ex.Message);
             }
             // Smirnoff: Query the orientation information
             //						if(iRotation == -1)
@@ -135,7 +135,7 @@ public int AddPicture(string strPicture, int iRotation)
         }
         catch (Exception ex)
         {
-          Log.Error("MediaPortal.Picture.Database exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
+          Log.Error("MediaPortal.Picture.ADO exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
         }
         return -1;
       }
@@ -163,7 +163,7 @@ public void DeletePicture(string strPicture)
       }
       catch (Exception ex)
       {
-        Log.Error("MediaPortal.Picture.Database exception deleting picture err:{0} stack:{1}", ex.Message, ex.StackTrace);
+        Log.Error("MediaPortal.Picture.ADO exception deleting picture err:{0} stack:{1}", ex.Message, ex.StackTrace);
       }
     }
 
@@ -216,7 +216,7 @@ public int GetRotation(string strPicture)
       }
       catch (Exception ex)
       {
-        Log.Error("MediaPortal.Picture.Database exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
+        Log.Error("MediaPortal.Picture.ADO exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
       }
       return 0;
     }
@@ -242,7 +242,7 @@ public void SetRotation(string strPicture, int iRotation)
       }
       catch (Exception ex)
       {
-        Log.Error("MediaPortal.Picture.Database exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
+        Log.Error("MediaPortal.Picture.ADO exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
       }
     }
 
@@ -294,7 +294,7 @@ public DateTime GetDateTimeTaken(string strPicture)
       }
       catch (Exception ex)
       {
-        Log.Error("MediaPortal.Picture.Database exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
+        Log.Error("MediaPortal.Picture.ADO exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
       }
       return DateTime.MinValue;
     }

diff --git a/mediaportal/MediaPortal.Application/App.config b/mediaportal/MediaPortal.Application/App.config
@@ -35,7 +35,7 @@
     <loadFromRemoteSources enabled="true" />
   </runtime>
   <appSettings>
-    <add key="version" value="1.26-Pre Release" />
+    <add key="version" value="1.26-Winter is coming" />
     <add key="edtftp.log.level" value="ALL" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>

diff --git 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;
     }