Moved dlls to ModTek/bin to keep dlls in one place

BattletechModders · Feb 4, 2024 · a0c5247 · a0c5247
1 parent dac713c
commit a0c5247
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 28 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -6,7 +6,8 @@
   <ItemGroup>
     <PackageVersion Include="Krafs.Publicizer" Version="2.2.1" />
     <PackageVersion Include="GitVersion.MsBuild" Version="5.12.0" />
+<!--    <PackageVersion Include="HarmonyX" Version="2.11.0" />-->
     <PackageVersion Include="HarmonyX" Version="2.10.2" />
-    <PackageVersion Include="PolySharp" Version="1.13.2" />
+    <PackageVersion Include="PolySharp" Version="1.14.1" />
   </ItemGroup>
 </Project>
diff --git a/HarmonyXInterop/Harmony109Interop/Harmony109Interop.csproj b/HarmonyXInterop/Harmony109Interop/Harmony109Interop.csproj
@@ -7,7 +7,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <Target Name="CopyFilesToGame" AfterTargets="CopyFilesToOutputDirectory">
-    <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(BattleTechGameDir)\Mods\ModTek\Harmony12X\" />
+    <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(BattleTechGameDir)\Mods\ModTek\bin\" />
   </Target>
   <ItemGroup>
     <ProjectReference Include="..\HarmonyXInterop\HarmonyXInterop.csproj" />

diff --git a/HarmonyXInterop/Harmony12Interop/Harmony12Interop.csproj b/HarmonyXInterop/Harmony12Interop/Harmony12Interop.csproj
@@ -7,7 +7,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <Target Name="CopyFilesToGame" AfterTargets="CopyFilesToOutputDirectory">
-    <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(BattleTechGameDir)\Mods\ModTek\Harmony12X\" />
+    <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(BattleTechGameDir)\Mods\ModTek\bin\" />
   </Target>
   <ItemGroup>
     <ProjectReference Include="..\HarmonyXInterop\HarmonyXInterop.csproj" />

diff --git a/HarmonyXInterop/HarmonyXInterop/HarmonyXInterop.csproj b/HarmonyXInterop/HarmonyXInterop/HarmonyXInterop.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Common.props" />
   <Target Name="CopyFilesToGame" AfterTargets="CopyFilesToOutputDirectory">
-    <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(BattleTechGameDir)\Mods\ModTek\Harmony12X\" />
+    <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(BattleTechGameDir)\Mods\ModTek\bin\" />
   </Target>
   <ItemGroup>
     <PackageReference Include="GitVersion.MsBuild">

diff --git a/ModTek.Common/ModTek.Common.csproj b/ModTek.Common/ModTek.Common.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\Common.props" />
 
   <Target Name="CopyFilesToGame" AfterTargets="CopyFilesToOutputDirectory">
-    <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(BattleTechGameDir)\Mods\ModTek\" />
+    <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(BattleTechGameDir)\Mods\ModTek\bin\" />
   </Target>
 
   <ItemGroup>

diff --git a/ModTek/ModTek.csproj b/ModTek/ModTek.csproj
@@ -7,7 +7,8 @@
   </PropertyGroup>
 
   <Target Name="CopyFilesToGame" AfterTargets="CopyFilesToOutputDirectory">
-    <Copy SourceFiles="$(TargetPath);@(Asset)" DestinationFolder="$(BattleTechGameDir)\Mods\ModTek\" />
+    <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(BattleTechGameDir)\Mods\ModTek\bin\" />
+    <Copy SourceFiles="@(Asset)" DestinationFolder="$(BattleTechGameDir)\Mods\ModTek\" />
   </Target>
 
   <PropertyGroup>

diff --git a/ModTekInjector/ModTekInjector.csproj b/ModTekInjector/ModTekInjector.csproj
@@ -12,7 +12,10 @@
     <PackageReference Include="GitVersion.MsBuild">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="HarmonyX" />
+    <PackageReference Include="HarmonyX">
+      <PrivateAssets>All</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
     <PackageReference Include="PolySharp">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/ModTekPreloader/Harmony12X/DynamicShimInjector.cs b/ModTekPreloader/Harmony12X/DynamicShimInjector.cs
@@ -25,15 +25,11 @@ internal static void Setup()
     private DynamicShimInjector()
     {
         Logger.Main.Log("Setting up HarmonyX interoperability");
-        if (!Directory.Exists(Paths.Harmony12XDirectory))
-        {
-            throw new Exception($"HarmonyX can't be loaded, directory `{FileUtils.GetRelativePath(Paths.Harmony12XDirectory)}` missing.");
-        }
 
-        Logger.Main.Log($"Preloading supported Harmony12X assemblies from `{FileUtils.GetRelativePath(Paths.Harmony12XDirectory)}`.");
+        Logger.Main.Log($"Preloading supported Harmony12X assemblies from `{FileUtils.GetRelativePath(Paths.ModTekBinDirectory)}`.");
         foreach (var harmonyVersion in HarmonyVersion.SupportedVersions)
         {
-            var file = Path.Combine(Paths.Harmony12XDirectory, $"{harmonyVersion.Name}.dll");
+            var file = Path.Combine(Paths.ModTekBinDirectory, $"{harmonyVersion.Name}.dll");
             Logger.Main.Log($"\t{Path.GetFileName(file)}");
             var assembly = Assembly.LoadFile(file);
             if (!harmonyVersion.IsMatch(assembly.GetName().Version))

diff --git a/ModTekPreloader/Injector/AssemblyCache.cs b/ModTekPreloader/Injector/AssemblyCache.cs
@@ -17,7 +17,7 @@ internal AssemblyCache()
     {
         searchDirectories = new List<string>
         {
-            Paths.ModTekDirectory,
+            Paths.ModTekBinDirectory,
             Paths.ManagedDirectory
         };
 

diff --git a/ModTekPreloader/Injector/InjectionCacheManifest.cs b/ModTekPreloader/Injector/InjectionCacheManifest.cs
@@ -60,19 +60,15 @@ internal static string GetActualManifestContent()
 
         // preloader
         files.Add(Paths.PreloaderConfigFile);
-        if (Directory.Exists(Paths.ModTekDirectory))
+        if (Directory.Exists(Paths.ModTekBinDirectory))
         {
-            files.AddRange(Directory.GetFiles(Paths.ModTekDirectory, "*.dll"));
+            files.AddRange(Directory.GetFiles(Paths.ModTekBinDirectory, "*.dll"));
         }
         files.AddRange(Directory.GetFiles(Paths.InjectorsDirectory));
         if (Directory.Exists(Paths.AssembliesOverrideDirectory))
         {
             files.AddRange(Directory.GetFiles(Paths.AssembliesOverrideDirectory, "*.dll"));
         }
-        if (Directory.Exists(Paths.Harmony12XDirectory))
-        {
-            files.AddRange(Directory.GetFiles(Paths.Harmony12XDirectory, "*.dll"));
-        }
 
         // output
         if (Directory.Exists(Paths.AssembliesInjectedDirectory))

diff --git a/ModTekPreloader/Loader/Preloader.cs b/ModTekPreloader/Loader/Preloader.cs
@@ -63,7 +63,7 @@ private static void PreloadAssembliesOverride()
 
     private static void PreloadModTek()
     {
-        var file = Path.Combine(Paths.ModTekDirectory, "ModTek.dll");
+        var file = Path.Combine(Paths.ModTekBinDirectory, "ModTek.dll");
         Logger.Main.Log($"Preloading ModTek from `{FileUtils.GetRelativePath(file)}`:");
         Assembly.LoadFile(file);
     }

diff --git a/ModTekPreloader/ModTekPreloader.csproj b/ModTekPreloader/ModTekPreloader.csproj
@@ -8,13 +8,11 @@
 
   <Target Name="CopyFilesToGame" AfterTargets="CopyFilesToOutputDirectory">
     <ItemGroup>
-      <ModTekDepFiles Include="$(OutDir)\Mono.Cecil*" />
-      <Harmony12XDeps Exclude="$(OutDir)\Mono.Cecil*;$(TargetPath)" Include="$(OutDir)**" />
+      <Harmony12XDeps Exclude="$(TargetPath)" Include="$(OutDir)**" />
       <DoorstopFiles Include="run.sh;doorstop_config.ini" />
     </ItemGroup>
-    <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(BattleTechGameDir)\Mods\ModTek\" />
-    <Copy SourceFiles="@(ModTekDepFiles)" DestinationFolder="$(BattleTechGameDir)\Mods\ModTek\" />
-    <Copy SourceFiles="@(Harmony12XDeps)" DestinationFolder="$(BattleTechGameDir)\Mods\ModTek\Harmony12X\" />
+    <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(BattleTechGameDir)\Mods\ModTek\bin\" />
+    <Copy SourceFiles="@(Harmony12XDeps)" DestinationFolder="$(BattleTechGameDir)\Mods\ModTek\bin\" />
     <Copy SourceFiles="@(DoorstopFiles)" DestinationFolder="$(BattleTechGameDir)\" />
     <MakeDir Directories="$(BattleTechGameDir)\Mods\ModTek\AssembliesOverride" />
   </Target>

diff --git a/ModTekPreloader/Paths.cs b/ModTekPreloader/Paths.cs
@@ -17,7 +17,7 @@ internal class Paths
     internal static readonly string PreloaderConfigFile = Path.Combine(ModTekDirectory, "ModTekPreloader.config.json");
     internal static readonly string PreloaderConfigDefaultsFile = Path.Combine(ModTekDirectory, "ModTekPreloader.config.help.json");
     internal static readonly string AssembliesOverrideDirectory = Path.Combine(ModTekDirectory, "AssembliesOverride");
-    internal static readonly string Harmony12XDirectory = Path.Combine(ModTekDirectory, "Harmony12X");
+    internal static readonly string ModTekBinDirectory = Path.Combine(ModTekDirectory, "bin");
     internal static readonly string HarmonyLogFile = Path.Combine(DotModTekDirectory, "HarmonyFileLog.log");
     internal static readonly string LogFile = Path.Combine(DotModTekDirectory, "ModTekPreloader.log");
     internal static readonly string LockFile = Path.Combine(DotModTekDirectory, "ModTekPreloader.lock");

diff --git a/ModTekPreloader/doorstop_config.ini b/ModTekPreloader/doorstop_config.ini
@@ -1,6 +1,6 @@
 [General]
 enabled=true
-target_assembly=Mods\ModTek\ModTekPreloader.dll
+target_assembly=Mods\ModTek\bin\ModTekPreloader.dll
 # If true, Unity's output log is redirected to <current folder>\output_log.txt
 redirect_output_log=false
 # Options specific to running under Unity Mono runtime