From bc68ca8e3697a142ec6f87395991bbdce95a5b63 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Tue, 10 Dec 2024 17:04:43 +0100
Subject: Clean up conditional ArcaneLibs imports to use configuration

---
 .gitmodules                                      |  9 ---------
 LibMatrix.EventTypes/LibMatrix.EventTypes.csproj | 12 ++----------
 LibMatrix/LibMatrix.csproj                       | 21 +++++----------------
 3 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 838d197..126aadf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,3 @@
 [submodule "ArcaneLibs"]
 	path = ArcaneLibs
 	url = https://github.com/TheArcaneBrony/ArcaneLibs.git
-[submodule "ExampleBots/LibMatrix.ExampleBot"]
-	path = ExampleBots/LibMatrix.ExampleBot
-	url = https://cgit.rory.gay/matrix/bots/LibMatrix.ExampleBot.git
-[submodule "ExampleBots/ModerationBot"]
-	path = ExampleBots/ModerationBot
-	url = https://cgit.rory.gay/matrix/bots/ModerationBot.git
-[submodule "ExampleBots/PluralContactBotPoC"]
-	path = ExampleBots/PluralContactBotPoC
-	url = https://cgit.rory.gay/matrix/bots/PluralContactBotPoC.git
diff --git a/LibMatrix.EventTypes/LibMatrix.EventTypes.csproj b/LibMatrix.EventTypes/LibMatrix.EventTypes.csproj
index be88184..aaa37e4 100644
--- a/LibMatrix.EventTypes/LibMatrix.EventTypes.csproj
+++ b/LibMatrix.EventTypes/LibMatrix.EventTypes.csproj
@@ -7,16 +7,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Condition="Exists('..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj')" Include="..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj"/>
-        <!-- This is dangerous, but eases development since locking the version will drift out of sync without noticing,
-                which causes build errors due to missing functions.
-                Using the NuGet version in development is annoying due to delays between pushing and being able to consume.
-                If you want to use a time-appropriate version of the library, recursively clone https://cgit.rory.gay/matrix/MatrixUtils.git
-                instead, since this will be locked by the MatrixUtils project, which contains both LibMatrix and ArcaneLibs as a submodule. -->
-        <PackageReference Condition="!Exists('..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj')" Include="ArcaneLibs" Version="*-preview*"/>
+        <PackageReference Include="ArcaneLibs" Version="1.0.0-preview.20241122-053825" Condition="'$(Configuration)' == 'Release'"/>
+        <ProjectReference Include="..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj" Condition="'$(Configuration)' == 'Debug'"/>
     </ItemGroup>
 
-    <Target Name="ArcaneLibsNugetWarning" AfterTargets="AfterBuild">
-        <Warning Text="ArcaneLibs is being referenced from NuGet, which is dangerous. Please read the warning in LibMatrix.csproj!" Condition="!Exists('..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj')"/>
-    </Target>
 </Project>
diff --git a/LibMatrix/LibMatrix.csproj b/LibMatrix/LibMatrix.csproj
index f4a20bc..b992ad6 100644
--- a/LibMatrix/LibMatrix.csproj
+++ b/LibMatrix/LibMatrix.csproj
@@ -12,25 +12,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0"/>
+        <ProjectReference Include="..\LibMatrix.EventTypes\LibMatrix.EventTypes.csproj"/>
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Condition="Exists('..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj')" Include="..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj"/>
-        <!-- This is dangerous, but eases development since locking the version will drift out of sync without noticing,
-                which causes build errors due to missing functions.
-                Using the NuGet version in development is annoying due to delays between pushing and being able to consume.
-                If you want to use a time-appropriate version of the library, recursively clone https://cgit.rory.gay/matrix/MatrixUtils.git
-                instead, since this will be locked by the MatrixUtils project, which contains both LibMatrix and ArcaneLibs as a submodule. -->
-        <PackageReference Condition="!Exists('..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj')" Include="ArcaneLibs" Version="*-preview.202*"/>
-        <ProjectReference Include="..\LibMatrix.EventTypes\LibMatrix.EventTypes.csproj"/>
+        <PackageReference Include="ArcaneLibs" Version="1.0.0-preview.20241122-053825" Condition="'$(Configuration)' == 'Release'"/>
+        <ProjectReference Include="..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj" Condition="'$(Configuration)' == 'Debug'"/>
     </ItemGroup>
 
-    <!-- 
-    <Target Name="ArcaneLibsNugetWarning" AfterTargets="AfterBuild">
-        <Warning Text="ArcaneLibs is being referenced from NuGet, which is dangerous. Please read the warning in LibMatrix.csproj!" Condition="!Exists('..\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj')"/>
-    </Target>
-    -->
-
 </Project>
-- 
cgit 1.5.1