Skip to content

Commit

Permalink
Updated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@Aragas
Aragas committed Apr 4, 2024
1 parent bc47fae commit 67e8587
Show file tree
Hide file tree
Showing 13 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions src/BUTR.CrashReport.Bannerlord.Parser/BUTR.CrashReport.Bannerlord.Parser.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="HtmlAgilityPack" Version="1.11.56" />
<PackageReference Include="Polyfill" Version="1.34.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<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="System.Collections.Immutable" Version="8.0.0" />
<PackageReference Include="System.Memory" Version="4.5.5" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/BUTR.CrashReport.Decompilers/BUTR.CrashReport.Decompilers.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Iced" Version="1.20.0" Alias="iced" Private="false" />
<PackageReference Include="AsmResolver.DotNet.Dynamic" Version="5.5.0" />
<PackageReference Include="ICSharpCode.Decompiler" Version="8.2.0.7535" />
<PackageReference Include="Iced" Version="1.21.0" Alias="iced" Private="false" />
<PackageReference Include="AsmResolver.DotNet.Dynamic" Version="5.5.1" />
<PackageReference Include="ICSharpCode.Decompiler" Version="9.0.0.7618-preview1" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Harmony.Extensions" Version="3.2.0.77" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Polyfill" Version="1.34.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<PackageReference Include="Polyfill" Version="4.3.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
</ItemGroup>

<!-- We need them for documentation -->
Expand Down
8 changes: 4 additions & 4 deletions src/BUTR.CrashReport.Decompilers/ILSpy/CSharpILMixedLanguage.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,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(null, false, module.DetectTargetFrameworkId(), module.DetectRuntimePack());
return new CSharpDecompiler(module, resolver, settings) { CancellationToken = ct };
Expand Down Expand Up @@ -72,7 +72,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
{
Expand Down Expand Up @@ -114,7 +114,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 metadataFile, MethodDefinitionHandle methodHandle, ref BlobReader blob, int methodRva)
{
if (output is not PlainTextOutput2 plainTextOutput2) return;
if (_stringBuilder is null || _stringBuilderLinesIndices is null) return;
Expand Down Expand Up @@ -143,7 +143,7 @@ protected override void WriteInstruction(ITextOutput output, MetadataReader meta
}
}

base.WriteInstruction(plainTextOutput2, metadata, methodHandle, ref blob, methodRva);
base.WriteInstruction(plainTextOutput2, metadataFile, methodHandle, ref blob, methodRva);
}
}
}
6 changes: 3 additions & 3 deletions src/BUTR.CrashReport.Decompilers/ILSpy/CSharpLanguage.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ internal class CSharpLanguage : Language
{
private const int _transformCount = int.MaxValue;

public static CSharpDecompiler CreateDecompiler(PEFile module, DecompilerSettings settings, CancellationToken ct)
public static CSharpDecompiler CreateDecompiler(MetadataFile module, DecompilerSettings settings, CancellationToken ct)
{
var resolver = new UniversalAssemblyResolver(null, false, module.DetectTargetFrameworkId(), module.DetectRuntimePack());
var decompiler = new CSharpDecompiler(module, resolver, settings) { CancellationToken = ct };
Expand All @@ -39,10 +39,10 @@ private static void WriteCode(ITextOutput output, DecompilerSettings settings, S

public override void DecompileMethod(IMethod method, ITextOutput output, DecompilerSettings settings)
{
if (method.ParentModule?.PEFile is null)
if (method.ParentModule?.MetadataFile is null)
return;

var assembly = method.ParentModule.PEFile;
var assembly = method.ParentModule.MetadataFile;
var decompiler = CreateDecompiler(assembly, settings, CancellationToken.None);
WriteCommentLine(output, assembly.FullName);
WriteCommentLine(output, TypeToString(method.DeclaringType, includeNamespace: true));
Expand Down
2 changes: 1 addition & 1 deletion src/BUTR.CrashReport.Decompilers/ILSpy/PlainTextOutput2.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,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);
}
Expand Down
4 changes: 2 additions & 2 deletions src/BUTR.CrashReport.Decompilers/Utils/ReferenceImporter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public static Dictionary<AssemblyName, AssemblyTypeReferenceInternal[]> GetImpor
Trace.TraceError(e.ToString());
}
}

try
{
var assembly = AssemblyDefinition.FromFile(x.Value.Location);
Expand All @@ -80,7 +80,7 @@ public static Dictionary<AssemblyName, AssemblyTypeReferenceInternal[]> GetImpor
Trace.TraceError(x.Key.ToString());
Trace.TraceError(e.ToString());
}

return Array.Empty<AssemblyTypeReferenceInternal>();
});
}
2 changes: 1 addition & 1 deletion src/BUTR.CrashReport.Models/BUTR.CrashReport.Models.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<ItemGroup>
<!-- For importing the documentation -->
<PackageReference Include="AsmResolver.DotNet" Version="5.5.0" PrivateAssets="all" IncludeAssets="none" GeneratePathProperty="true" />
<PackageReference Include="AsmResolver.DotNet" Version="5.5.1" PrivateAssets="all" IncludeAssets="none" GeneratePathProperty="true" />
<Reference Include="$(PkgAsmResolver_DotNet)\lib\netstandard2.0\AsmResolver.DotNet.dll" Private="false" />

<PackageReference Include="Lib.Harmony.Ref" Version="*" PrivateAssets="all" IncludeAssets="none" GeneratePathProperty="true" />
Expand Down
2 changes: 1 addition & 1 deletion src/BUTR.CrashReport.Models/CapabilityModuleOrPluginModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public record CapabilityModuleOrPluginModel
/// The name of the capability.
/// </summary>
public string Name { get; }

/// <summary>
/// An optional description of the capability.
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion src/BUTR.CrashReport.Models/LoaderPluginModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public sealed record LoaderPluginModel
/// The capabilities, if there are any.
/// </summary>
public required IList<CapabilityModuleOrPluginModel> Capabilities { get; set; } = new List<CapabilityModuleOrPluginModel>();

/// <summary>
/// <inheritdoc cref="CrashReportModel.AdditionalMetadata"/>
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion src/BUTR.CrashReport.Models/ModuleModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public sealed record ModuleModel
/// The submodules of the module, if there are any.
/// </summary>
public required IList<ModuleSubModuleModel> SubModules { get; set; } = new List<ModuleSubModuleModel>();

/// <summary>
/// The capabilities, if there are any.
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion src/BUTR.CrashReport/Extensions/ModuleModelExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public static bool ContainsAssemblyReferences(this ModuleModel model, IEnumerabl
public static bool ContainsTypeReferences(this ModuleModel model, IEnumerable<AssemblyModel> assemblies, string[] typeReferences) => assemblies.Where(x => x.ModuleId == model.Id)
.SelectMany(x => x.ImportedTypeReferences)
.Any(x => typeReferences.Any(y => FileSystemName.MatchesSimpleExpression(y, x.FullName)));

/// <summary>
/// Gets whether the module contains an assembly reference.
/// </summary>
Expand Down
6 changes: 3 additions & 3 deletions src/BUTR.CrashReport/Models/HarmonyPatches.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ public record HarmonyPatches
/// <inheritdoc cref="HarmonyLib.Patches.Prefixes"/>
/// </summary>
public required IList<HarmonyPatch> Prefixes { get; set; }

/// <summary>
/// <inheritdoc cref="HarmonyLib.Patches.Postfixes"/>
/// </summary>
public required IList<HarmonyPatch> Postfixes { get; set; }

/// <summary>
/// <inheritdoc cref="HarmonyLib.Patches.Finalizers"/>
/// </summary>
public required IList<HarmonyPatch> Finalizers { get; set; }

/// <summary>
/// <inheritdoc cref="HarmonyLib.Patches.Transpilers"/>
/// </summary>
Expand Down
6 changes: 3 additions & 3 deletions src/BUTR.CrashReport/Utils/CrashReportUtils.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ public record StackframePatchData
/// <inheritdoc cref="EnhancedStacktraceFrameModel.OriginalMethod"/>
/// </summary>
public required MethodBase? Original { get; set; }

/// <summary>
/// <inheritdoc cref="EnhancedStacktraceFrameModel.ExecutingMethod"/>
/// </summary>
public required MethodInfo? Replacement { get; set; }

/// <summary>
/// <inheritdoc cref="EnhancedStacktraceFrameModel.PatchMethods"/>
/// </summary>
public required List<MethodEntry> Patches { get; set; }

/// <summary>
/// <inheritdoc cref="EnhancedStacktraceFrameModel.MethodFromStackframeIssue"/>
/// </summary>
Expand Down

0 comments on commit 67e8587

Please sign in to comment.