Update

BUTR · Apr 6, 2024 · 8e362c1 · 8e362c1
1 parent a9acf96
commit 8e362c1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 21 deletions.
diff --git a/src/BUTR.Site.NexusMods.Client/BUTR.Site.NexusMods.Client.csproj b/src/BUTR.Site.NexusMods.Client/BUTR.Site.NexusMods.Client.csproj
@@ -26,15 +26,16 @@
     <PackageReference Include="Blazorise.QRCode" Version="1.5.1" />
     <PackageReference Include="Blazorise.Snackbar" Version="1.5.1" />
     <PackageReference Include="Blazorise.TreeView" Version="1.5.1" />
-    <PackageReference Include="BUTR.CrashReport.Models" Version="13.0.0.49" />
-    <PackageReference Include="BUTR.CrashReport.Bannerlord.Parser" Version="13.0.0.49" />
-    <PackageReference Include="CsvHelper" Version="31.0.2" />
+    <PackageReference Include="BUTR.CrashReport.Models" Version="13.0.0.61" />
+    <PackageReference Include="BUTR.CrashReport.Bannerlord.Parser" Version="13.0.0.61" />
+    <PackageReference Include="CsvHelper" Version="31.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.3" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.3" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
     <PackageReference Include="Mono.Cecil" Version="0.11.5" />
+    <PackageReference Include="Octokit" Version="10.0.0" />
     <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
     <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
   </ItemGroup>

diff --git a/src/BUTR.Site.NexusMods.Server/BUTR.Site.NexusMods.Server.csproj b/src/BUTR.Site.NexusMods.Server/BUTR.Site.NexusMods.Server.csproj
@@ -19,11 +19,11 @@
     <PackageReference Include="AsmResolver.DotNet" Version="5.5.1" />
     <PackageReference Include="Bannerlord.ModuleManager" Version="5.0.221" />
     <PackageReference Include="BUTR.Authentication.NexusMods" Version="1.0.0.6" />
-    <PackageReference Include="BUTR.CrashReport.Models" Version="13.0.0.49" />
-    <PackageReference Include="BUTR.CrashReport.Bannerlord.Parser" Version="13.0.0.49" />
+    <PackageReference Include="BUTR.CrashReport.Models" Version="13.0.0.61" />
+    <PackageReference Include="BUTR.CrashReport.Bannerlord.Parser" Version="13.0.0.61" />
     <PackageReference Include="Community.Microsoft.Extensions.Caching.PostgreSql" Version="4.0.4" />
-    <PackageReference Include="CsvHelper" Version="31.0.2" />
-    <PackageReference Include="ICSharpCode.Decompiler" Version="8.2.0.7535" />
+    <PackageReference Include="CsvHelper" Version="31.0.3" />
+    <PackageReference Include="ICSharpCode.Decompiler" Version="9.0.0.7618-preview1" />
     <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
@@ -36,16 +36,16 @@
     <PackageReference Include="Npgsql" Version="8.0.2" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
     <PackageReference Include="Npgsql.OpenTelemetry" Version="8.0.2" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.0-beta.1" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.0-beta.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.10" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.7.0-beta.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.4" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Quartz" Version="1.0.0-beta.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
-    <PackageReference Include="OpenTelemetry.ResourceDetectors.Container" Version="1.0.0-beta.6" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.0" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.11" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.8.0-beta.1" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.5" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Quartz" Version="1.0.0-beta.2" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
+    <PackageReference Include="OpenTelemetry.ResourceDetectors.Container" Version="1.0.0-beta.7" />
     <PackageReference Include="Polly" Version="8.3.1" />
     <PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
     <PackageReference Include="Quartz" Version="3.8.1" />

diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Reflection/CSharpILMixedLanguage.cs b/src/BUTR.Site.NexusMods.Server/Utils/Reflection/CSharpILMixedLanguage.cs
@@ -42,7 +42,7 @@ public static ReflectionDisassembler CreateDisassembler(ITextOutput output, Canc
         };
     }
 
-    private static CSharpDecompiler CreateDecompiler(PEFile module, DecompilerSettings settings, CancellationToken ct)
+    private static CSharpDecompiler CreateDecompiler(MetadataFile module, DecompilerSettings settings, CancellationToken ct)
     {
         var resolver = new UniversalAssemblyResolver(module.Name, false, module.DetectTargetFrameworkId(), module.DetectRuntimePack(), PEStreamOptions.Default, MetadataReaderOptions.None);
         return new CSharpDecompiler(module, resolver, settings) { CancellationToken = ct };
@@ -75,7 +75,7 @@ public MixedMethodBodyDisassembler(ITextOutput output, CancellationToken ct) : b
             _cancellationToken = ct;
         }
 
-        public override void Disassemble(PEFile module, MethodDefinitionHandle handle)
+        public override void Disassemble(MetadataFile module, MethodDefinitionHandle handle)
         {
             try
             {
@@ -117,7 +117,7 @@ private void IndexStringBuilder()
         }
 
         // Is called within base.Disassemble
-        protected override void WriteInstruction(ITextOutput output, MetadataReader metadata, MethodDefinitionHandle methodHandle, ref BlobReader blob, int methodRva)
+        protected override void WriteInstruction(ITextOutput output, MetadataFile metadata, MethodDefinitionHandle methodHandle, ref BlobReader blob, int methodRva)
         {
             if (output is not PlainTextOutput2 plainTextOutput2) return;
             if (_stringBuilder is null || _stringBuilderLinesIndices is null) return;

diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Reflection/PlainTextOutput2.cs b/src/BUTR.Site.NexusMods.Server/Utils/Reflection/PlainTextOutput2.cs
@@ -109,7 +109,7 @@ public void WriteReference(OpCodeInfo opCode, bool omitSuffix = false)
         }
     }
 
-    public void WriteReference(PEFile module, Handle handle, string text, string protocol = "decompile", bool isDefinition = false)
+    public void WriteReference(MetadataFile module, Handle handle, string text, string protocol = "decompile", bool isDefinition = false)
     {
         Write(text);
     }