diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj index 095a29f4d..f786b864c 100644 --- a/Dalamud/Dalamud.csproj +++ b/Dalamud/Dalamud.csproj @@ -74,7 +74,6 @@ all - @@ -121,14 +120,6 @@ - - - - monomod - - - - $(OutputPath)TEMP_gitver.txt diff --git a/Dalamud/Logging/Internal/TaskTracker.cs b/Dalamud/Logging/Internal/TaskTracker.cs index b65f0efa7..da4007570 100644 --- a/Dalamud/Logging/Internal/TaskTracker.cs +++ b/Dalamud/Logging/Internal/TaskTracker.cs @@ -23,7 +23,8 @@ internal class TaskTracker : IDisposable, IServiceType [ServiceManager.ServiceDependency] private readonly Framework framework = Service.Get(); - private MonoMod.RuntimeDetour.Hook? scheduleAndStartHook; + // NET8 CHORE + // private MonoMod.RuntimeDetour.Hook? scheduleAndStartHook; private bool enabled = false; [ServiceManager.ServiceConstructor] @@ -121,7 +122,8 @@ internal class TaskTracker : IDisposable, IServiceType /// public void Dispose() { - this.scheduleAndStartHook?.Dispose(); + // NET8 CHORE + // this.scheduleAndStartHook?.Dispose(); this.framework.Update -= this.FrameworkOnUpdate; } @@ -170,7 +172,8 @@ internal class TaskTracker : IDisposable, IServiceType return; } - this.scheduleAndStartHook = new MonoMod.RuntimeDetour.Hook(targetMethod, patchMethod); + // NET8 CHORE + // this.scheduleAndStartHook = new MonoMod.RuntimeDetour.Hook(targetMethod, patchMethod); Log.Information("AddToActiveTasks Hooked!"); } diff --git a/Dalamud/Plugin/Internal/PluginManager.cs b/Dalamud/Plugin/Internal/PluginManager.cs index ff6b045be..9b5fa0285 100644 --- a/Dalamud/Plugin/Internal/PluginManager.cs +++ b/Dalamud/Plugin/Internal/PluginManager.cs @@ -136,7 +136,8 @@ internal partial class PluginManager : IDisposable, IServiceType this.configuration.PluginTestingOptIns ??= new List(); - this.ApplyPatches(); + // NET8 CHORE + //this.ApplyPatches(); } /// @@ -393,8 +394,9 @@ internal partial class PluginManager : IDisposable, IServiceType plugin.ExplicitDisposeIgnoreExceptions($"Error disposing {plugin.Name}", Log); } - this.assemblyLocationMonoHook?.Dispose(); - this.assemblyCodeBaseMonoHook?.Dispose(); + // NET8 CHORE + // this.assemblyLocationMonoHook?.Dispose(); + // this.assemblyCodeBaseMonoHook?.Dispose(); } /// @@ -804,7 +806,8 @@ internal partial class PluginManager : IDisposable, IServiceType this.installedPluginsList.Remove(plugin); } - PluginLocations.Remove(plugin.AssemblyName?.FullName ?? string.Empty, out _); + // NET8 CHORE + // PluginLocations.Remove(plugin.AssemblyName?.FullName ?? string.Empty, out _); this.NotifyinstalledPluginsListChanged(); this.NotifyAvailablePluginsChanged(); @@ -1443,7 +1446,8 @@ internal partial class PluginManager : IDisposable, IServiceType } catch (InvalidPluginException) { - PluginLocations.Remove(plugin.AssemblyName?.FullName ?? string.Empty, out _); + // NET8 CHORE + // PluginLocations.Remove(plugin.AssemblyName?.FullName ?? string.Empty, out _); throw; } catch (BannedPluginException) @@ -1489,7 +1493,8 @@ internal partial class PluginManager : IDisposable, IServiceType } else { - PluginLocations.Remove(plugin.AssemblyName?.FullName ?? string.Empty, out _); + // NET8 CHORE + // PluginLocations.Remove(plugin.AssemblyName?.FullName ?? string.Empty, out _); throw; } } @@ -1580,6 +1585,8 @@ internal partial class PluginManager : IDisposable, IServiceType } } +// NET8 CHORE +/* /// /// Class responsible for loading and unloading plugins. /// This contains the assembly patching functionality to resolve assembly locations. @@ -1687,3 +1694,4 @@ internal partial class PluginManager this.assemblyCodeBaseMonoHook = new MonoMod.RuntimeDetour.Hook(codebaseTarget, codebasePatch); } } +*/ diff --git a/Dalamud/Plugin/Internal/Types/LocalPlugin.cs b/Dalamud/Plugin/Internal/Types/LocalPlugin.cs index 5d132fd9c..81903d970 100644 --- a/Dalamud/Plugin/Internal/Types/LocalPlugin.cs +++ b/Dalamud/Plugin/Internal/Types/LocalPlugin.cs @@ -408,7 +408,8 @@ internal class LocalPlugin : IDisposable } // Update the location for the Location and CodeBase patches - PluginManager.PluginLocations[this.pluginType.Assembly.FullName] = new PluginPatchData(this.DllFile); + // NET8 CHORE + // PluginManager.PluginLocations[this.pluginType.Assembly.FullName] = new PluginPatchData(this.DllFile); this.DalamudInterface = new DalamudPluginInterface(this, reason);