From 6df686b5ab18d2fa320b383ed9eeaabd6b252f74 Mon Sep 17 00:00:00 2001
From: Vitalii Mikhailov <personal@aragas.org>
Date: Mon, 8 Jul 2024 23:44:55 +0300
Subject: [PATCH] Updated deps

---
 .../BUTR.CrashReport.Bannerlord.Parser.csproj    |  8 ++++----
 .../BUTR.CrashReport.Bannerlord.Source.csproj    |  6 +++---
 .../CrashReportCreatorHelper.cs                  |  2 +-
 .../ModuleInfo.cs                                |  4 ++--
 .../BUTR.CrashReport.BepInEx5.Source.csproj      |  2 +-
 .../BUTR.CrashReport.BepInEx6.Source.csproj      |  2 +-
 .../BUTR.CrashReport.Decompilers.csproj          |  4 ++--
 .../Utils/MethodCopier.cs                        |  3 +--
 .../BUTR.CrashReport.Renderer.Html.csproj        |  1 -
 .../BUTR.CrashReport.Renderer.ImGui.csproj       | 16 ++++++++--------
 .../CrashReportImGui.cs                          |  8 ++++----
 src/BUTR.CrashReport/BUTR.CrashReport.csproj     |  4 ++--
 12 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/src/BUTR.CrashReport.Bannerlord.Parser/BUTR.CrashReport.Bannerlord.Parser.csproj b/src/BUTR.CrashReport.Bannerlord.Parser/BUTR.CrashReport.Bannerlord.Parser.csproj
index bc10e09..f77b8e8 100644
--- a/src/BUTR.CrashReport.Bannerlord.Parser/BUTR.CrashReport.Bannerlord.Parser.csproj
+++ b/src/BUTR.CrashReport.Bannerlord.Parser/BUTR.CrashReport.Bannerlord.Parser.csproj
@@ -16,8 +16,8 @@
     <ILRepackCopyAttributes>false</ILRepackCopyAttributes>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ILRepack" Version="2.0.30" PrivateAssets="all" />
-    <PackageReference Include="ILRepack.FullAuto" Version="1.5.0" PrivateAssets="all" />
+    <PackageReference Include="ILRepack" Version="2.0.34" PrivateAssets="all" />
+    <PackageReference Include="ILRepack.FullAuto" Version="1.6.0" PrivateAssets="all" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -30,8 +30,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.60" />
-    <PackageReference Include="Polyfill" Version="4.3.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.61" />
+    <PackageReference Include="Polyfill" Version="5.6.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
     <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
     <PackageReference Include="System.Memory" Version="4.5.5" />
   </ItemGroup>
diff --git a/src/BUTR.CrashReport.Bannerlord.Source/BUTR.CrashReport.Bannerlord.Source.csproj b/src/BUTR.CrashReport.Bannerlord.Source/BUTR.CrashReport.Bannerlord.Source.csproj
index 772c27d..4768c3a 100644
--- a/src/BUTR.CrashReport.Bannerlord.Source/BUTR.CrashReport.Bannerlord.Source.csproj
+++ b/src/BUTR.CrashReport.Bannerlord.Source/BUTR.CrashReport.Bannerlord.Source.csproj
@@ -42,7 +42,7 @@
     <PackageFile Include="BUTR.CrashReport.Models" Version="$(Version)" PackFolder="Dependency" Visible="false" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NuGetizer" Version="1.2.1" Pack="false" />
+    <PackageReference Include="NuGetizer" Version="0.9.2" Pack="false" />
   </ItemGroup>
   <!--NuGetizer-->
 
@@ -53,8 +53,8 @@
 
   <ItemGroup>
     <PackageReference Include="Bannerlord.ReferenceAssemblies.Core" Version="1.0.0.*-*" Pack="false" PrivateAssets="all" />
-    <PackageReference Include="Bannerlord.ModuleManager.Source" Version="5.0.221" Pack="true" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
-    <PackageReference Include="Bannerlord.BUTR.Shared" Version="3.0.0.138" Pack="true" />
+    <PackageReference Include="Bannerlord.ModuleManager.Source" Version="5.0.226" Pack="true" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
+    <PackageReference Include="Bannerlord.BUTR.Shared" Version="3.0.0.142" Pack="true" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/BUTR.CrashReport.Bannerlord.Source/CrashReportCreatorHelper.cs b/src/BUTR.CrashReport.Bannerlord.Source/CrashReportCreatorHelper.cs
index 9e7f479..ba784ae 100644
--- a/src/BUTR.CrashReport.Bannerlord.Source/CrashReportCreatorHelper.cs
+++ b/src/BUTR.CrashReport.Bannerlord.Source/CrashReportCreatorHelper.cs
@@ -231,7 +231,7 @@ public virtual bool TryHandlePath(string path, out string anonymizedPath)
             return false;
         }
 
-        protected static ModuleModel Convert(ModuleInfoExtendedWithMetadata module, bool isManagedByVortex, ICollection<AssemblyModel> assemblies)
+        protected static ModuleModel Convert(ModuleInfoExtendedHelper module, bool isManagedByVortex, ICollection<AssemblyModel> assemblies)
         {
             var updateInfos = module.UpdateInfo.Split(';').Select(x => x.Split(':') is { Length: 2 } split
                 ? new UpdateInfoModuleOrLoaderPlugin()
diff --git a/src/BUTR.CrashReport.Bannerlord.Source/ModuleInfo.cs b/src/BUTR.CrashReport.Bannerlord.Source/ModuleInfo.cs
index 1b455a8..156e48b 100644
--- a/src/BUTR.CrashReport.Bannerlord.Source/ModuleInfo.cs
+++ b/src/BUTR.CrashReport.Bannerlord.Source/ModuleInfo.cs
@@ -53,7 +53,7 @@ namespace BUTR.CrashReport.Bannerlord
 
     internal class ModuleInfo : IModuleInfo
     {
-        public ModuleInfoExtendedWithMetadata InternalModuleInfo { get; }
+        public ModuleInfoExtendedHelper InternalModuleInfo { get; }
 
         public string Id => InternalModuleInfo.Id;
         public string Version => InternalModuleInfo.Version.ToString();
@@ -61,7 +61,7 @@ internal class ModuleInfo : IModuleInfo
 
         public IEnumerable<IModuleSubModuleInfo> SubModules => InternalModuleInfo.SubModules.Select(x => new ModuleSubModuleInfo(x));
 
-        public ModuleInfo(ModuleInfoExtendedWithMetadata internalModuleInfo) => InternalModuleInfo = internalModuleInfo;
+        public ModuleInfo(ModuleInfoExtendedHelper internalModuleInfo) => InternalModuleInfo = internalModuleInfo;
     }
 }
 
diff --git a/src/BUTR.CrashReport.BepInEx5.Source/BUTR.CrashReport.BepInEx5.Source.csproj b/src/BUTR.CrashReport.BepInEx5.Source/BUTR.CrashReport.BepInEx5.Source.csproj
index 4acd785..5c1461c 100644
--- a/src/BUTR.CrashReport.BepInEx5.Source/BUTR.CrashReport.BepInEx5.Source.csproj
+++ b/src/BUTR.CrashReport.BepInEx5.Source/BUTR.CrashReport.BepInEx5.Source.csproj
@@ -40,7 +40,7 @@
     <PackageFile Include="BUTR.CrashReport.Models" Version="$(Version)" PackFolder="Dependency" Visible="false" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NuGetizer" Version="1.2.1" Pack="false" />
+    <PackageReference Include="NuGetizer" Version="0.9.2" Pack="false" />
   </ItemGroup>
   <!--NuGetizer-->
   
diff --git a/src/BUTR.CrashReport.BepInEx6.Source/BUTR.CrashReport.BepInEx6.Source.csproj b/src/BUTR.CrashReport.BepInEx6.Source/BUTR.CrashReport.BepInEx6.Source.csproj
index 57f3c5c..42955cd 100644
--- a/src/BUTR.CrashReport.BepInEx6.Source/BUTR.CrashReport.BepInEx6.Source.csproj
+++ b/src/BUTR.CrashReport.BepInEx6.Source/BUTR.CrashReport.BepInEx6.Source.csproj
@@ -40,7 +40,7 @@
     <PackageFile Include="BUTR.CrashReport.Models" Version="$(Version)" PackFolder="Dependency" Visible="false" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NuGetizer" Version="1.2.1" Pack="false" />
+    <PackageReference Include="NuGetizer" Version="0.9.2" Pack="false" />
   </ItemGroup>
   <!--NuGetizer-->
   
diff --git a/src/BUTR.CrashReport.Decompilers/BUTR.CrashReport.Decompilers.csproj b/src/BUTR.CrashReport.Decompilers/BUTR.CrashReport.Decompilers.csproj
index 3ac83c8..4528440 100644
--- a/src/BUTR.CrashReport.Decompilers/BUTR.CrashReport.Decompilers.csproj
+++ b/src/BUTR.CrashReport.Decompilers/BUTR.CrashReport.Decompilers.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Iced" Version="1.21.0" Alias="iced" Private="false" />
-    <PackageReference Include="AsmResolver.DotNet.Dynamic" Version="5.5.1" />
+    <PackageReference Include="AsmResolver.DotNet.Dynamic" Version="6.0.0-beta.1" />
     <PackageReference Include="ICSharpCode.Decompiler" Version="9.0.0.7618-preview1" />
   </ItemGroup>
 
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Polyfill" Version="4.3.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
+    <PackageReference Include="Polyfill" Version="5.6.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
   </ItemGroup>
 
   <!-- We need them for documentation -->
diff --git a/src/BUTR.CrashReport.Decompilers/Utils/MethodCopier.cs b/src/BUTR.CrashReport.Decompilers/Utils/MethodCopier.cs
index ae74900..dc6b8e6 100644
--- a/src/BUTR.CrashReport.Decompilers/Utils/MethodCopier.cs
+++ b/src/BUTR.CrashReport.Decompilers/Utils/MethodCopier.cs
@@ -6,8 +6,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
-
-using TypeAttributes = AsmResolver.PE.DotNet.Metadata.Tables.Rows.TypeAttributes;
+using TypeAttributes = AsmResolver.PE.DotNet.Metadata.Tables.TypeAttributes;
 
 namespace BUTR.CrashReport.Decompilers.Utils;
 
diff --git a/src/BUTR.CrashReport.Renderer.Html/BUTR.CrashReport.Renderer.Html.csproj b/src/BUTR.CrashReport.Renderer.Html/BUTR.CrashReport.Renderer.Html.csproj
index 0d8c39b..aa4ccc4 100644
--- a/src/BUTR.CrashReport.Renderer.Html/BUTR.CrashReport.Renderer.Html.csproj
+++ b/src/BUTR.CrashReport.Renderer.Html/BUTR.CrashReport.Renderer.Html.csproj
@@ -16,7 +16,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- The game did a ninja update from 11 to 13. We use the newer version and will ship it for 1.0.0 and 1.0.1 -->
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" PrivateAssets="all" IncludeAssets="compile" />
 
     <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
diff --git a/src/BUTR.CrashReport.Renderer.ImGui/BUTR.CrashReport.Renderer.ImGui.csproj b/src/BUTR.CrashReport.Renderer.ImGui/BUTR.CrashReport.Renderer.ImGui.csproj
index 33be88f..48e9600 100644
--- a/src/BUTR.CrashReport.Renderer.ImGui/BUTR.CrashReport.Renderer.ImGui.csproj
+++ b/src/BUTR.CrashReport.Renderer.ImGui/BUTR.CrashReport.Renderer.ImGui.csproj
@@ -15,8 +15,8 @@
     <ILRepackCopyAttributes>false</ILRepackCopyAttributes>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ILRepack" Version="2.0.30" PrivateAssets="all" />
-    <PackageReference Include="ILRepack.FullAuto" Version="1.5.0" PrivateAssets="all" />
+    <PackageReference Include="ILRepack" Version="2.0.34" PrivateAssets="all" />
+    <PackageReference Include="ILRepack.FullAuto" Version="1.6.0" PrivateAssets="all" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -30,16 +30,16 @@
 
   <ItemGroup>
     <PackageReference Include="HonkPerf.NET.RefLinq" Version="1.0.0" PrivateAssets="all" />
-    <PackageReference Include="ImGui.NET" Version="1.90.1.1" PrivateAssets="all" GeneratePathProperty="true" />
-    <PackageReference Include="Silk.NET.GLFW" Version="2.20.0" PrivateAssets="all" />
-    <PackageReference Include="Silk.NET.Input.Glfw" Version="2.20.0" PrivateAssets="all" />
-    <PackageReference Include="Silk.NET.Windowing.Glfw" Version="2.20.0" PrivateAssets="all" />
-    <PackageReference Include="Silk.NET.OpenGL" Version="2.20.0" PrivateAssets="all" />
+    <PackageReference Include="ImGui.NET" Version="1.90.9.1" PrivateAssets="all" GeneratePathProperty="true" />
+    <PackageReference Include="Silk.NET.GLFW" Version="2.21.0" PrivateAssets="all" />
+    <PackageReference Include="Silk.NET.Input.Glfw" Version="2.21.0" PrivateAssets="all" />
+    <PackageReference Include="Silk.NET.Windowing.Glfw" Version="2.21.0" PrivateAssets="all" />
+    <PackageReference Include="Silk.NET.OpenGL" Version="2.21.0" PrivateAssets="all" />
     <PackageReference Include="System.Collections.Immutable" Version="8.0.0" PrivateAssets="all" />
     <PackageReference Include="System.Memory" Version="4.5.5" PrivateAssets="all" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" PrivateAssets="all" />
     <PackageReference Include="SkipLocalsInit" Version="1.1.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
-    <PackageReference Include="Ultz.Native.GLFW" Version="3.3.9.2" PrivateAssets="all" GeneratePathProperty="true" />
+    <PackageReference Include="Ultz.Native.GLFW" Version="3.4.0" PrivateAssets="all" GeneratePathProperty="true" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/BUTR.CrashReport.Renderer.ImGui/CrashReportImGui.cs b/src/BUTR.CrashReport.Renderer.ImGui/CrashReportImGui.cs
index 320acf6..9c86239 100644
--- a/src/BUTR.CrashReport.Renderer.ImGui/CrashReportImGui.cs
+++ b/src/BUTR.CrashReport.Renderer.ImGui/CrashReportImGui.cs
@@ -55,7 +55,7 @@ public static void ShowAndWait(CrashReportModel crashReportModel, IList<LogSourc
             VSync = true,
         });
 
-        var gl = default(GL)!;
+        var gl = default(GL)!; // Disposed in Controller
         var controller = default(ImGuiController)!;
         var imGuiRenderer = default(ImGuiRenderer)!;
 
@@ -63,10 +63,10 @@ public static void ShowAndWait(CrashReportModel crashReportModel, IList<LogSourc
         {
             window.SetDefaultIcon();
 
-            var imgui = new CmGui();
-            var inputContext = window.CreateInput();
+            var imgui = new CmGui(); // Disposed in Controller
+            var inputContext = window.CreateInput(); // Disposed in Controller
 
-            gl = window.CreateOpenGL();
+            gl = window.CreateOpenGL(); // Disposed in Controller
             controller = new ImGuiController(imgui, gl, window, inputContext);
             imGuiRenderer = new ImGuiRenderer(imgui, crashReportModel, logSources, crashReportRendererUtilities, window.Close);
 
diff --git a/src/BUTR.CrashReport/BUTR.CrashReport.csproj b/src/BUTR.CrashReport/BUTR.CrashReport.csproj
index 5c75114..181b2d3 100644
--- a/src/BUTR.CrashReport/BUTR.CrashReport.csproj
+++ b/src/BUTR.CrashReport/BUTR.CrashReport.csproj
@@ -16,8 +16,8 @@
     <ILRepackCopyAttributes>false</ILRepackCopyAttributes>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ILRepack" Version="2.0.30" PrivateAssets="all" />
-    <PackageReference Include="ILRepack.FullAuto" Version="1.5.0" PrivateAssets="all" />
+    <PackageReference Include="ILRepack" Version="2.0.34" PrivateAssets="all" />
+    <PackageReference Include="ILRepack.FullAuto" Version="1.6.0" PrivateAssets="all" />
   </ItemGroup>
 
   <PropertyGroup>