Skip to content

Commit

Permalink
MP1-1.28Final: Bump version number and set DEBUG level to INFO
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewjswan committed Jun 16, 2021
1 parent bcb9324 commit b6ccbe9
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions Common-MP-TVE3/SolutionInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.27.100.0")]
[assembly: AssemblyFileVersion("1.27.100.0")]
[assembly: AssemblyVersion("1.28.000.0")]
[assembly: AssemblyFileVersion("1.28.000.0")]

//[assembly: AssemblyInformationalVersion("")]
//[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")]
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@


!define VER_MAJOR 1
!define VER_MINOR 27
!define VER_REVISION 100
!define VER_MINOR 28
!define VER_REVISION 000

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

Expand Down
8 changes: 4 additions & 4 deletions Tools/MediaPortal.DeployTool/Utils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@ public static Version GetPackageVersion(string type)
case "max":
major = 1;
minor = 27;
revision = 000;
revision = 100;
break;
}
Version ver = new Version(major, minor, revision);
Expand All @@ -738,8 +738,8 @@ public static bool IsPackageUpdatabled(Version pkgVer)
public static Version GetCurrentPackageVersion()
{
int major = 1;
int minor = 27;
int revision = 100;
int minor = 28;
int revision = 000;

Version ver = new Version(major, minor, revision);
return ver;
Expand Down Expand Up @@ -812,7 +812,7 @@ public static Version VersionFromRegistry(string regkey)

public static string GetDisplayVersion()
{
return "1.28 Pre Release";
return "1.28";
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 1.28.Pre.Release.{build}
version: 1.28.Final.{build}
image: Visual Studio 2019
clone_folder: c:\project\mediaportal
environment:
Expand Down
2 changes: 1 addition & 1 deletion mediaportal/Configuration/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<loadFromRemoteSources enabled="true" />
</runtime>
<appSettings>
<add key="version" value="1.28 Pre Release" />
<add key="version" value="1.28" />
</appSettings>
<startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0.30319" />
Expand Down
4 changes: 2 additions & 2 deletions mediaportal/Configuration/Sections/General.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion mediaportal/MediaPortal.Application/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<loadFromRemoteSources enabled="true" />
</runtime>
<appSettings>
<add key="version" value="1.28-Pre Release" />
<add key="version" value="1.28-Summer Breeze" />
<add key="edtftp.log.level" value="ALL" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
Expand Down
2 changes: 1 addition & 1 deletion mediaportal/Utils/ServiceImplementations/LogImpl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit b6ccbe9

Please sign in to comment.