diff --git a/.gitignore b/.gitignore
index 5bafc8c..7c12d51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,4 +73,5 @@ mscorlib.dll
packages
Generator/bin
*.XML
-.vs
\ No newline at end of file
+.vs
+Facepunch.Steamworks.Test/bin/**
diff --git a/Facepunch.Steamworks.Test/Facepunch.Steamworks.Test.csproj b/Facepunch.Steamworks.Test/Facepunch.Steamworks.Test.csproj
index 9ce7c85..0bafb9f 100644
--- a/Facepunch.Steamworks.Test/Facepunch.Steamworks.Test.csproj
+++ b/Facepunch.Steamworks.Test/Facepunch.Steamworks.Test.csproj
@@ -122,9 +122,9 @@
-
- {91962664-eb42-472a-94c8-c4ffeb44cc4b}
- Facepunch.Steamworks
+
+ {8c73da93-73ad-4445-9a2c-15d4a44337d3}
+ Facepunch.Steamworks.Win64
diff --git a/Facepunch.Steamworks.sln b/Facepunch.Steamworks.sln
index 7974e3c..442c0a6 100644
--- a/Facepunch.Steamworks.sln
+++ b/Facepunch.Steamworks.sln
@@ -1,24 +1,24 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.12
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29009.5
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Facepunch.Steamworks", "Facepunch.Steamworks\Facepunch.Steamworks.csproj", "{91962664-EB42-472A-94C8-C4FFEB44CC4B}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facepunch.Steamworks.Test", "Facepunch.Steamworks.Test\Facepunch.Steamworks.Test.csproj", "{3F6183AD-D966-44F2-A6EB-42E61E591B49}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator", "Generator\Generator.csproj", "{B7225D11-2AAA-49D6-AE93-A73696EA35FE}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facepunch.Steamworks.Win64", "Facepunch.Steamworks\Facepunch.Steamworks.Win64.csproj", "{8C73DA93-73AD-4445-9A2C-15D4A44337D3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facepunch.Steamworks.Posix64", "Facepunch.Steamworks\Facepunch.Steamworks.Posix64.csproj", "{12478BAE-7C1F-4FFD-B903-E1DDA6426DDF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facepunch.Steamworks.Win32", "Facepunch.Steamworks\Facepunch.Steamworks.Win32.csproj", "{2D6247F6-8AB2-405F-A00E-3A364B808A55}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {91962664-EB42-472A-94C8-C4FFEB44CC4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {91962664-EB42-472A-94C8-C4FFEB44CC4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {91962664-EB42-472A-94C8-C4FFEB44CC4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {91962664-EB42-472A-94C8-C4FFEB44CC4B}.Release|Any CPU.Build.0 = Release|Any CPU
{3F6183AD-D966-44F2-A6EB-42E61E591B49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3F6183AD-D966-44F2-A6EB-42E61E591B49}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3F6183AD-D966-44F2-A6EB-42E61E591B49}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -27,6 +27,18 @@ Global
{B7225D11-2AAA-49D6-AE93-A73696EA35FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B7225D11-2AAA-49D6-AE93-A73696EA35FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B7225D11-2AAA-49D6-AE93-A73696EA35FE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8C73DA93-73AD-4445-9A2C-15D4A44337D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8C73DA93-73AD-4445-9A2C-15D4A44337D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8C73DA93-73AD-4445-9A2C-15D4A44337D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8C73DA93-73AD-4445-9A2C-15D4A44337D3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {12478BAE-7C1F-4FFD-B903-E1DDA6426DDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {12478BAE-7C1F-4FFD-B903-E1DDA6426DDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {12478BAE-7C1F-4FFD-B903-E1DDA6426DDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {12478BAE-7C1F-4FFD-B903-E1DDA6426DDF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2D6247F6-8AB2-405F-A00E-3A364B808A55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2D6247F6-8AB2-405F-A00E-3A364B808A55}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2D6247F6-8AB2-405F-A00E-3A364B808A55}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2D6247F6-8AB2-405F-A00E-3A364B808A55}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Facepunch.Steamworks/Facepunch.Steamworks .Posix64.csproj b/Facepunch.Steamworks/Facepunch.Steamworks .Posix64.csproj
deleted file mode 100644
index 3eeadaf..0000000
--- a/Facepunch.Steamworks/Facepunch.Steamworks .Posix64.csproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
- Facepunch.Steamworks.Posix64
- PLATFORM_POSIX64;PLATFORM_POSIX
-
-
-
diff --git a/Facepunch.Steamworks/Facepunch.Steamworks .Win32.csproj b/Facepunch.Steamworks/Facepunch.Steamworks .Win32.csproj
deleted file mode 100644
index 0500427..0000000
--- a/Facepunch.Steamworks/Facepunch.Steamworks .Win32.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
- Facepunch.Steamworks.Win32
- PLATFORM_WIN32;PLATFORM_WIN
-
-
-
-
- Always
-
-
-
-
\ No newline at end of file
diff --git a/Facepunch.Steamworks/Facepunch.Steamworks.Posix64.csproj b/Facepunch.Steamworks/Facepunch.Steamworks.Posix64.csproj
new file mode 100644
index 0000000..5af2a5c
--- /dev/null
+++ b/Facepunch.Steamworks/Facepunch.Steamworks.Posix64.csproj
@@ -0,0 +1,16 @@
+
+
+
+ Facepunch.Steamworks.Posix64
+ PLATFORM_POSIX64;PLATFORM_POSIX
+ netstandard2.0;net46
+ true
+ 7.1
+ true
+ false
+ Steamworks
+
+
+
+
+
diff --git a/Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj b/Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj
new file mode 100644
index 0000000..810d6b8
--- /dev/null
+++ b/Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj
@@ -0,0 +1,22 @@
+
+
+
+ Facepunch.Steamworks.Win32
+ PLATFORM_WIN32;PLATFORM_WIN
+ netstandard2.0;net46
+ true
+ 7.1
+ true
+ true
+ Steamworks
+
+
+
+
+ Always
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Facepunch.Steamworks/Facepunch.Steamworks .Win64.csproj b/Facepunch.Steamworks/Facepunch.Steamworks.Win64.csproj
similarity index 87%
rename from Facepunch.Steamworks/Facepunch.Steamworks .Win64.csproj
rename to Facepunch.Steamworks/Facepunch.Steamworks.Win64.csproj
index 292105e..9f456c2 100644
--- a/Facepunch.Steamworks/Facepunch.Steamworks .Win64.csproj
+++ b/Facepunch.Steamworks/Facepunch.Steamworks.Win64.csproj
@@ -1,10 +1,13 @@
-
-
Facepunch.Steamworks.Win64
PLATFORM_WIN64;PLATFORM_WIN
+ netstandard2.0;net46
+ true
+ 7.1
+ true
+ false
@@ -32,4 +35,6 @@
+
+
diff --git a/Facepunch.Steamworks/Facepunch.Steamworks.csproj b/Facepunch.Steamworks/Facepunch.Steamworks.csproj
deleted file mode 100644
index 78243e8..0000000
--- a/Facepunch.Steamworks/Facepunch.Steamworks.csproj
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
- netstandard2.0;net46
- true
- Facepunch.Steamworks
-
- true
- false
- true
-
-
-
-
- TRACE;DEBUG
- 1701;1702;1705;618;1591
-
-
-
- TRACE;RELEASE
- 1701;1702;1705;618;1591
-
-
-
- $(DefineConstants);NET_CORE
-
-
-
-
-
-
-
-
- Always
-
-
-
-
-
-
-
-
- C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\Profile\Client
- Garry Newman
- Facepunch.Steamworks
- Another fucking c# Steamworks implementation
- https://github.com/Facepunch/Facepunch.Steamworks
- https://files.facepunch.com/garry/c5edce1c-0c21-4c5d-95b6-37743be7455d.jpg
- facepunch;steam;unity;steamworks;valve
- 2.0.0
- latest
- MIT
- https://github.com/Facepunch/Facepunch.Steamworks.git
- git
-
-
-
- full
- true
-
-
-
diff --git a/Facepunch.Steamworks/Facepunch.Steamworks.props b/Facepunch.Steamworks/Facepunch.Steamworks.targets
similarity index 72%
rename from Facepunch.Steamworks/Facepunch.Steamworks.props
rename to Facepunch.Steamworks/Facepunch.Steamworks.targets
index c06a43f..8718267 100644
--- a/Facepunch.Steamworks/Facepunch.Steamworks.props
+++ b/Facepunch.Steamworks/Facepunch.Steamworks.targets
@@ -1,12 +1,8 @@
- netstandard2.0;net46
- true
- 7.1
- true
- false
- true
+ PackageReference
+ true
@@ -30,9 +26,6 @@
-
-
-
diff --git a/Facepunch.Steamworks/Properties/AssemblyInfo.cs b/Facepunch.Steamworks/Properties/AssemblyInfo.cs
deleted file mode 100644
index 83de1b3..0000000
--- a/Facepunch.Steamworks/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-#if !NET_CORE
-
-// 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.
-[assembly: AssemblyTitle("Facepunch.Steamworks")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Facepunch Studios Ltd")]
-[assembly: AssemblyProduct("Facepunch.Steamworks")]
-[assembly: AssemblyCopyright("Copyright © 2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("dc2d9fa9-f005-468f-8581-85c79f4e0034")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.2.0.0" )]
-[assembly: AssemblyFileVersion("1.2.0.0")]
-
-#endif
\ No newline at end of file