Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MP1.35.Final: Bump version number and set DEBUG level to INFO #332

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Common-MP-TVE3/SolutionInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.*")]
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@


!define VER_MAJOR 1
!define VER_MINOR 34
!define VER_REVISION 100
!define VER_MINOR 35
!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 @@ -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);
Expand All @@ -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;
Expand Down Expand Up @@ -853,7 +853,7 @@ public static Version VersionFromRegistry(string regkey)

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

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
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.35.Pre.Release.{build}
version: 1.35.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.35-Pre Release" />
<add key="version" value="1.35-Horizon" />
</appSettings>
<startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0.30319" />
Expand Down
2 changes: 1 addition & 1 deletion 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 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.35-Pre Release" />
<add key="version" value="1.35-Horizon" />
<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 @@ -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;
}
Expand Down
Loading