From 49718d566963b43188329e9d618112d6296c3278 Mon Sep 17 00:00:00 2001
From: Raymond <daemitus@gmail.com>
Date: Sun, 17 Oct 2021 19:55:04 -0400
Subject: [PATCH 1/3] Debug injector.log should be dalamud.injector.log

---
 Dalamud.Injector/EntryPoint.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dalamud.Injector/EntryPoint.cs b/Dalamud.Injector/EntryPoint.cs
index adf84d923..7f063d5b1 100644
--- a/Dalamud.Injector/EntryPoint.cs
+++ b/Dalamud.Injector/EntryPoint.cs
@@ -116,7 +116,7 @@ namespace Dalamud.Injector
             var baseDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
 
 #if DEBUG
-            var logPath = Path.Combine(baseDirectory, "injector.log");
+            var logPath = Path.Combine(baseDirectory, "dalamud.injector.log");
 #else
             var logPath = Path.Combine(baseDirectory, "..", "..", "..", "dalamud.injector.log");
 #endif

From 54af39cf5c7e8462f760db950f60fa377157a624 Mon Sep 17 00:00:00 2001
From: Raymond <daemitus@gmail.com>
Date: Sun, 17 Oct 2021 19:55:47 -0400
Subject: [PATCH 2/3] Link Dalamud files in the injector into an "included"
 folder

---
 Dalamud.Injector/Dalamud.Injector.csproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dalamud.Injector/Dalamud.Injector.csproj b/Dalamud.Injector/Dalamud.Injector.csproj
index b2ad61f79..d9ce042a6 100644
--- a/Dalamud.Injector/Dalamud.Injector.csproj
+++ b/Dalamud.Injector/Dalamud.Injector.csproj
@@ -81,9 +81,9 @@
     <ItemGroup>
         <!-- This prevents us from having to include Dalamud itself as a dependency -->
         <!-- If the files move just update the paths here -->
-        <Compile Include="..\Dalamud\ClientLanguage.cs" />
-        <Compile Include="..\Dalamud\DalamudStartInfo.cs" />
-        <Compile Include="..\Dalamud\Game\GameVersion.cs" />
-        <Compile Include="..\Dalamud\Game\GameVersionConverter.cs" />
+        <Compile Include="..\Dalamud\ClientLanguage.cs" Link="Included\%(Filename)%(Extension)" />
+        <Compile Include="..\Dalamud\DalamudStartInfo.cs" Link="Included\%(Filename)%(Extension)" />
+        <Compile Include="..\Dalamud\Game\GameVersion.cs" Link="Included\Game\%(Filename)%(Extension)" />
+        <Compile Include="..\Dalamud\Game\GameVersionConverter.cs" Link="Included\Game\%(Filename)%(Extension)" />
     </ItemGroup>
 </Project>

From bc48496803efdea8ed33c4294778dd212bb410f8 Mon Sep 17 00:00:00 2001
From: Raymond <daemitus@gmail.com>
Date: Sun, 17 Oct 2021 19:56:23 -0400
Subject: [PATCH 3/3] Formatting and use nameof for monohook

---
 Dalamud/Logging/Internal/TaskTracker.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Dalamud/Logging/Internal/TaskTracker.cs b/Dalamud/Logging/Internal/TaskTracker.cs
index 3526d273f..8f2f3b34a 100644
--- a/Dalamud/Logging/Internal/TaskTracker.cs
+++ b/Dalamud/Logging/Internal/TaskTracker.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Reflection;
@@ -106,8 +106,7 @@ namespace Dalamud.Logging.Internal
             Log.Information("s_asyncDebuggingEnabled: {0}", debugField.GetValue(null));
 
             var targetMethod = targetType.GetMethod("AddToActiveTasks", BindingFlags.Static | BindingFlags.NonPublic);
-            var patchMethod =
-                typeof(TaskTracker).GetMethod("AddToActiveTasksHook", BindingFlags.NonPublic | BindingFlags.Static);
+            var patchMethod = typeof(TaskTracker).GetMethod(nameof(AddToActiveTasksHook), BindingFlags.NonPublic | BindingFlags.Static);
 
             if (targetMethod == null)
                 Log.Error("TargetMethod null!");