Made clear which props are for what use case.

BattletechModders · Dec 23, 2024 · 953347b · 953347b
1 parent e48e3d0
commit 953347b
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 11 deletions.
diff --git a/Common.props → CommonBattleTech.props b/Common.props → CommonBattleTech.props
diff --git a/CommonStandard.props → CommonNetStandard.props b/CommonStandard.props → CommonNetStandard.props
diff --git a/HarmonyXInterop/Harmony109Interop/Harmony109Interop.csproj b/HarmonyXInterop/Harmony109Interop/Harmony109Interop.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\Common.props" />
+  <Import Project="..\..\CommonBattleTech.props" />
   <PropertyGroup>
     <RootNamespace>0Harmony109</RootNamespace>
     <AssemblyName>0Harmony109</AssemblyName>

diff --git a/HarmonyXInterop/Harmony12Interop/Harmony12Interop.csproj b/HarmonyXInterop/Harmony12Interop/Harmony12Interop.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\Common.props" />
+  <Import Project="..\..\CommonBattleTech.props" />
   <PropertyGroup>
     <RootNamespace>0Harmony12</RootNamespace>
     <AssemblyName>0Harmony12</AssemblyName>

diff --git a/HarmonyXInterop/HarmonyXInterop/HarmonyXInterop.csproj b/HarmonyXInterop/HarmonyXInterop/HarmonyXInterop.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\Common.props" />
+  <Import Project="..\..\CommonBattleTech.props" />
   <Target Name="CopyFilesToGame" AfterTargets="CopyFilesToOutputDirectory">
     <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(ModTekLibDir)" />
   </Target>

diff --git a/ModTek.Common/ModTek.Common.csproj b/ModTek.Common/ModTek.Common.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\CommonStandard.props" />
+  <Import Project="..\CommonNetStandard.props" />
 
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/ModTek.InjectorRunner/ModTek.InjectorRunner.csproj b/ModTek.InjectorRunner/ModTek.InjectorRunner.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\CommonStandard.props" />
+  <Import Project="..\CommonNetStandard.props" />
 
   <ItemGroup>
     <InternalsVisibleTo Include="ModTek.Preloader" />

diff --git a/ModTek.Preloader/ModTek.Preloader.csproj b/ModTek.Preloader/ModTek.Preloader.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Common.props" />
+  <Import Project="..\CommonBattleTech.props" />
 
   <Target Name="CopyFilesToGame" AfterTargets="CopyFilesToOutputDirectory">
     <ItemGroup>

diff --git a/ModTek/ModTek.csproj b/ModTek/ModTek.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Common.props" />
+  <Import Project="..\CommonBattleTech.props" />
 
   <PropertyGroup>
     <!-- Suppress warnings for fields never assigned to (e.g. json deserialization works via reflection, not direct assignment)  -->
@@ -96,12 +96,10 @@
   </ItemGroup>
 
   <!-- helpful direct access to resources in BT, might trigger IDE indexing -->
-  <!--
   <ItemGroup>
     <None Include="$(BattleTechGameDir)\Mods\.modtek\*.txt;$(BattleTechGameDir)\Mods\.modtek\*.log"  LinkBase=".modtek" />
-    <None Include="$(BattleTechGameDir)\BattleTech_Data\StreamingAssets\data\**\*.json;$(BattleTechGameDir)\BattleTech_Data\StreamingAssets\data\**\*.csv" LinkBase="BattleTech_Data"/>
+<!--    <None Include="$(BattleTechGameDir)\BattleTech_Data\StreamingAssets\data\**\*.json;$(BattleTechGameDir)\BattleTech_Data\StreamingAssets\data\**\*.csv" LinkBase="BattleTech_Data"/>-->
   </ItemGroup>
-  -->
 
   <ItemGroup>
     <ProjectReference Include="..\ModTek.Common\ModTek.Common.csproj" />

diff --git a/ModTekInjector/ModTekInjector.csproj b/ModTekInjector/ModTekInjector.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\CommonStandard.props" />
+  <Import Project="..\CommonNetStandard.props" />
 
   <Target Name="CopyFilesToGame" AfterTargets="CopyFilesToOutputDirectory">
     <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(BattleTechGameDir)\Mods\ModTek\Injectors\" />