Update build system, use properties to find build output location

Mooshua · Aug 20, 2023 · 5c1ada3 · 5c1ada3
1 parent 60c30b8
commit 5c1ada3
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 13 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,7 +5,7 @@
         <BitModDev Condition=" '$(BitModDev)' == '' " >$(MSBuildThisFileDirectory)\dev</BitModDev>
 
         <!--Ditto for publishes-->
-        <BitModBuild Condition=" '$(BitModDev)' == '' " >$(MSBuildThisFileDirectory)\dev</BitModBuild>
+        <BitModBuild Condition=" '$(BitModBuild)' == '' " >$(MSBuildThisFileDirectory)\build</BitModBuild>
     </PropertyGroup>
 
     <PropertyGroup>

diff --git a/builtin/BitMod.Commands/BitMod.Commands.csproj b/builtin/BitMod.Commands/BitMod.Commands.csproj
@@ -8,8 +8,8 @@
         <Configurations>Debug;Release</Configurations>
         <Platforms>AnyCPU</Platforms>
 
-        <OutDir>../../dev/plugins/$(AssemblyName)/</OutDir>
-        <PublishDir>../../build/plugins/$(AssemblyName)</PublishDir>
+        <OutDir>$(BitModDev)/plugins/$(AssemblyName)/</OutDir>
+        <PublishDir>$(BitModBuild)/plugins/$(AssemblyName)/</PublishDir>
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
 

diff --git a/builtin/BitMod.Flags/BitMod.Flags.csproj b/builtin/BitMod.Flags/BitMod.Flags.csproj
@@ -8,8 +8,8 @@
         <Configurations>Debug;Release</Configurations>
         <Platforms>AnyCPU</Platforms>
 
-        <OutDir>../../dev/plugins/$(AssemblyName)/</OutDir>
-        <PublishDir>../../build/plugins/$(AssemblyName)</PublishDir>
+        <OutDir>$(BitModDev)/plugins/$(AssemblyName)/</OutDir>
+        <PublishDir>$(BitModBuild)/plugins/$(AssemblyName)/</PublishDir>
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
 

diff --git a/builtin/BitMod.Moderation/BitMod.Moderation.csproj b/builtin/BitMod.Moderation/BitMod.Moderation.csproj
@@ -6,8 +6,8 @@
         <Nullable>enable</Nullable>
         <AssemblyName>bitmod_moderation</AssemblyName>
 
-        <OutDir>../../dev/plugins/$(AssemblyName)/</OutDir>
-        <PublishDir>../../build/plugins/$(AssemblyName)</PublishDir>
+        <OutDir>$(BitModDev)/plugins/$(AssemblyName)/</OutDir>
+        <PublishDir>$(BitModBuild)/plugins/$(AssemblyName)/</PublishDir>
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
 

diff --git a/builtin/BitMod.Provision/BitMod.Provision.csproj b/builtin/BitMod.Provision/BitMod.Provision.csproj
@@ -7,8 +7,8 @@
 
         <AssemblyName>bitmod_provision</AssemblyName>
 
-        <OutDir>../../dev/plugins/$(AssemblyName)/</OutDir>
-        <PublishDir>../../build/plugins/$(AssemblyName)</PublishDir>
+        <OutDir>$(BitModDev)/plugins/$(AssemblyName)/</OutDir>
+        <PublishDir>$(BitModBuild)/plugins/$(AssemblyName)/</PublishDir>
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
 

diff --git a/builtin/BitMod.Whitelist/BitMod.Whitelist.csproj b/builtin/BitMod.Whitelist/BitMod.Whitelist.csproj
@@ -8,8 +8,8 @@
         <Configurations>Debug;Release</Configurations>
         <Platforms>AnyCPU</Platforms>
 
-        <OutDir>../../dev/plugins/$(AssemblyName)/</OutDir>
-        <PublishDir>../../build/plugins/$(AssemblyName)</PublishDir>
+        <OutDir>$(BitModDev)/plugins/$(AssemblyName)/</OutDir>
+        <PublishDir>$(BitModBuild)/plugins/$(AssemblyName)/</PublishDir>
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
 

diff --git a/plugins/BitMod.Gamemode.GunGame/BitMod.Gamemode.GunGame.csproj b/plugins/BitMod.Gamemode.GunGame/BitMod.Gamemode.GunGame.csproj
@@ -3,6 +3,8 @@
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
         <Nullable>enable</Nullable>
+
+        <OutDir>$(BitModDev)/plugins/$(AssemblyName)/</OutDir>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/standalone/BitMod.Launcher/BitMod.Launcher.csproj b/standalone/BitMod.Launcher/BitMod.Launcher.csproj
@@ -10,8 +10,8 @@
         <Configurations>Debug;Release</Configurations>
         <Platforms>AnyCPU</Platforms>
 
-        <PublishDir>../../build</PublishDir>
-        <OutDir>../../dev</OutDir>
+        <PublishDir>$(BitModBuild)</PublishDir>
+        <OutDir>$(BitModDev)</OutDir>
         <LangVersion>latest</LangVersion>
     </PropertyGroup>