Update dependencies (#1518)

This commit is contained in:
2026-04-20 11:22:22 +02:00
parent abbf87184b
commit cdd620a786
4 changed files with 49 additions and 33 deletions
+2 -2
View File
@@ -8089,7 +8089,7 @@ public static unsafe partial class GWCA
public static partial class Urgoz
{
internal const int HoppingVampire = 3796;
internal const int Urgoz = 3805;
internal const int Urgoz_ = 3805;
public static partial class Deep
{
@@ -8223,7 +8223,7 @@ public static unsafe partial class GWCA
internal const int LockedChest = 8192; // this is actually ->ExtraType
internal const int MiniatureLegionnaire = 8035;
public static partial class Minipet
public static partial class Minipet_
{
internal const int MiniatureConfessorDorian = 8344;
internal const int MiniatureConfessorIsaiah = 8352;
@@ -44,7 +44,8 @@ internal sealed class TarGzExtractor(
// Use ReaderFactory which properly handles nested archives like .tar.gz
using var stream = File.OpenRead(sourceFile);
using var reader = ReaderFactory.OpenReader(stream, new ReaderOptions { ExtractFullPath = true, Overwrite = true });
using var reader = ReaderFactory.OpenReader(stream);
var extractionOptions = new ExtractionOptions { ExtractFullPath = true, Overwrite = true };
var processedEntries = 0;
@@ -68,7 +69,7 @@ internal sealed class TarGzExtractor(
progressTracker(0.5, entryKey);
// Extract the entry
reader.WriteEntryToDirectory(destinationDirectory);
reader.WriteEntryToDirectory(destinationDirectory, extractionOptions);
processedEntries++;
}
+20 -5
View File
@@ -500,7 +500,8 @@ public sealed class GenerateGWCABindings : IIncrementalGenerator
ConstantsNode node,
Dictionary<string, string> typeMap,
HashSet<string> namespaceClassNames,
int indent)
int indent,
string? emitNameOverride = null)
{
var pad = new string(' ', indent);
@@ -508,11 +509,13 @@ public sealed class GenerateGWCABindings : IIncrementalGenerator
if (!HasAnyContent(node))
return;
var emitName = emitNameOverride ?? SanitizeIdentifier(node.Name);
// Always emit a partial class wrapper — C# allows multiple partial
// declarations for the same nested class, so this merges cleanly
// with any class already emitted by the export tree.
sb.AppendLine();
sb.AppendLine($"{pad}public static partial class {SanitizeIdentifier(node.Name)}");
sb.AppendLine($"{pad}public static partial class {emitName}");
sb.AppendLine($"{pad}{{");
var innerIndent = indent + 4;
@@ -543,8 +546,12 @@ public sealed class GenerateGWCABindings : IIncrementalGenerator
foreach (var member in enumDef.Members)
{
var csType = MapCppTypeToCs(enumDef.UnderlyingType);
var memberName = SanitizeIdentifier(member.Name);
// CS0542: member names cannot be the same as their enclosing type
if (memberName == emitName)
memberName += "_";
var comment = member.Comment is not null ? $" // {member.Comment}" : "";
sb.AppendLine($"{innerPad}internal const {csType} {SanitizeIdentifier(member.Name)} = {member.Value};{comment}");
sb.AppendLine($"{innerPad}internal const {csType} {memberName} = {member.Value};{comment}");
}
}
}
@@ -554,8 +561,12 @@ public sealed class GenerateGWCABindings : IIncrementalGenerator
{
var csType = MapCppTypeToCs(field.CppType);
var value = field.Value;
var fieldName = SanitizeIdentifier(field.Name);
// CS0542: member names cannot be the same as their enclosing type
if (fieldName == emitName)
fieldName += "_";
var comment = field.Comment is not null ? $" // {field.Comment}" : "";
sb.AppendLine($"{innerPad}internal const {csType} {SanitizeIdentifier(field.Name)} = {value};{comment}");
sb.AppendLine($"{innerPad}internal const {csType} {fieldName} = {value};{comment}");
}
// Type aliases are now emitted to GuildWars namespace, not nested GWCA classes
@@ -567,7 +578,11 @@ public sealed class GenerateGWCABindings : IIncrementalGenerator
// Emit children
foreach (var child in node.Children.Values.OrderBy(c => c.Name, StringComparer.Ordinal))
{
EmitConstantsNode(sb, child, typeMap, namespaceClassNames, innerIndent);
// CS0542: nested class name cannot be the same as enclosing type
string? childNameOverride = null;
if (SanitizeIdentifier(child.Name) == emitName)
childNameOverride = SanitizeIdentifier(child.Name) + "_";
EmitConstantsNode(sb, child, typeMap, namespaceClassNames, innerIndent, childNameOverride);
}
sb.AppendLine($"{pad}}}");
+24 -24
View File
@@ -4,10 +4,10 @@
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="CommunityToolkit.Authentication.Msal" Version="7.1.4" />
<PackageVersion Include="coverlet.collector" Version="8.0.0" />
<PackageVersion Include="coverlet.collector" Version="10.0.0" />
<PackageVersion Include="DiffPlex" Version="1.9.0" />
<PackageVersion Include="Elastic.OpenTelemetry" Version="1.3.0" />
<PackageVersion Include="FluentAssertions" Version="8.8.0" />
<PackageVersion Include="FluentAssertions" Version="8.9.0" />
<PackageVersion Include="HtmlAgilityPack" Version="1.12.4" />
<PackageVersion Include="ini-parser-netstandard" Version="2.5.3" />
<PackageVersion Include="MegaApiClient" Version="1.10.5" />
@@ -15,29 +15,29 @@
<PackageVersion Include="MemoryPack.Generator" Version="1.21.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="10.0.3" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.3" />
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="10.0.6" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.6" />
<PackageVersion Include="Microsoft.Authentication.WebAssembly.Msal" Version="9.0.8" />
<PackageVersion Include="Microsoft.CorrelationVector" Version="1.0.42" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.6" />
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.6" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.6" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.6" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.6" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.14.0" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.14.0" />
<PackageVersion Include="Microsoft.Identity.Client" Version="4.82.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="Microsoft.Identity.Client" Version="4.83.3" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3912.50" />
<PackageVersion Include="MinHook.NET" Version="1.1.2" />
<PackageVersion Include="MSTest.TestAdapter" Version="4.1.0" />
<PackageVersion Include="MSTest.TestFramework" Version="4.1.0" />
<PackageVersion Include="MSTest.TestAdapter" Version="4.2.1" />
<PackageVersion Include="MSTest.TestFramework" Version="4.2.1" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
<PackageVersion Include="Net.Sdk.Web.Extensions" Version="0.8.13" />
<PackageVersion Include="Net.Sdk.Web.Extensions.SourceGenerators" Version="0.9.5" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.15.0" />
<PackageVersion Include="Net.Sdk.Web.Extensions.SourceGenerators" Version="0.9.6" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.15.2" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.0" />
<PackageVersion Include="PeNet" Version="6.0.0" />
@@ -53,17 +53,17 @@
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageVersion Include="SevenZipExtractor" Version="1.0.19" />
<PackageVersion Include="SharpCompress" Version="0.46.2" />
<PackageVersion Include="SharpCompress" Version="0.47.4" />
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.12" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.1.4" />
<PackageVersion Include="Swashbuckle.AspNetCore.Swagger" Version="10.1.4" />
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="10.1.4" />
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.4" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.1.7" />
<PackageVersion Include="Swashbuckle.AspNetCore.Swagger" Version="10.1.7" />
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="10.1.7" />
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.7" />
<PackageVersion Include="Sybil" Version="0.8.4" />
<PackageVersion Include="System.IO.Compression" Version="4.3.0" />
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="10.0.3" />
<PackageVersion Include="System.Drawing.Common" Version="10.0.3" />
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="10.0.3" />
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="10.0.6" />
<PackageVersion Include="System.Drawing.Common" Version="10.0.6" />
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="10.0.6" />
<PackageVersion Include="System.Linq.Async" Version="6.0.3" />
<PackageVersion Include="System.Reflection.Metadata" Version="9.0.10" />
<PackageVersion Include="System.Text.Json" Version="9.0.10" />
@@ -73,6 +73,6 @@
<PackageVersion Include="SystemExtensions.NetStandard.Generators" Version="0.1.7" />
<PackageVersion Include="TrailBlazr" Version="0.3.1" />
<PackageVersion Include="zgabi.ManagedXZ" Version="1.0.2" />
<PackageVersion Include="ZLinq" Version="1.5.5" />
<PackageVersion Include="ZLinq" Version="1.5.6" />
</ItemGroup>
</Project>