Netcore fixes

This commit is contained in:
Garry Newman 2017-04-05 16:15:35 +01:00
parent c43b4767dc
commit 1e0f7a835c
4 changed files with 17 additions and 1 deletions

View File

@ -5,6 +5,8 @@ using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using System.IO; using System.IO;
#if !NETCORE
internal class SourceServerQuery :IDisposable internal class SourceServerQuery :IDisposable
{ {
public class PlayersResponse public class PlayersResponse
@ -506,4 +508,6 @@ internal class SourceServerQuery :IDisposable
return output; return output;
} }
} }
#endif

View File

@ -9,6 +9,8 @@
<NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion> <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
<RootNamespace>Facepunch.Steamworks</RootNamespace> <RootNamespace>Facepunch.Steamworks</RootNamespace>
<Description />
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@ -21,4 +23,8 @@
<NoWarn>1701;1702;1705;618;1591</NoWarn> <NoWarn>1701;1702;1705;618;1591</NoWarn>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />
</ItemGroup>
</Project> </Project>

View File

@ -2,6 +2,8 @@
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
#if !NETCORE
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
// associated with an assembly. // associated with an assembly.
@ -34,3 +36,5 @@ using System.Runtime.InteropServices;
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion( "1.2.0.0" )] [assembly: AssemblyVersion( "1.2.0.0" )]
[assembly: AssemblyFileVersion("1.2.0.0")] [assembly: AssemblyFileVersion("1.2.0.0")]
#endif

View File

@ -37,6 +37,7 @@ namespace SteamNative
{ {
_os = Facepunch.Steamworks.OperatingSystem.Windows; _os = Facepunch.Steamworks.OperatingSystem.Windows;
#if !NETCORE
// //
// These checks aren't so accurate on older versions of mono // These checks aren't so accurate on older versions of mono
// //
@ -48,6 +49,7 @@ namespace SteamNative
// //
if ( Environment.OSVersion.VersionString.ToLower().Contains( "unix" ) ) _os = Facepunch.Steamworks.OperatingSystem.Linux; if ( Environment.OSVersion.VersionString.ToLower().Contains( "unix" ) ) _os = Facepunch.Steamworks.OperatingSystem.Linux;
if ( Environment.OSVersion.VersionString.ToLower().Contains( "osx" ) ) _os = Facepunch.Steamworks.OperatingSystem.Osx; if ( Environment.OSVersion.VersionString.ToLower().Contains( "osx" ) ) _os = Facepunch.Steamworks.OperatingSystem.Osx;
#endif
} }
return _os; return _os;