From 0f7a26ecc176ce97de631247a955a1b5df86d2d7 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 30 Jun 2016 15:32:29 -0400 Subject: [PATCH 1/8] 3.0.5980 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index b2cbfdebdb..31dd78395a 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.48")] +[assembly: AssemblyVersion("3.0.5980")] From 05b052789493a3da747443f11cd40db9867cfd0e Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 1 Jul 2016 02:10:25 -0400 Subject: [PATCH 2/8] fix merge conflict --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 31dd78395a..c4dd383324 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.5980")] +[assembly: AssemblyVersion("3.1.50")] From 7a39ce558a5db3c140fe44b235a8fb682b3a72d3 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 1 Jul 2016 02:11:16 -0400 Subject: [PATCH 3/8] 3.0.5981 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index c4dd383324..61ddc94df1 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.50")] +[assembly: AssemblyVersion("3.0.5981")] From db99a9840b63b645da01df5f173720ad071b2ce2 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 2 Jul 2016 17:50:58 -0400 Subject: [PATCH 4/8] fix merge conflict --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 61ddc94df1..73dead8473 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.5981")] +[assembly: AssemblyVersion("3.1.54")] From c0f43d9abc199c7a9290a1f762801976c9efa71e Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 2 Jul 2016 17:51:24 -0400 Subject: [PATCH 5/8] 3.0.5983 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 73dead8473..42bbcbd8c5 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.54")] +[assembly: AssemblyVersion("3.0.5983")] From ac62ba9e19c3620873b1c04a26c183a891f26e59 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 3 Jul 2016 20:24:41 -0400 Subject: [PATCH 6/8] fix merge conflict --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 42bbcbd8c5..bd39b81319 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.5983")] +[assembly: AssemblyVersion("3.1.56")] From 598aeb198882b5d6f5c533664536028465b31619 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 3 Jul 2016 20:25:47 -0400 Subject: [PATCH 7/8] 3.0.5984 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index bd39b81319..9b08f21287 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.56")] +[assembly: AssemblyVersion("3.0.5984")] From 97d21723f32e50fe3137f6899f7ed62b3fb68e47 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 5 Jul 2016 00:16:03 -0400 Subject: [PATCH 8/8] add syscall error handling --- .../Native/BaseMonoApp.cs | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs index 19ae7b4d21..4011fa3de3 100644 --- a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs +++ b/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs @@ -183,6 +183,14 @@ namespace MediaBrowser.Server.Mono.Native { info.SystemArchitecture = Architecture.Arm; } + else if (System.Environment.Is64BitOperatingSystem) + { + info.SystemArchitecture = Architecture.X64; + } + else + { + info.SystemArchitecture = Architecture.X86; + } info.OperatingSystemVersionString = string.IsNullOrWhiteSpace(sysName) ? System.Environment.OSVersion.VersionString : @@ -198,14 +206,21 @@ namespace MediaBrowser.Server.Mono.Native if (_unixName == null) { var uname = new Uname(); - Utsname utsname; - var callResult = Syscall.uname(out utsname); - if (callResult == 0) + try { - uname.sysname = utsname.sysname; - uname.machine = utsname.machine; - } + Utsname utsname; + var callResult = Syscall.uname(out utsname); + if (callResult == 0) + { + uname.sysname = utsname.sysname ?? string.Empty; + uname.machine = utsname.machine ?? string.Empty; + } + } + catch (Exception ex) + { + Logger.ErrorException("Error getting unix name", ex); + } _unixName = uname; } return _unixName;