lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2602 from MediaBrowser/dev

Browse Source 
3.2.13.7
This commit is contained in:
Luke 2017-04-29 13:31:00 -04:00 committed by GitHub
commit b7226b8667
7 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs
View File

@ -22,19 +22,30 @@ namespace Emby.Common.Implementations.EnvironmentInfo
return CustomOperatingSystem.Value; return CustomOperatingSystem.Value;
} }
#if NET46
switch (Environment.OSVersion.Platform)
{
case PlatformID.MacOSX:
return MediaBrowser.Model.System.OperatingSystem.OSX;
case PlatformID.Win32NT:
return MediaBrowser.Model.System.OperatingSystem.Windows;
case PlatformID.Unix:
return MediaBrowser.Model.System.OperatingSystem.Linux;
}
#elif NETSTANDARD1_6
if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{ {
return MediaBrowser.Model.System.OperatingSystem.OSX; return OperatingSystem.OSX;
} }
if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{ {
return MediaBrowser.Model.System.OperatingSystem.Windows; return OperatingSystem.Windows;
} }
if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{ {
return MediaBrowser.Model.System.OperatingSystem.Linux; return OperatingSystem.Linux;
} }
#endif
return MediaBrowser.Model.System.OperatingSystem.Windows; return MediaBrowser.Model.System.OperatingSystem.Windows;
} }
} }
@ -43,7 +54,12 @@ namespace Emby.Common.Implementations.EnvironmentInfo
{ {
get get
{ {
return System.Runtime.InteropServices.RuntimeInformation.OSDescription; #if NET46
return Environment.OSVersion.Platform.ToString();
#elif NETSTANDARD1_6
return System.Runtime.InteropServices.RuntimeInformation.OSDescription;
#endif
return "Operating System";
} }
} }
@ -51,7 +67,12 @@ namespace Emby.Common.Implementations.EnvironmentInfo
{ {
get get
{ {
return System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription; #if NET46
return Environment.OSVersion.Version.ToString() + " " + Environment.OSVersion.ServicePack.ToString();
#elif NETSTANDARD1_6
return System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription;
#endif
return "1.0";
} }
} }
@ -71,8 +92,10 @@ namespace Emby.Common.Implementations.EnvironmentInfo
{ {
return CustomArchitecture.Value; return CustomArchitecture.Value;
} }
#if NET46
switch (System.Runtime.InteropServices.RuntimeInformation.OSArchitecture) return Environment.Is64BitOperatingSystem ? MediaBrowser.Model.System.Architecture.X64 : MediaBrowser.Model.System.Architecture.X86;
#elif NETSTANDARD1_6
switch(System.Runtime.InteropServices.RuntimeInformation.OSArchitecture)
{ {
case System.Runtime.InteropServices.Architecture.Arm: case System.Runtime.InteropServices.Architecture.Arm:
return MediaBrowser.Model.System.Architecture.Arm; return MediaBrowser.Model.System.Architecture.Arm;
@ -83,6 +106,7 @@ namespace Emby.Common.Implementations.EnvironmentInfo
case System.Runtime.InteropServices.Architecture.X86: case System.Runtime.InteropServices.Architecture.X86:
return MediaBrowser.Model.System.Architecture.X86; return MediaBrowser.Model.System.Architecture.X86;
} }
#endif
return MediaBrowser.Model.System.Architecture.X64; return MediaBrowser.Model.System.Architecture.X64;
} }
} }

1
Emby.Common.Implementations/project.json
View File

@ -23,7 +23,6 @@
"System.Xml.ReaderWriter": "4.0.0" "System.Xml.ReaderWriter": "4.0.0"
}, },
"dependencies": { "dependencies": {
"System.Runtime.InteropServices.RuntimeInformation": "4.3.0",
"SimpleInjector": "3.2.4", "SimpleInjector": "3.2.4",
"ServiceStack.Text": "4.5.4", "ServiceStack.Text": "4.5.4",
"NLog": "4.4.0-betaV15", "NLog": "4.4.0-betaV15",

4
MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
View File

@ -108,10 +108,6 @@
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.IO.Compression" /> <Reference Include="System.IO.Compression" />
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Transactions" /> <Reference Include="System.Transactions" />

1
MediaBrowser.Server.Mono/packages.config
View File

@ -7,5 +7,4 @@
<package id="SimpleInjector" version="3.3.2" targetFramework="net46" /> <package id="SimpleInjector" version="3.3.2" targetFramework="net46" />
<package id="SQLitePCLRaw.core" version="1.1.2" targetFramework="net46" /> <package id="SQLitePCLRaw.core" version="1.1.2" targetFramework="net46" />
<package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.2" targetFramework="net46" /> <package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.2" targetFramework="net46" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net46" />
</packages> </packages>

4
MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
View File

@ -114,10 +114,6 @@
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression" /> <Reference Include="System.IO.Compression" />
<Reference Include="System.Management" /> <Reference Include="System.Management" />
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.ServiceProcess" /> <Reference Include="System.ServiceProcess" />

1
MediaBrowser.ServerApplication/packages.config
View File

@ -7,5 +7,4 @@
<package id="SimpleInjector" version="3.3.2" targetFramework="net462" /> <package id="SimpleInjector" version="3.3.2" targetFramework="net462" />
<package id="SQLitePCLRaw.core" version="1.1.2" targetFramework="net462" /> <package id="SQLitePCLRaw.core" version="1.1.2" targetFramework="net462" />
<package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.2" targetFramework="net462" /> <package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.2" targetFramework="net462" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net462" />
</packages> </packages>

2
SharedVersion.cs
View File

@ -1,3 +1,3 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.2.13.6")] [assembly: AssemblyVersion("3.2.13.7")]