Skip to content
Permalink
Browse files

Merge remote-tracking branch 'remotes/origin/MP1.23_Release_test1'

 Conflicts:
	mediaportal/MediaPortal.Base/skin/DefaultWideHD/tvZAPOSD.xml
  • Loading branch information...
Azzuro committed Sep 9, 2019
2 parents f01da7a + 928ef56 commit 1bdd3a7bd916ea1e17bf4171779c0afda0fa5044
@@ -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.22.100.0")]
[assembly: AssemblyFileVersion("1.22.100.0")]
[assembly: AssemblyVersion("1.23.000.0")]
[assembly: AssemblyFileVersion("1.23.000.0")]

//[assembly: AssemblyInformationalVersion("")]
//[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")]
@@ -31,8 +31,8 @@


!define VER_MAJOR 1
!define VER_MINOR 22
!define VER_REVISION 100
!define VER_MINOR 23
!define VER_REVISION 0

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

@@ -688,7 +688,7 @@ public static Version GetPackageVersion(string type)
case "max":
major = 1;
minor = 22;
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 = 22;
int revision = 100;
int minor = 23;
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.23.0 Pre Release";
return "1.23.0";
}

/// <summary>
@@ -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);
}
}
@@ -23,7 +23,7 @@
<loadFromRemoteSources enabled="true" />
</runtime>
<appSettings>
<add key="version" value="1.23.0 Pre Release" />
<add key="version" value="1.23.0" />
</appSettings>
<startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0.30319" />
@@ -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.23.0 Pre Release" />
<add key="version" value="1.23.0" />
<add key="edtftp.log.level" value="ALL" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
Binary file not shown.

0 comments on commit 1bdd3a7

Please sign in to comment.
You can’t perform that action at this time.