Skip to content

Commit

Permalink
Merge pull request #274 from MediaPortal/MP1.33.Final-Bump_version_nu…
Browse files Browse the repository at this point in the history
…mber_and_set_DEBUG_level_to_INFO

MP1.33.Final: Bump version number and set DEBUG level to INFO
  • Loading branch information
andrewjswan authored Feb 21, 2024
2 parents 633b585 + 1e80332 commit 10658a5
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 27 deletions.
10 changes: 5 additions & 5 deletions Common-MP-TVE3/SolutionInfo.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright (C) 2005-2023 Team MediaPortal
#region Copyright (C) 2005-2024 Team MediaPortal

// Copyright (C) 2005-2023 Team MediaPortal
// Copyright (C) 2005-2024 Team MediaPortal
// http://www.team-mediaportal.com
//
// MediaPortal is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -36,7 +36,7 @@

[assembly: AssemblyCompany("Team MediaPortal")]
[assembly: AssemblyProduct("MediaPortal")]
[assembly: AssemblyCopyright("Copyright © 2005-2023 Team MediaPortal")]
[assembly: AssemblyCopyright("Copyright © 2005-2024 Team MediaPortal")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -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.32.100.0")]
[assembly: AssemblyFileVersion("1.32.100.0")]
[assembly: AssemblyVersion("1.33.000.0")]
[assembly: AssemblyFileVersion("1.33.000.0")]

//[assembly: AssemblyInformationalVersion("")]
//[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")]
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright (C) 2005-2023 Team MediaPortal
#region Copyright (C) 2005-2024 Team MediaPortal
/*
// Copyright (C) 2005-2023 Team MediaPortal
// Copyright (C) 2005-2024 Team MediaPortal
// http://www.team-mediaportal.com
//
// MediaPortal is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -31,8 +31,8 @@


!define VER_MAJOR 1
!define VER_MINOR 32
!define VER_REVISION 100
!define VER_MINOR 33
!define VER_REVISION 000

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

Expand Down
12 changes: 6 additions & 6 deletions Tools/MediaPortal.DeployTool/Utils.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright (C) 2005-2023 Team MediaPortal
#region Copyright (C) 2005-2024 Team MediaPortal

// Copyright (C) 2005-2023 Team MediaPortal
// Copyright (C) 2005-2024 Team MediaPortal
// http://www.team-mediaportal.com
//
// MediaPortal is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -780,7 +780,7 @@ public static Version GetPackageVersion(string type)
case "max":
major = 1;
minor = 32;
revision = 000;
revision = 100;
break;
}
Version ver = new Version(major, minor, revision);
Expand All @@ -800,8 +800,8 @@ public static bool IsPackageUpdatabled(Version pkgVer)
public static Version GetCurrentPackageVersion()
{
int major = 1;
int minor = 32;
int revision = 100;
int minor = 33;
int revision = 000;

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

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

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright (C) 2005-2023 Team MediaPortal
#region Copyright (C) 2005-2024 Team MediaPortal

// Copyright (C) 2005-2023 Team MediaPortal
// Copyright (C) 2005-2024 Team MediaPortal
// http://www.team-mediaportal.com
//
// MediaPortal is free software: you can redistribute it and/or modify
Expand Down 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.33.Pre.Release.{build}
version: 1.33.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.33-Pre Release" />
<add key="version" value="1.33-Springtime" />
</appSettings>
<startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0.30319" />
Expand Down
6 changes: 3 additions & 3 deletions mediaportal/Configuration/Sections/General.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright (C) 2005-2023 Team MediaPortal
#region Copyright (C) 2005-2024 Team MediaPortal

// Copyright (C) 2005-2023 Team MediaPortal
// Copyright (C) 2005-2024 Team MediaPortal
// http://www.team-mediaportal.com
//
// MediaPortal is free software: you can redistribute it and/or modify
Expand Down 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.33-Pre Release" />
<add key="version" value="1.33-Springtime" />
<add key="edtftp.log.level" value="ALL" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
Expand Down
6 changes: 3 additions & 3 deletions mediaportal/Utils/ServiceImplementations/LogImpl.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright (C) 2005-2023 Team MediaPortal
#region Copyright (C) 2005-2024 Team MediaPortal

// Copyright (C) 2005-2023 Team MediaPortal
// Copyright (C) 2005-2024 Team MediaPortal
// http://www.team-mediaportal.com
//
// MediaPortal is free software: you can redistribute it and/or modify
Expand Down 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

0 comments on commit 10658a5

Please sign in to comment.