Permalink
Browse files

MP1-4933_Bump-version-number-and-set-debug-level-to-INFO-for-MP-1.21-…

…Final
  • Loading branch information...
owlsroost committed Jan 17, 2019
1 parent 25afd69 commit f37645163d7936f72cf392e9c46c8b1483bf3af6
@@ -1,6 +1,6 @@
#region Copyright (C) 2005-2018 Team MediaPortal
#region Copyright (C) 2005-2019 Team MediaPortal

// Copyright (C) 2005-2018 Team MediaPortal
// Copyright (C) 2005-2019 Team MediaPortal
// http://www.team-mediaportal.com
//
// MediaPortal is free software: you can redistribute it and/or modify
@@ -37,7 +37,7 @@

[assembly: AssemblyCompany("Team MediaPortal")]
[assembly: AssemblyProduct("MediaPortal")]
[assembly: AssemblyCopyright("Copyright © 2005-2018 Team MediaPortal")]
[assembly: AssemblyCopyright("Copyright © 2005-2019 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.20.100.0")]
[assembly: AssemblyFileVersion("1.20.100.0")]
[assembly: AssemblyVersion("1.21.000.0")]
[assembly: AssemblyFileVersion("1.21.000.0")]

//[assembly: AssemblyInformationalVersion("")]
//[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")]
@@ -1,6 +1,6 @@
#region Copyright (C) 2005-2018 Team MediaPortal
#region Copyright (C) 2005-2019 Team MediaPortal
/*
// Copyright (C) 2005-2018 Team MediaPortal
// Copyright (C) 2005-2019 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 20
!define VER_REVISION 100
!define VER_MINOR 21
!define VER_REVISION 0

#**********************************************************************************************************#

@@ -1,6 +1,6 @@
#region Copyright (C) 2005-2018 Team MediaPortal
#region Copyright (C) 2005-2019 Team MediaPortal

// Copyright (C) 2005-2018 Team MediaPortal
// Copyright (C) 2005-2019 Team MediaPortal
// http://www.team-mediaportal.com
//
// MediaPortal is free software: you can redistribute it and/or modify
@@ -688,7 +688,7 @@ public static Version GetPackageVersion(string type)
case "max":
major = 1;
minor = 20;
revision = 0;
revision = 100;
break;
}
Version ver = new Version(major, minor, revision);
@@ -708,8 +708,8 @@ public static bool IsPackageUpdatabled(Version pkgVer)
public static Version GetCurrentPackageVersion()
{
int major = 1;
int minor = 20;
int revision = 100;
int minor = 21;
int revision = 0;

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.21.0 Pre Release";
return "1.21.0";
}

/// <summary>
@@ -23,7 +23,7 @@
<loadFromRemoteSources enabled="true" />
</runtime>
<appSettings>
<add key="version" value="1.21.0 Pre Release" />
<add key="version" value="1.21.0" />
</appSettings>
<startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0.30319" />
@@ -1,6 +1,6 @@
#region Copyright (C) 2005-2018 Team MediaPortal
#region Copyright (C) 2005-2019 Team MediaPortal

// Copyright (C) 2005-2018 Team MediaPortal
// Copyright (C) 2005-2019 Team MediaPortal
// http://www.team-mediaportal.com
//
// MediaPortal is free software: you can redistribute it and/or modify
@@ -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");
@@ -35,7 +35,7 @@
<loadFromRemoteSources enabled="true" />
</runtime>
<appSettings>
<add key="version" value="1.21.0 Pre Release" />
<add key="version" value="1.21.0" />
<add key="edtftp.log.level" value="ALL" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
@@ -1,6 +1,6 @@
#region Copyright (C) 2005-2018 Team MediaPortal
#region Copyright (C) 2005-2019 Team MediaPortal

// Copyright (C) 2005-2018 Team MediaPortal
// Copyright (C) 2005-2019 Team MediaPortal
// http://www.team-mediaportal.com
//
// MediaPortal is free software: you can redistribute it and/or modify
@@ -64,7 +64,7 @@ public LogImpl()
using (Settings xmlreader = new MPSettings())
{
_minLevel =
(Level)Enum.Parse(typeof (Level), xmlreader.GetValueAsString("general", "loglevel", "3"));
(Level)Enum.Parse(typeof (Level), xmlreader.GetValueAsString("general", "loglevel", "2"));
}
bConfiguration = false;
}

0 comments on commit f376451

Please sign in to comment.