From 78d36b69fa68775654c8812f7f07229041ef489f Mon Sep 17 00:00:00 2001 From: Marius Ungureanu Date: Wed, 24 Mar 2021 03:23:42 +0200 Subject: [PATCH] Simplified quite a bit of the logic to reference Unity/DSP. It is no longer required to downgrade the dlls. All references happen in a shared place. Output directory is created automatically. --- Nebula.sln | 1 + NebulaClient/NebulaClient.csproj | 48 +++++------------------- NebulaHost/NebulaHost.csproj | 25 ++++++------- NebulaModel/NebulaModel.csproj | 32 ++++------------ NebulaPatcher/NebulaPatcher.csproj | 59 ++++++------------------------ NebulaWorld/NebulaWorld.csproj | 31 +++++----------- PluginImports.targets | 27 ++++++++++++++ SharedConfig.targets | 3 +- 8 files changed, 80 insertions(+), 146 deletions(-) create mode 100644 PluginImports.targets diff --git a/Nebula.sln b/Nebula.sln index 081b78cb9..ef281704a 100644 --- a/Nebula.sln +++ b/Nebula.sln @@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig Directory.Build.targets = Directory.Build.targets + PluginImports.targets = PluginImports.targets SharedConfig.targets = SharedConfig.targets EndProjectSection EndProject diff --git a/NebulaClient/NebulaClient.csproj b/NebulaClient/NebulaClient.csproj index c541f302f..ea5660b68 100644 --- a/NebulaClient/NebulaClient.csproj +++ b/NebulaClient/NebulaClient.csproj @@ -38,42 +38,7 @@ true - - ..\Libs\Assembly-CSharp.dll - - - False - ..\Libs\UnityEngine.dll - - - False - ..\Libs\UnityEngine.AnimationModule.dll - - - False - ..\Libs\UnityEngine.CoreModule.dll - - - False - ..\Libs\UnityEngine.ParticleSystemModule.dll - - - False - ..\Libs\UnityEngine.PhysicsModule.dll - - - False - ..\Libs\UnityEngine.UI.dll - - - False - ..\Libs\UnityEngine.UIElementsModule.dll - - - False - ..\Libs\UnityEngine.UIModule.dll - @@ -92,10 +57,12 @@ + true {c6237195-f77c-40c0-b06a-4ad51cad314d} NebulaModel + true {28aea139-fb22-4672-af51-28b728cf2978} NebulaWorld @@ -110,7 +77,12 @@ - - copy /Y "$(TargetPath)" "$(DSPGameDir)\BepInEx\plugins\Nebula\$(TargetFileName)" - + + + + + + \ No newline at end of file diff --git a/NebulaHost/NebulaHost.csproj b/NebulaHost/NebulaHost.csproj index 1ff162fc4..269c43edc 100644 --- a/NebulaHost/NebulaHost.csproj +++ b/NebulaHost/NebulaHost.csproj @@ -34,21 +34,12 @@ true - - ..\Libs\Assembly-CSharp.dll - - - ..\Libs\UnityEngine.dll - - - ..\Libs\UnityEngine.CoreModule.dll - @@ -67,14 +58,17 @@ + true {C6237195-F77C-40C0-B06A-4AD51CAD314D} NebulaModel + true {28aea139-fb22-4672-af51-28b728cf2978} NebulaWorld + true {b357bac7-529e-4d81-a0d2-71041b19c8de} websocket-sharp @@ -85,9 +79,12 @@ - - copy /Y "$(TargetPath)" "$(DSPGameDir)\BepInEx\plugins\Nebula\$(TargetFileName)" -copy /Y "$(TargetDir)/LZ4.dll" "$(DSPGameDir)\BepInEx\plugins\Nebula\LZ4.dll" -copy /Y "$(TargetDir)/websocket-sharp.dll" "$(DSPGameDir)\BepInEx\plugins\Nebula\websocket-sharp.dll" - + + + + + + diff --git a/NebulaModel/NebulaModel.csproj b/NebulaModel/NebulaModel.csproj index 9c3eba2b4..aeb29cebf 100644 --- a/NebulaModel/NebulaModel.csproj +++ b/NebulaModel/NebulaModel.csproj @@ -38,28 +38,7 @@ true - - ..\Libs\0Harmony.dll - - - ..\Libs\BepInEx.dll - - - ..\Libs\BepInEx.Harmony.dll - - - False - ..\Libs\UnityEngine.dll - - - False - ..\Libs\UnityEngine.AnimationModule.dll - - - False - ..\Libs\UnityEngine.CoreModule.dll - @@ -119,7 +98,12 @@ - - copy /Y "$(TargetPath)" "$(DSPGameDir)\BepInEx\plugins\Nebula\$(TargetFileName)" - + + + + + + \ No newline at end of file diff --git a/NebulaPatcher/NebulaPatcher.csproj b/NebulaPatcher/NebulaPatcher.csproj index a055b9c83..2a31b8ca7 100644 --- a/NebulaPatcher/NebulaPatcher.csproj +++ b/NebulaPatcher/NebulaPatcher.csproj @@ -37,51 +37,7 @@ true - - ..\Libs\0Harmony.dll - - - False - ..\Libs\Assembly-CSharp.dll - - - ..\Libs\BepInEx.dll - - - ..\Libs\BepInEx.Harmony.dll - - - False - ..\Libs\UnityEngine.dll - - - False - ..\Libs\UnityEngine.CoreModule.dll - - - False - ..\Libs\UnityEngine.IMGUIModule.dll - - - False - ..\Libs\UnityEngine.ParticleSystemModule.dll - - - ..\Libs\UnityEngine.PhysicsModule.dll - - - False - ..\Libs\UnityEngine.UI.dll - - - False - ..\Libs\UnityEngine.UIElementsModule.dll - - - False - ..\Libs\UnityEngine.UIModule.dll - @@ -104,18 +60,22 @@ + true {5be9c74b-7832-4ef1-a53d-bf461bbdb0be} NebulaClient + true {1927F7FF-230B-4B1B-B7ED-34B58730AFBE} NebulaHost + true {c6237195-f77c-40c0-b06a-4ad51cad314d} NebulaModel + true {28aea139-fb22-4672-af51-28b728cf2978} NebulaWorld @@ -126,7 +86,12 @@ - - copy /Y "$(TargetPath)" "$(DSPGameDir)\BepInEx\plugins\Nebula\$(TargetFileName)" - + + + + + + diff --git a/NebulaWorld/NebulaWorld.csproj b/NebulaWorld/NebulaWorld.csproj index 55191c86a..f878577c5 100644 --- a/NebulaWorld/NebulaWorld.csproj +++ b/NebulaWorld/NebulaWorld.csproj @@ -31,31 +31,12 @@ 4 - - ..\Libs\Assembly-CSharp.dll - - - ..\Libs\UnityEngine.dll - - - ..\Libs\UnityEngine.AnimationModule.dll - - - ..\Libs\UnityEngine.CoreModule.dll - - - False - ..\Libs\UnityEngine.ParticleSystemModule.dll - - - ..\Libs\UnityEngine.PhysicsModule.dll - @@ -74,12 +55,18 @@ + true {c6237195-f77c-40c0-b06a-4ad51cad314d} NebulaModel - - copy /Y "$(TargetPath)" "$(DSPGameDir)\BepInEx\plugins\Nebula\$(TargetFileName)" - + + + + + + \ No newline at end of file diff --git a/PluginImports.targets b/PluginImports.targets new file mode 100644 index 000000000..6fe1b0031 --- /dev/null +++ b/PluginImports.targets @@ -0,0 +1,27 @@ + + + + + $(DSPGameDir)BepInEx\core\ + $(DSPGameDir)DSPGAME_Data\Managed\ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SharedConfig.targets b/SharedConfig.targets index c7d4748d0..bf437e773 100644 --- a/SharedConfig.targets +++ b/SharedConfig.targets @@ -4,6 +4,7 @@ DevEnv.targets $(SolutionDir)\$(DevEnv) C:\Program Files (x86)\Steam\steamapps\common\Dyson Sphere Program\ + $(MSBuildThisFileDirectory)PluginImports.targets @@ -28,6 +29,6 @@ \ No newline at end of file