From 7f8d664a96774306427c7df2d8565023c7ab6132 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Bure=C5=A1?= <jan.bures@live.com>
Date: Mon, 29 Apr 2024 14:07:59 +0200
Subject: [PATCH] Fix SpaceWarp.Preload.dll being copied into modules

---
 plugin_template/BepInEx/plugins/SpaceWarp/swinfo.json  |  2 +-
 src/SpaceWarp.Core/SpaceWarp.Core.csproj               |  7 ++-----
 src/SpaceWarp.Game/SpaceWarp.Game.csproj               |  6 +++---
 src/SpaceWarp.Messaging/SpaceWarp.Messaging.csproj     |  2 +-
 src/SpaceWarp.Patches/SpaceWarp.Patches.csproj         |  2 +-
 src/SpaceWarp.Sound/SpaceWarp.Sound.csproj             |  4 ++--
 src/SpaceWarp.UI/SpaceWarp.UI.csproj                   | 10 ++++------
 .../SpaceWarp.VersionChecking.csproj                   |  4 ++--
 8 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/plugin_template/BepInEx/plugins/SpaceWarp/swinfo.json b/plugin_template/BepInEx/plugins/SpaceWarp/swinfo.json
index cd947ed..05b119e 100644
--- a/plugin_template/BepInEx/plugins/SpaceWarp/swinfo.json
+++ b/plugin_template/BepInEx/plugins/SpaceWarp/swinfo.json
@@ -5,7 +5,7 @@
   "name": "Space Warp",
   "description": "Space Warp is an API for KSP 2 mod developers.",
   "source": "https://github.com/SpaceWarpDev/SpaceWarp",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "version_check": "https://raw.githubusercontent.com/SpaceWarpDev/SpaceWarp/main/plugin_template/BepInEx/plugins/SpaceWarp/swinfo.json",
   "ksp2_version": {
     "min": "0.2.1",
diff --git a/src/SpaceWarp.Core/SpaceWarp.Core.csproj b/src/SpaceWarp.Core/SpaceWarp.Core.csproj
index 9819d2a..2e6542c 100644
--- a/src/SpaceWarp.Core/SpaceWarp.Core.csproj
+++ b/src/SpaceWarp.Core/SpaceWarp.Core.csproj
@@ -13,7 +13,7 @@
         <PackageReference Include="BepInEx.BaseLib" Version="5.4.21" Publicize="true"/>
         <PackageReference Include="BepInEx.Core" Version="5.4.21"/>
         <PackageReference Include="HarmonyX" Version="2.10.1"/>
-        <PackageReference Include="KerbalSpaceProgram2.GameLibs" Version="0.1.5" Publicize="true" PrivateAssets="all"/>
+        <PackageReference Include="KerbalSpaceProgram2.GameLibs" Version="0.2.1" Publicize="true" PrivateAssets="all"/>
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0"/>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
         <PackageReference Include="SpaceWarp.PluginInfoProps" Version="1.*" PrivateAssets="all"/>
@@ -21,9 +21,6 @@
         <PackageReference Include="UnityEngine.Modules" Version="2022.3.5" Publicize="true"/>
     </ItemGroup>
     <ItemGroup Label="Project references">
-        <ProjectReference Include="..\SpaceWarp.Preload\SpaceWarp.Preload.csproj">
-          <Private>false</Private>
-          <PrivateAssets>all</PrivateAssets>
-        </ProjectReference>
+        <ProjectReference Include="$(SolutionDir)/src/SpaceWarp.Preload/SpaceWarp.Preload.csproj" Private="false" PrivateAssets="all"/>
     </ItemGroup>
 </Project>
diff --git a/src/SpaceWarp.Game/SpaceWarp.Game.csproj b/src/SpaceWarp.Game/SpaceWarp.Game.csproj
index 0959ba0..e6d25ba 100644
--- a/src/SpaceWarp.Game/SpaceWarp.Game.csproj
+++ b/src/SpaceWarp.Game/SpaceWarp.Game.csproj
@@ -9,10 +9,10 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="KerbalSpaceProgram2.GameLibs" Version="0.2.0" Publicize="true"/>
+        <PackageReference Include="KerbalSpaceProgram2.GameLibs" Version="0.2.1" Publicize="true"/>
     </ItemGroup>
     <ItemGroup Label="Project references">
-        <ProjectReference Include="$(SolutionDir)/src/SpaceWarp.Core/SpaceWarp.Core.csproj" Private="false"/>
-        <ProjectReference Include="..\SpaceWarp.UI\SpaceWarp.UI.csproj" />
+        <ProjectReference Include="$(SolutionDir)/src/SpaceWarp.Core/SpaceWarp.Core.csproj" Private="false" PrivateAssets="all"/>
+        <ProjectReference Include="$(SolutionDir)/src/SpaceWarp.UI/SpaceWarp.UI.csproj" Private="false" PrivateAssets="all"/>
     </ItemGroup>
 </Project>
diff --git a/src/SpaceWarp.Messaging/SpaceWarp.Messaging.csproj b/src/SpaceWarp.Messaging/SpaceWarp.Messaging.csproj
index 67f08be..b1980dd 100644
--- a/src/SpaceWarp.Messaging/SpaceWarp.Messaging.csproj
+++ b/src/SpaceWarp.Messaging/SpaceWarp.Messaging.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <!-- References -->
     <ItemGroup Label="Project references">
-        <ProjectReference Include="$(SolutionDir)/src/SpaceWarp.Core/SpaceWarp.Core.csproj" Private="false"/>
+        <ProjectReference Include="$(SolutionDir)/src/SpaceWarp.Core/SpaceWarp.Core.csproj" Private="false" PrivateAssets="all"/>
     </ItemGroup>
 </Project>
diff --git a/src/SpaceWarp.Patches/SpaceWarp.Patches.csproj b/src/SpaceWarp.Patches/SpaceWarp.Patches.csproj
index e5191e9..87fccb9 100644
--- a/src/SpaceWarp.Patches/SpaceWarp.Patches.csproj
+++ b/src/SpaceWarp.Patches/SpaceWarp.Patches.csproj
@@ -7,6 +7,6 @@
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
     </ItemGroup>
     <ItemGroup Label="Project references">
-        <ProjectReference Include="$(SolutionDir)/src/SpaceWarp.Preload/SpaceWarp.Preload.csproj" Private="false"/>
+        <ProjectReference Include="$(SolutionDir)/src/SpaceWarp.Preload/SpaceWarp.Preload.csproj" Private="false" PrivateAssets="all"/>
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/SpaceWarp.Sound/SpaceWarp.Sound.csproj b/src/SpaceWarp.Sound/SpaceWarp.Sound.csproj
index 5ad2709..ea2ecc5 100644
--- a/src/SpaceWarp.Sound/SpaceWarp.Sound.csproj
+++ b/src/SpaceWarp.Sound/SpaceWarp.Sound.csproj
@@ -3,9 +3,9 @@
     <!-- References -->
     <ItemGroup Label="NuGet package references">
         <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.1" PrivateAssets="all"/>
-        <PackageReference Include="KerbalSpaceProgram2.GameLibs" Version="0.1.5" Publicize="true"/>
+        <PackageReference Include="KerbalSpaceProgram2.GameLibs" Version="0.2.1" Publicize="true"/>
     </ItemGroup>
     <ItemGroup Label="Project references">
-        <ProjectReference Include="$(SolutionDir)/src/SpaceWarp.Core/SpaceWarp.Core.csproj" Private="false"/>
+        <ProjectReference Include="$(SolutionDir)/src/SpaceWarp.Core/SpaceWarp.Core.csproj" Private="false" PrivateAssets="all"/>
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/SpaceWarp.UI/SpaceWarp.UI.csproj b/src/SpaceWarp.UI/SpaceWarp.UI.csproj
index 5672b3b..62d7f2e 100644
--- a/src/SpaceWarp.UI/SpaceWarp.UI.csproj
+++ b/src/SpaceWarp.UI/SpaceWarp.UI.csproj
@@ -3,16 +3,14 @@
     <!-- References -->
     <ItemGroup Label="NuGet package references">
         <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.1" PrivateAssets="all"/>
-        <PackageReference Include="KerbalSpaceProgram2.GameLibs" Version="0.1.5" Publicize="true"/>
+        <PackageReference Include="KerbalSpaceProgram2.GameLibs" Version="0.2.1" Publicize="true"/>
         <PackageReference Include="UitkForKsp2" Version="2.4.0" Publicize="true"/>
         <PackageReference Include="UnityEngine.Modules" Version="2022.3.5" Publicize="true"/>
     </ItemGroup>
     <ItemGroup Label="Project references">
-        <ProjectReference Include="$(SolutionDir)/src/SpaceWarp.Core/SpaceWarp.Core.csproj" Private="false"/>
-        <ProjectReference Include="$(SolutionDir)/src/SpaceWarp.VersionChecking/SpaceWarp.VersionChecking.csproj" Private="false"/>
-        <ProjectReference Include="..\SpaceWarp.Preload\SpaceWarp.Preload.csproj">
-          <Private>false</Private>
-        </ProjectReference>
+        <ProjectReference Include="$(SolutionDir)/src/SpaceWarp.Core/SpaceWarp.Core.csproj" Private="false" PrivateAssets="all"/>
+        <ProjectReference Include="$(SolutionDir)/src/SpaceWarp.VersionChecking/SpaceWarp.VersionChecking.csproj" Private="false" PrivateAssets="all"/>
+        <ProjectReference Include="$(SolutionDir)/src/SpaceWarp.Preload/SpaceWarp.Preload.csproj" Private="false" PrivateAssets="all"/>
     </ItemGroup>
     <!-- Files to compile -->
     <ItemGroup>
diff --git a/src/SpaceWarp.VersionChecking/SpaceWarp.VersionChecking.csproj b/src/SpaceWarp.VersionChecking/SpaceWarp.VersionChecking.csproj
index 2b679b0..ad5f301 100644
--- a/src/SpaceWarp.VersionChecking/SpaceWarp.VersionChecking.csproj
+++ b/src/SpaceWarp.VersionChecking/SpaceWarp.VersionChecking.csproj
@@ -2,9 +2,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <!-- References -->
     <ItemGroup Label="NuGet package references">
-        <PackageReference Include="KerbalSpaceProgram2.GameLibs" Version="0.1.5"/>
+        <PackageReference Include="KerbalSpaceProgram2.GameLibs" Version="0.2.1"/>
     </ItemGroup>
     <ItemGroup Label="Project references">
-        <ProjectReference Include="$(SolutionDir)/src/SpaceWarp.Core/SpaceWarp.Core.csproj" Private="false"/>
+        <ProjectReference Include="$(SolutionDir)/src/SpaceWarp.Core/SpaceWarp.Core.csproj" Private="false" PrivateAssets="all"/>
     </ItemGroup>
 </Project>
\ No newline at end of file