Merge remote-tracking branch 'remotes/origin/MP1-4918-Bump_version_nu…

…mber_and_set_debug_level_to_DEBUG_for_MP_1.20_Pre_Release'
MediaPortal · Jun 14, 2018 · f992833 · f992833
2 parents 3cc80cc + 8b9e769
commit f992833
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 21 deletions.
diff --git a/Common-MP-TVE3/Common.Utils/Compatibility/CompatibilityManager.cs b/Common-MP-TVE3/Common.Utils/Compatibility/CompatibilityManager.cs
@@ -1,6 +1,6 @@
-#region Copyright (C) 2005-2010 Team MediaPortal
+#region Copyright (C) 2005-2018 Team MediaPortal
 
-// Copyright (C) 2005-2010 Team MediaPortal
+// Copyright (C) 2005-2018 Team MediaPortal
 // http://www.team-mediaportal.com
 // 
 // MediaPortal is free software: you can redistribute it and/or modify
@@ -393,7 +393,9 @@ public static bool IsPluginCompatible(System.Xml.XmlElement rootNode)
       { new Version("1.14.100.0"), "1.15.0 Pre Release" },
       { new Version("1.15.100.0"), "1.16.0 Pre Release" },
       { new Version("1.16.100.0"), "1.17.0 Pre Release" },
-      { new Version("1.17.100.0"), "1.18.0 Pre Release" }
+      { new Version("1.17.100.0"), "1.18.0 Pre Release" },
+      { new Version("1.18.100.0"), "1.19.0 Pre Release" },
+      { new Version("1.19.100.0"), "1.20.0 Pre Release" }
     };
 
     public static string MediaPortalReleaseForApiVersion(Version apiVersion)

diff --git a/Common-MP-TVE3/SolutionInfo.cs b/Common-MP-TVE3/SolutionInfo.cs
@@ -37,7 +37,7 @@
 
 [assembly: AssemblyCompany("Team MediaPortal")]
 [assembly: AssemblyProduct("MediaPortal")]
-[assembly: AssemblyCopyright("Copyright © 2005-2011 Team MediaPortal")]
+[assembly: AssemblyCopyright("Copyright © 2005-2018 Team MediaPortal")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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.19.000.0")]
-[assembly: AssemblyFileVersion("1.19.000.0")]
+[assembly: AssemblyVersion("1.19.100.0")]
+[assembly: AssemblyFileVersion("1.19.100.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
@@ -32,7 +32,7 @@
 
 !define VER_MAJOR       1
 !define VER_MINOR       19
-!define VER_REVISION    000
+!define VER_REVISION    100
 
 #**********************************************************************************************************#
 

diff --git a/Tools/MediaPortal.DeployTool/Utils.cs b/Tools/MediaPortal.DeployTool/Utils.cs
@@ -687,8 +687,8 @@ public static Version GetPackageVersion(string type)
           break;
         case "max":
           major = 1;
-          minor = 18;
-          revision = 100;
+          minor = 19;
+          revision = 0;
           break;
       }
       Version ver = new Version(major, minor, revision);
@@ -709,7 +709,7 @@ public static Version GetCurrentPackageVersion()
     {
       int major = 1;
       int minor = 19;
-      int revision = 000;
+      int revision = 100;
 
       Version ver = new Version(major, minor, revision);
       return ver;
@@ -782,7 +782,7 @@ public static Version VersionFromRegistry(string regkey)
 
     public static string GetDisplayVersion()
     {
-      return "1.19.0";
+      return "1.20.0 Pre Release";
     }
 
     /// <summary>

diff --git a/mediaportal/Configuration/App.config b/mediaportal/Configuration/App.config
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <probing privatePath="plugins\ExternalPlayers;plugins\process;plugins\subtitle;plugins\windows"/>
+      <probing privatePath="plugins\ExternalPlayers;plugins\process;plugins\subtitle;plugins\windows" />
       <dependentAssembly>
         <assemblyIdentity name="Gentle.Common" publicKeyToken="80b5de62e27be49b" culture="neutral" />
         <bindingRedirect oldVersion="1.5.0.29053-1.5.0.29112" newVersion="1.5.0.29113" />
@@ -20,13 +20,13 @@
         <bindingRedirect oldVersion="1.5.0.29053-1.5.0.29112" newVersion="1.5.0.29113" />
       </dependentAssembly>
     </assemblyBinding>
-    <loadFromRemoteSources enabled="true"/>
+    <loadFromRemoteSources enabled="true" />
   </runtime>
   <appSettings>
-    <add key="version" value="1.19.0" />
+    <add key="version" value="1.20.0 Pre Release" />
   </appSettings>
   <startup useLegacyV2RuntimeActivationPolicy="true">
     <supportedRuntime version="v4.0.30319" />
     <supportedRuntime version="v2.0.50727" />
   </startup>
- </configuration>
+ </configuration>
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 = "2"; // 1= error, 2 = info, 3 = debug
+    private string loglevel = "3"; // 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", "2"); // set loglevel to 2:info 3:debug
+        loglevel = xmlreader.GetValueAsString("general", "loglevel", "3"); // 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
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup useLegacyV2RuntimeActivationPolicy="true">
     <supportedRuntime version="v4.0.30319" />
@@ -35,7 +35,7 @@
     <loadFromRemoteSources enabled="true" />
   </runtime>
   <appSettings>
-    <add key="version" value="1.19.0" />
+    <add key="version" value="1.20.0 Pre Release" />
     <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", "2"));
+          (Level)Enum.Parse(typeof (Level), xmlreader.GetValueAsString("general", "loglevel", "3"));
       }
       bConfiguration = false;
     }