Moved static dlls into launcher lib folder on build

SubnauticaNitrox · Aug 9, 2020 · 433c931 · 433c931
1 parent 5b0b6a0
commit 433c931
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/NitroxLauncher/NitroxLauncher.csproj b/NitroxLauncher/NitroxLauncher.csproj
@@ -285,10 +285,22 @@
        TODO: Try fix this as a project reference to Nitrox.Subnautica.Assets that will copy the files on build automatically. -->
   <Target Name="MoveNitroxAssetsToLauncherOutput" AfterTargets="Build" Condition="'$(OS)' == 'Windows_NT'">
     <ItemGroup>
-      <NitroxSubnauticaAssets Include="..\Nitrox.Subnautica.Assets\**\*.dll" />
       <NitroxSubnauticaAssets Include="..\Nitrox.Subnautica.Assets\**\*." />
     </ItemGroup>
+    <ItemGroup>
+      <NitroxSubnauticaStaticDlls Include="..\Nitrox.Subnautica.Assets\**\*.dll" />
+    </ItemGroup>
     <Copy SourceFiles="@(NitroxSubnauticaAssets)" DestinationFolder="$(TargetDir)\%(RecursiveDir)" />
+    <Copy SourceFiles="@(NitroxSubnauticaStaticDlls)" DestinationFolder="$(TargetDir)\lib\%(RecursiveDir)" />
+  </Target>
+  <Target Name="MoveDependenciesToLib" AfterTargets="Build">
+    <ItemGroup>
+      <AllDependencies Include="$(TargetDir)*.dll" />
+      <AllDependencies Include="$(TargetDir)*.pdb" />
+      <AllDependencies Include="$(TargetDir)*.dll.config" />
+      <AllDependencies Include="$(TargetDir)*.xml" />
+    </ItemGroup>
+    <Move SourceFiles="@(AllDependencies)" DestinationFolder="$(TargetDir)lib" />
   </Target>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition="'$(OS)' == 'Windows_NT'" />
-</Project>
+</Project>
diff --git a/NitroxServer-Subnautica/App.config b/NitroxServer-Subnautica/App.config
@@ -23,6 +23,7 @@
     </startup>
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <probing privatePath="lib" />
             <dependentAssembly>
                 <assemblyIdentity name="Mono.Cecil" publicKeyToken="50cebf1cceb9d05e" culture="neutral" />
                 <bindingRedirect oldVersion="0.0.0.0-0.11.2.0" newVersion="0.11.2.0" />