Skip MapImages folder in packaging (#38928)

diff --git a/Content.Packaging/ClientPackaging.cs b/Content.Packaging/ClientPackaging.cs
index 6d0a46279076d414f811f9cdf1808af37a850220..21215d3bcbfc72c3a3c65571799f9ad052b4b4cd 100644 (file)
--- a/Content.Packaging/ClientPackaging.cs
+++ b/Content.Packaging/ClientPackaging.cs
@@ -78,7 +78,11 @@ public static class ClientPackaging
             new[] { "Content.Client", "Content.Shared", "Content.Shared.Database" },
             cancel: cancel);
 
-        await RobustClientPackaging.WriteClientResources(contentDir, inputPass, cancel);
+        await RobustClientPackaging.WriteClientResources(
+            contentDir,
+            inputPass,
+            SharedPackaging.AdditionalIgnoredResources,
+            cancel);
 
         inputPass.InjectFinished();
     }

diff --git a/Content.Packaging/ServerPackaging.cs b/Content.Packaging/ServerPackaging.cs
index a14a22ddeec275916a1598d9209ccddf48eedc8a..a15dc7244f6afa4f4da6750b7dffaf7d52ce6e4c 100644 (file)
--- a/Content.Packaging/ServerPackaging.cs
+++ b/Content.Packaging/ServerPackaging.cs
@@ -217,7 +217,11 @@ public static class ServerPackaging
             contentAssemblies,
             cancel: cancel);
 
-        await RobustServerPackaging.WriteServerResources(contentDir, inputPassResources, ServerContentIgnoresResources, cancel);
+        await RobustServerPackaging.WriteServerResources(
+            contentDir,
+            inputPassResources,
+            ServerContentIgnoresResources.Concat(SharedPackaging.AdditionalIgnoredResources).ToHashSet(),
+            cancel);
 
         if (hybridAcz)
         {

diff --git a/Content.Packaging/SharedPackaging.cs b/Content.Packaging/SharedPackaging.cs
new file mode 100644 (file)
index 0000000..5888845
--- /dev/null
+++ b/Content.Packaging/SharedPackaging.cs
@@ -0,0 +1,10 @@
+namespace Content.Packaging;
+
+public sealed class SharedPackaging
+{
+    public static readonly IReadOnlySet<string> AdditionalIgnoredResources = new HashSet<string>
+    {
+        // MapRenderer outputs into Resources. Avoid these getting included in packaging.
+        "MapImages",
+    };
+}