Skip to content

Commit f67cb3c

Browse files
andrewjswanandrewjswan
committed
MP1-1.26Final: Bump version number and set DEBUG level to INFO for MP 1.26 Full Release
1 parent 7496097 commit f67cb3c

File tree

9 files changed

+25
-25
lines changed

9 files changed

+25
-25
lines changed

‎Common-MP-TVE3/SolutionInfo.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#region Copyright (C) 2005-2019 Team MediaPortal
1+
#region Copyright (C) 2005-2020 Team MediaPortal
22

3-
// Copyright (C) 2005-2019 Team MediaPortal
3+
// Copyright (C) 2005-2020 Team MediaPortal
44
// http://www.team-mediaportal.com
55
//
66
// MediaPortal is free software: you can redistribute it and/or modify
@@ -51,8 +51,8 @@
5151
// You can specify all the values or you can default the Revision and Build Numbers
5252
// by using the '*' as shown below:
5353

54-
[assembly: AssemblyVersion("1.25.100.0")]
55-
[assembly: AssemblyFileVersion("1.25.100.0")]
54+
[assembly: AssemblyVersion("1.26.000.0")]
55+
[assembly: AssemblyFileVersion("1.26.000.0")]
5656

5757
//[assembly: AssemblyInformationalVersion("")]
5858
//[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")]

‎Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#region Copyright (C) 2005-2019 Team MediaPortal
1+
#region Copyright (C) 2005-2020 Team MediaPortal
22
/*
3-
// Copyright (C) 2005-2019 Team MediaPortal
3+
// Copyright (C) 2005-2020 Team MediaPortal
44
// http://www.team-mediaportal.com
55
//
66
// MediaPortal is free software: you can redistribute it and/or modify
@@ -31,8 +31,8 @@
3131

3232

3333
!define VER_MAJOR 1
34-
!define VER_MINOR 25
35-
!define VER_REVISION 100
34+
!define VER_MINOR 26
35+
!define VER_REVISION 000
3636

3737
#**********************************************************************************************************#
3838

‎Tools/MediaPortal.DeployTool/Utils.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ public static Version GetPackageVersion(string type)
706706
{
707707
int major = 0;
708708
int minor = 0;
709-
int revision = 0;
709+
int revision = 100;
710710

711711
switch (type)
712712
{
@@ -718,7 +718,7 @@ public static Version GetPackageVersion(string type)
718718
case "max":
719719
major = 1;
720720
minor = 25;
721-
revision = 0;
721+
revision = 100;
722722
break;
723723
}
724724
Version ver = new Version(major, minor, revision);
@@ -738,8 +738,8 @@ public static bool IsPackageUpdatabled(Version pkgVer)
738738
public static Version GetCurrentPackageVersion()
739739
{
740740
int major = 1;
741-
int minor = 25;
742-
int revision = 100;
741+
int minor = 26;
742+
int revision = 000;
743743

744744
Version ver = new Version(major, minor, revision);
745745
return ver;
@@ -812,7 +812,7 @@ public static Version VersionFromRegistry(string regkey)
812812

813813
public static string GetDisplayVersion()
814814
{
815-
return "1.26 Pre Release";
815+
return "1.26";
816816
}
817817

818818
/// <summary>

‎TvEngine3/TVLibrary/TVDatabase/TvBusinessLayer/BusinessLayer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3393,7 +3393,7 @@ public bool IsChannelMappedToCard(Channel dbChannel, Card card, bool forEpg)
33933393
/// </summary>
33943394
public void SetLogLevel()
33953395
{
3396-
var logLevel = (LogLevel)int.Parse(GetSetting("loglevel", "5").Value); // debug is "5", info is "4"
3396+
var logLevel = (LogLevel)int.Parse(GetSetting("loglevel", "4").Value); // debug is "5", info is "4"
33973397
Log.SetLogLevel(logLevel);
33983398
}
33993399
}

‎mediaportal/Configuration/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<loadFromRemoteSources enabled="true" />
2424
</runtime>
2525
<appSettings>
26-
<add key="version" value="1.26 Pre Release" />
26+
<add key="version" value="1.26" />
2727
</appSettings>
2828
<startup useLegacyV2RuntimeActivationPolicy="true">
2929
<supportedRuntime version="v4.0.30319" />

‎mediaportal/Configuration/Sections/General.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public General(string name)
4242
InitializeComponent();
4343
}
4444

45-
private string loglevel = "3"; // 1= error, 2 = info, 3 = debug
45+
private string loglevel = "2"; // 1= error, 2 = info, 3 = debug
4646

4747
/// <summary>
4848
/// Erforderliche Designervariable.
@@ -53,7 +53,7 @@ public override void LoadSettings()
5353
{
5454
using (Settings xmlreader = new MPSettings())
5555
{
56-
loglevel = xmlreader.GetValueAsString("general", "loglevel", "3"); // set loglevel to 2:info 3:debug
56+
loglevel = xmlreader.GetValueAsString("general", "loglevel", "2"); // set loglevel to 2:info 3:debug
5757
cbDebug.SelectedIndex = Convert.ToInt16(loglevel);
5858

5959
string prio = xmlreader.GetValueAsString("general", "ThreadPriority", "Normal");

‎mediaportal/Databases/Pictures/ADO/PictureDatabaseADO.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public int AddPicture(string strPicture, int iRotation)
123123
}
124124
catch (Exception ex)
125125
{
126-
Log.Error("MediaPortal.Picture.Database: {0}", ex.Message);
126+
Log.Error("MediaPortal.Picture.ADO: {0}", ex.Message);
127127
}
128128
// Smirnoff: Query the orientation information
129129
// if(iRotation == -1)
@@ -135,7 +135,7 @@ public int AddPicture(string strPicture, int iRotation)
135135
}
136136
catch (Exception ex)
137137
{
138-
Log.Error("MediaPortal.Picture.Database exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
138+
Log.Error("MediaPortal.Picture.ADO exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
139139
}
140140
return -1;
141141
}
@@ -163,7 +163,7 @@ public void DeletePicture(string strPicture)
163163
}
164164
catch (Exception ex)
165165
{
166-
Log.Error("MediaPortal.Picture.Database exception deleting picture err:{0} stack:{1}", ex.Message, ex.StackTrace);
166+
Log.Error("MediaPortal.Picture.ADO exception deleting picture err:{0} stack:{1}", ex.Message, ex.StackTrace);
167167
}
168168
}
169169

@@ -216,7 +216,7 @@ public int GetRotation(string strPicture)
216216
}
217217
catch (Exception ex)
218218
{
219-
Log.Error("MediaPortal.Picture.Database exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
219+
Log.Error("MediaPortal.Picture.ADO exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
220220
}
221221
return 0;
222222
}
@@ -242,7 +242,7 @@ public void SetRotation(string strPicture, int iRotation)
242242
}
243243
catch (Exception ex)
244244
{
245-
Log.Error("MediaPortal.Picture.Database exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
245+
Log.Error("MediaPortal.Picture.ADO exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
246246
}
247247
}
248248

@@ -294,7 +294,7 @@ public DateTime GetDateTimeTaken(string strPicture)
294294
}
295295
catch (Exception ex)
296296
{
297-
Log.Error("MediaPortal.Picture.Database exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
297+
Log.Error("MediaPortal.Picture.ADO exception err:{0} stack:{1}", ex.Message, ex.StackTrace);
298298
}
299299
return DateTime.MinValue;
300300
}

‎mediaportal/MediaPortal.Application/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<loadFromRemoteSources enabled="true" />
3636
</runtime>
3737
<appSettings>
38-
<add key="version" value="1.26-Pre Release" />
38+
<add key="version" value="1.26-Winter is coming" />
3939
<add key="edtftp.log.level" value="ALL" />
4040
<add key="ClientSettingsProvider.ServiceUri" value="" />
4141
</appSettings>

‎mediaportal/Utils/ServiceImplementations/LogImpl.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public LogImpl()
6464
using (Settings xmlreader = new MPSettings())
6565
{
6666
_minLevel =
67-
(Level)Enum.Parse(typeof (Level), xmlreader.GetValueAsString("general", "loglevel", "3")); // set loglevel to 2:info 3:debug
67+
(Level)Enum.Parse(typeof (Level), xmlreader.GetValueAsString("general", "loglevel", "2")); // set loglevel to 2:info 3:debug
6868
}
6969
bConfiguration = false;
7070
}

0 commit comments

Comments
 (0)