Merge pull request #333 from MediaPortal/MP1.35_Final_Test1

MP1.35 Final Release
MediaPortal · Sep 19, 2024 · 04961b7 · 04961b7
2 parents 8ae80e8 + 77b39ce
commit 04961b7
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 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.34.100.0")]
-[assembly: AssemblyFileVersion("1.34.100.0")]
+[assembly: AssemblyVersion("1.35.000.0")]
+[assembly: AssemblyFileVersion("1.35.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       34
-!define VER_REVISION    100
+!define VER_MINOR       35
+!define VER_REVISION    000
 
 #**********************************************************************************************************#
 

diff --git a/Tools/MediaPortal.DeployTool/Utils.cs b/Tools/MediaPortal.DeployTool/Utils.cs
@@ -782,7 +782,7 @@ public static Version GetPackageVersion(string type)
         case "max":
           major = 1;
           minor = 34;
-          revision = 000;
+          revision = 100;
           break;
       }
       Version ver = new Version(major, minor, revision);
@@ -802,8 +802,8 @@ public static bool IsPackageUpdatabled(Version pkgVer)
     public static Version GetCurrentPackageVersion()
     {
       int major = 1;
-      int minor = 34;
-      int revision = 100;
+      int minor = 35;
+      int revision = 000;
 
       Version ver = new Version(major, minor, revision);
       return ver;
@@ -853,7 +853,7 @@ public static Version VersionFromRegistry(string regkey)
 
     public static string GetDisplayVersion()
     {
-      return "1.35 Pre Release";
+      return "1.35 Horizon";
     }
 
     /// <summary>

diff --git a/TvEngine3/TVLibrary/TVDatabase/TvBusinessLayer/BusinessLayer.cs b/TvEngine3/TVLibrary/TVDatabase/TvBusinessLayer/BusinessLayer.cs
@@ -3399,7 +3399,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/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 1.35.Pre.Release.{build}
+version: 1.35.Final.{build}
 image: Visual Studio 2019
 clone_folder: c:\project\mediaportal
 environment:

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.35-Pre Release" />
+    <add key="version" value="1.35-Horizon" />
   </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.

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.35-Pre Release" />
+    <add key="version" value="1.35-Horizon" />
     <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
@@ -63,7 +63,7 @@ public LogImpl()
       //BackupLogFiles();
       using (Settings xmlreader = new MPSettings())
       {
-        _minLevel = (Level)Enum.Parse(typeof (Level), xmlreader.GetValueAsString("general", "loglevel", "3")); // set loglevel to 2:info 3:debug
+        _minLevel = (Level)Enum.Parse(typeof (Level), xmlreader.GetValueAsString("general", "loglevel", "2")); // set loglevel to 2:info 3:debug
       }
       bConfiguration = false;
     }