From d25ab69793240fe09fecbad97eb3608cb445ce87 Mon Sep 17 00:00:00 2001
From: Ryodo Tanaka <ryodo.tanaka@oedodynamics.co.jp>
Date: Sat, 10 May 2025 17:58:06 +0900
Subject: [PATCH 1/2] Patch for Map Field works with Protobuf 30.2

---
 .../Google.Protobuf/Collections/MapField.cs    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Runtime/Google.Protobuf/Collections/MapField.cs b/Runtime/Google.Protobuf/Collections/MapField.cs
index ac008ef..e8f5243 100644
--- a/Runtime/Google.Protobuf/Collections/MapField.cs
+++ b/Runtime/Google.Protobuf/Collections/MapField.cs
@@ -81,6 +81,24 @@ public sealed class MapField<TKey, TValue> : IDeepCloneable<MapField<TKey, TValu
             new Dictionary<TKey, LinkedListNode<KeyValuePair<TKey, TValue>>>(KeyEqualityComparer);
         private readonly LinkedList<KeyValuePair<TKey, TValue>> list = new LinkedList<KeyValuePair<TKey, TValue>>();
 
+        /// <summary>
+        /// Merges entries from another <see cref="MapField{TKey, TValue}"/> into this instance.
+        /// </summary>
+        /// <param name="other">
+        /// The <see cref="MapField{TKey, TValue}"/> whose entries will be merged.
+        /// </param>
+        public void MergeFrom(MapField<TKey, TValue> other)
+        {
+            // Reuse the IDictionary<TKey, TValue> MergeFrom implementation
+            MergeFrom((System.Collections.Generic.IDictionary<TKey, TValue>)other);
+        }
+
+        public void MergeFrom(MapField<TKey, TValue> other)
+        {
+            // IDictionary<TKey,TValue> 用の MergeFrom を再利用
+            MergeFrom((System.Collections.Generic.IDictionary<TKey, TValue>)other);
+        }
+
         /// <summary>
         /// Creates a deep clone of this object.
         /// </summary>

From 2a90008d241ccb59fe0380e5f5a3fc0a4899369b Mon Sep 17 00:00:00 2001
From: Ryodo Tanaka <ryodo.tanaka@oedodynamics.co.jp>
Date: Sun, 11 May 2025 11:36:31 +0900
Subject: [PATCH 2/2] Fix compile error

---
 .../Google.Protobuf/Collections/MapField.cs   | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/Runtime/Google.Protobuf/Collections/MapField.cs b/Runtime/Google.Protobuf/Collections/MapField.cs
index e8f5243..d4d3cdf 100644
--- a/Runtime/Google.Protobuf/Collections/MapField.cs
+++ b/Runtime/Google.Protobuf/Collections/MapField.cs
@@ -82,23 +82,31 @@ public sealed class MapField<TKey, TValue> : IDeepCloneable<MapField<TKey, TValu
         private readonly LinkedList<KeyValuePair<TKey, TValue>> list = new LinkedList<KeyValuePair<TKey, TValue>>();
 
         /// <summary>
-        /// Merges entries from another <see cref="MapField{TKey, TValue}"/> into this instance.
+        /// Merges entries from an <see cref="IDictionary{TKey, TValue}"/> into this instance.
         /// </summary>
         /// <param name="other">
-        /// The <see cref="MapField{TKey, TValue}"/> whose entries will be merged.
+        /// The dictionary whose entries will be merged into this map.
         /// </param>
-        public void MergeFrom(MapField<TKey, TValue> other)
+        public void MergeFrom(IDictionary<TKey, TValue> other)
         {
-            // Reuse the IDictionary<TKey, TValue> MergeFrom implementation
-            MergeFrom((System.Collections.Generic.IDictionary<TKey, TValue>)other);
+            foreach (var kv in other)
+            {
+                this[kv.Key] = kv.Value;
+            }
         }
 
+        /// <summary>
+        /// Merges entries from another <see cref="MapField{TKey, TValue}"/> into this instance.
+        /// </summary>
+        /// <param name="other">
+        /// The <see cref="MapField{TKey, TValue}"/> whose entries will be merged.
+        /// </param>
         public void MergeFrom(MapField<TKey, TValue> other)
         {
-            // IDictionary<TKey,TValue> 用の MergeFrom を再利用
-            MergeFrom((System.Collections.Generic.IDictionary<TKey, TValue>)other);
+            // Reuse the IDictionary<TKey, TValue> MergeFrom implementation
+            MergeFrom((IDictionary<TKey, TValue>)other);
         }
-
+        
         /// <summary>
         /// Creates a deep clone of this object.
         /// </summary>