From 79614661f8bc1ab5be373a7e5fa89d17999f2677 Mon Sep 17 00:00:00 2001
From: Austin Vandersluis <austinv900@nindroidservers.com>
Date: Mon, 1 Jan 2024 06:58:55 -0800
Subject: [PATCH] Fix merge error not finding dll

---
 src/Oxide.References.csproj | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/Oxide.References.csproj b/src/Oxide.References.csproj
index b428a95..9b58882 100644
--- a/src/Oxide.References.csproj
+++ b/src/Oxide.References.csproj
@@ -39,33 +39,30 @@
   <Target Name="ILPack" AfterTargets="Build">
     <PropertyGroup>
       <ILRepack>$(NuGetPackageRoot)ILRepack\2.0.18\tools\ILRepack.exe</ILRepack>
-      <ILRepackLog>$(TargetDir)repack.log</ILRepackLog>
-      <ILRepackLib>$(TargetDir)</ILRepackLib>
-      <ILRepackTarget>$(TargetDir)Oxide.References.dll</ILRepackTarget>
+      <ILRepackLog>$(OutputPath)repack.log</ILRepackLog>
+      <ILRepackLib>$(OutputPath)</ILRepackLib>
+      <ILRepackTarget>$(OutputPath)Oxide.References.dll</ILRepackTarget>
     </PropertyGroup>
     <ItemGroup>
-      <RepackItems Include="$(TargetDir)Oxide.References.dll" />
-
-      
-      <RepackItems Condition="$(TargetFramework.StartsWith('netstandard')) == 'false'" Include="$(TargetDir)0Harmony.dll" />
+      <RepackItems Condition="$(TargetFramework.StartsWith('netstandard')) == 'false'" Include="$(OutputPath)0Harmony.dll" />
       <RepackItems Condition="$(TargetFramework.StartsWith('netstandard'))" Include="$(NuGetPackageRoot)lib.harmony\2.2.2\lib\net472\0Harmony.dll" />
 
-      <RepackItems Condition="$(TargetFramework.StartsWith('netstandard')) == 'false'" Include="$(TargetDir)Mono.Cecil.dll" />
+      <RepackItems Condition="$(TargetFramework.StartsWith('netstandard')) == 'false'" Include="$(OutputPath)Mono.Cecil.dll" />
       <RepackItems Condition="$(TargetFramework.StartsWith('netstandard'))" Include="$(NuGetPackageRoot)mono.cecil\0.11.5\lib\netstandard2.0\Mono.Cecil.dll" />
 
-      <RepackItems Condition="$(TargetFramework.StartsWith('netstandard')) == 'false'" Include="$(TargetDir)Mono.Cecil.Rocks.dll" />
+      <RepackItems Condition="$(TargetFramework.StartsWith('netstandard')) == 'false'" Include="$(OutputPath)Mono.Cecil.Rocks.dll" />
       <RepackItems Condition="$(TargetFramework.StartsWith('netstandard'))" Include="$(NuGetPackageRoot)mono.cecil\0.11.5\lib\netstandard2.0\Mono.Cecil.Rocks.dll" />
 
-      <RepackItems Condition="$(TargetFramework.StartsWith('netstandard')) == 'false'" Include="$(TargetDir)Newtonsoft.Json.dll" />
+      <RepackItems Condition="$(TargetFramework.StartsWith('netstandard')) == 'false'" Include="$(OutputPath)Newtonsoft.Json.dll" />
       <RepackItems Condition="$(TargetFramework.StartsWith('netstandard'))" Include="$(NuGetPackageRoot)newtonsoft.json\13.0.3\lib\netstandard2.0\Newtonsoft.Json.dll" />
       
-      <RepackItems Condition="$(TargetFramework.StartsWith('netstandard')) == 'false'" Include="$(TargetDir)websocket-sharp.dll" />
+      <RepackItems Condition="$(TargetFramework.StartsWith('netstandard')) == 'false'" Include="$(OutputPath)websocket-sharp.dll" />
       <RepackItems Condition="$(TargetFramework.StartsWith('netstandard'))" Include="$(NuGetPackageRoot)websocketsharpfork\1.0.4\lib\net35\websocket-sharp.dll" />
 
-      <RepackItems Condition="$(TargetFramework.StartsWith('netstandard')) == 'false'" Include="$(TargetDir)protobuf-net.dll" />
+      <RepackItems Condition="$(TargetFramework.StartsWith('netstandard')) == 'false'" Include="$(OutputPath)protobuf-net.dll" />
       <RepackItems Condition="$(TargetFramework.StartsWith('netstandard'))" Include="$(NuGetPackageRoot)protobuf-net\2.4.8\lib\netstandard2.0\protobuf-net.dll" />
 
-      <RepackItems Condition="$(TargetFramework.StartsWith('netstandard')) == 'false'" Include="$(TargetDir)YamlDotNet.dll" />
+      <RepackItems Condition="$(TargetFramework.StartsWith('netstandard')) == 'false'" Include="$(OutputPath)YamlDotNet.dll" />
       <RepackItems Condition="$(TargetFramework.StartsWith('netstandard'))" Include="$(NuGetPackageRoot)yamldotnet\13.7.1\lib\netstandard2.0\YamlDotNet.dll" />
       
       <RepackItems Include="Dependencies\any\Mono.Posix.dll" />