From 70d0ecbb16a26e5949ba5e37d15a899772b3c4e2 Mon Sep 17 00:00:00 2001 From: Raul Santos Date: Wed, 25 Jun 2025 21:41:29 +0200 Subject: [PATCH] [.NET] Avoid exporting to duplicate architectures Use a `HashSet` to avoid adding duplicate architectures on exporting. It seems we were adding `x86_64` and `arm64` twice to macOS exports because they are also included in the features. --- .../editor/GodotTools/GodotTools/Export/ExportPlugin.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs b/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs index ae5a1421829..d1978bd0fc6 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs @@ -191,7 +191,7 @@ namespace GodotTools.Export BuildConfig = isDebug ? "ExportDebug" : "ExportRelease", IncludeDebugSymbols = (bool)GetOption("dotnet/include_debug_symbols"), RidOS = DetermineRuntimeIdentifierOS(platform, useAndroidLinuxBionic), - Archs = new List(), + Archs = [], UseTempDir = platform != OS.Platforms.iOS, // xcode project links directly to files in the publish dir, so use one that sticks around. BundleOutputs = true, }; @@ -232,7 +232,7 @@ namespace GodotTools.Export targets.Add(new PublishConfig { BuildConfig = publishConfig.BuildConfig, - Archs = new List { "arm64", "x86_64" }, + Archs = ["arm64", "x86_64"], BundleOutputs = false, IncludeDebugSymbols = publishConfig.IncludeDebugSymbols, RidOS = OS.DotNetOS.iOSSimulator, @@ -555,7 +555,7 @@ namespace GodotTools.Export public bool UseTempDir; public bool BundleOutputs; public string RidOS; - public List Archs; + public HashSet Archs; public string BuildConfig; public bool IncludeDebugSymbols; }