From 1e0f7a835cc1c92736625427b8f71e25e36670ee Mon Sep 17 00:00:00 2001 From: Garry Newman Date: Wed, 5 Apr 2017 16:15:35 +0100 Subject: [PATCH] Netcore fixes --- Facepunch.Steamworks/Client/ServerQuery.cs | 6 +++++- Facepunch.Steamworks/Facepunch.Steamworks.NetCore.csproj | 6 ++++++ Facepunch.Steamworks/Properties/AssemblyInfo.cs | 4 ++++ Facepunch.Steamworks/SteamNative/SteamNative.Platform.cs | 2 ++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Facepunch.Steamworks/Client/ServerQuery.cs b/Facepunch.Steamworks/Client/ServerQuery.cs index ba4ac12..159d757 100644 --- a/Facepunch.Steamworks/Client/ServerQuery.cs +++ b/Facepunch.Steamworks/Client/ServerQuery.cs @@ -5,6 +5,8 @@ using System.Net; using System.Net.Sockets; using System.IO; +#if !NETCORE + internal class SourceServerQuery :IDisposable { public class PlayersResponse @@ -506,4 +508,6 @@ internal class SourceServerQuery :IDisposable return output; } -} \ No newline at end of file +} + +#endif \ No newline at end of file diff --git a/Facepunch.Steamworks/Facepunch.Steamworks.NetCore.csproj b/Facepunch.Steamworks/Facepunch.Steamworks.NetCore.csproj index 32cd464..998525d 100644 --- a/Facepunch.Steamworks/Facepunch.Steamworks.NetCore.csproj +++ b/Facepunch.Steamworks/Facepunch.Steamworks.NetCore.csproj @@ -9,6 +9,8 @@ 1.6.0 $(PackageTargetFallback);dnxcore50 Facepunch.Steamworks + + False @@ -21,4 +23,8 @@ 1701;1702;1705;618;1591 + + + + diff --git a/Facepunch.Steamworks/Properties/AssemblyInfo.cs b/Facepunch.Steamworks/Properties/AssemblyInfo.cs index dda37e5..eba09bd 100644 --- a/Facepunch.Steamworks/Properties/AssemblyInfo.cs +++ b/Facepunch.Steamworks/Properties/AssemblyInfo.cs @@ -2,6 +2,8 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +#if !NETCORE + // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. @@ -34,3 +36,5 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion( "1.2.0.0" )] [assembly: AssemblyFileVersion("1.2.0.0")] + +#endif \ No newline at end of file diff --git a/Facepunch.Steamworks/SteamNative/SteamNative.Platform.cs b/Facepunch.Steamworks/SteamNative/SteamNative.Platform.cs index f57b275..81465af 100644 --- a/Facepunch.Steamworks/SteamNative/SteamNative.Platform.cs +++ b/Facepunch.Steamworks/SteamNative/SteamNative.Platform.cs @@ -37,6 +37,7 @@ namespace SteamNative { _os = Facepunch.Steamworks.OperatingSystem.Windows; +#if !NETCORE // // 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( "osx" ) ) _os = Facepunch.Steamworks.OperatingSystem.Osx; +#endif } return _os;