From 8740a29e94897c4a894d340f96af7c52d4f03e07 Mon Sep 17 00:00:00 2001
From: Jason Thompson <crytilis@gmail.com>
Date: Sat, 2 Oct 2021 11:02:19 -0500
Subject: [PATCH] Updated packages, updated folder path, and corrected enum
 compilation to public for PersonaChange

---
 .../Facepunch.Steamworks.TestWin32.csproj                  | 6 +++---
 .../Facepunch.Steamworks.TestWin64.csproj                  | 6 +++---
 Generator/Cleanup.cs                                       | 1 +
 Generator/CodeWriter/CodeWriter.cs                         | 6 +++---
 Generator/Generator.csproj                                 | 7 ++++++-
 Generator/Program.cs                                       | 4 ++--
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj b/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj
index b5d97a7..2b311ca 100644
--- a/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj
+++ b/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj
@@ -45,9 +45,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.*" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.0.0-beta4" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.0.0-beta4" />
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.2-beta1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
   <ItemGroup>
     <Compile Remove="ClanTest.cs" />
diff --git a/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj b/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj
index 2a18571..f8eecaf 100644
--- a/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj
+++ b/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj
@@ -44,9 +44,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.*" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.0.0-beta4" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.0.0-beta4" />
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.2-beta1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
   <ItemGroup>
     <Compile Remove="ClanTest.cs" />
diff --git a/Generator/Cleanup.cs b/Generator/Cleanup.cs
index d4e5975..89b9779 100644
--- a/Generator/Cleanup.cs
+++ b/Generator/Cleanup.cs
@@ -113,6 +113,7 @@ public static class Cleanup
 
 	internal static string Expose( string name )
 	{
+		if ( name == "PersonaChange" ) return "public";
 		if ( name == "FriendState" ) return "public";
 		if ( name == "MusicStatus" ) return "public";
 		if ( name == "ParentalFeature" ) return "public";
diff --git a/Generator/CodeWriter/CodeWriter.cs b/Generator/CodeWriter/CodeWriter.cs
index 5f4aa2f..4ae771e 100644
--- a/Generator/CodeWriter/CodeWriter.cs
+++ b/Generator/CodeWriter/CodeWriter.cs
@@ -80,9 +80,9 @@ namespace Generator
             }
 
 			{
-			//	GenerateGlobalFunctions( "SteamAPI", $"{folder}../Generated/SteamAPI.cs" );
-			//	GenerateGlobalFunctions( "SteamGameServer", $"{folder}../Generated/SteamGameServer.cs" );
-			//	GenerateGlobalFunctions( "SteamInternal", $"{folder}../Generated/SteamInternal.cs" );
+				//	GenerateGlobalFunctions( "SteamAPI", $"{folder}../Generated/SteamAPI.cs" );
+				//	GenerateGlobalFunctions( "SteamGameServer", $"{folder}../Generated/SteamGameServer.cs" );
+				//	GenerateGlobalFunctions( "SteamInternal", $"{folder}../Generated/SteamInternal.cs" );
 			}
 
             foreach ( var iface in def.Interfaces )
diff --git a/Generator/Generator.csproj b/Generator/Generator.csproj
index e1199b0..d6226a4 100644
--- a/Generator/Generator.csproj
+++ b/Generator/Generator.csproj
@@ -7,7 +7,12 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
+  <ItemGroup>
+    <None Update="steam_sdk\steam_api.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Generator/Program.cs b/Generator/Program.cs
index 1a23c56..4556f60 100644
--- a/Generator/Program.cs
+++ b/Generator/Program.cs
@@ -20,9 +20,9 @@ namespace Generator
 
 			var generator = new CodeWriter( def );
 
-            generator.ToFolder( "../Facepunch.Steamworks/Generated/" );
+            generator.ToFolder( "../../../../Facepunch.Steamworks/Generated/" );
         }
-    }
+	}
 }