Merge branch 'develop-2.0.0' into fix/networktransform-fails-to-sync-multiple-state-updates

Author: NoelStephensUnity

Tools/CI/NGO.Cookbook.csproj

@@ -9,7 +9,7 @@
 
     <ItemGroup>
         <PackageReference Include="RecipeEngine" Version="7.0.0" />
-        <PackageReference Include="RecipeEngine.Api" Version="10.1.0" />
+        <PackageReference Include="RecipeEngine.Api" Version="10.3.0" />
         <PackageReference Include="RecipeEngine.Api.Extensions" Version="7.1.0" />
         <PackageReference Include="RecipeEngine.Modules.Api" Version="5.1.0" />
         <PackageReference Include="RecipeEngine.Modules.Wrench" Version="1.0.1" />

com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableTests.cs

@@ -2901,7 +2901,7 @@ public void WhenSerializingAndDeserializingVeryLargeListNetworkVariables_ValuesA
         public void WhenSerializingAndDeserializingVeryLargeHashSetNetworkVariables_ValuesAreSerializedCorrectly(
 
             [Values(typeof(byte), typeof(sbyte), typeof(short), typeof(ushort), typeof(int), typeof(uint),
-                typeof(long), typeof(ulong), typeof(bool), typeof(char), typeof(float), typeof(double),
+                typeof(long), typeof(ulong), typeof(char), typeof(float), typeof(double),
                 typeof(Vector2), typeof(Vector3), typeof(Vector2Int), typeof(Vector3Int), typeof(Vector4),
                 typeof(Quaternion), typeof(Pose), typeof(HashableNetworkVariableTestClass), typeof(FixedString32Bytes))]
             Type testType)

com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableTestsHelperTypes.cs

@@ -187,14 +187,13 @@ internal struct HashableNetworkVariableTestStruct : INetworkSerializeByMemcpy, I
         public uint E;
         public long F;
         public ulong G;
-        public bool H;
-        public char I;
-        public float J;
-        public double K;
+        public char H;
+        public float I;
+        public double J;
 
         public bool Equals(HashableNetworkVariableTestStruct other)
         {
-            return A == other.A && B == other.B && C == other.C && D == other.D && E == other.E && F == other.F && G == other.G && H == other.H && I == other.I && J.Equals(other.J) && K.Equals(other.K);
+            return A == other.A && B == other.B && C == other.C && D == other.D && E == other.E && F == other.F && G == other.G && H == other.H && I.Equals(other.I) && J.Equals(other.J);
         }
 
         public override bool Equals(object obj)
@@ -215,7 +214,6 @@ public override int GetHashCode()
             hashCode.Add(H);
             hashCode.Add(I);
             hashCode.Add(J);
-            hashCode.Add(K);
             return hashCode.ToHashCode();
         }
     }
@@ -229,14 +227,18 @@ internal struct HashMapKeyStruct : INetworkSerializeByMemcpy, IEquatable<HashMap
         public uint E;
         public long F;
         public ulong G;
-        public bool H;
-        public char I;
-        public float J;
-        public double K;
+        public char H;
+        public float I;
+        public double J;
 
         public bool Equals(HashMapKeyStruct other)
         {
-            return A == other.A && B == other.B && C == other.C && D == other.D && E == other.E && F == other.F && G == other.G && H == other.H && I == other.I && J.Equals(other.J) && K.Equals(other.K);
+            return A == other.A && B == other.B && C == other.C && D == other.D && E == other.E && F == other.F && G == other.G && H == other.H && I.Equals(other.I) && J.Equals(other.J);
+        }
+
+        public override string ToString()
+        {
+            return $"{{A: {A}, B: {B}, C:{C}, D:{D}, E:{E}, F:{F}, G:{G}, H:{H}, I:{I}, J:{J}}}";
         }
 
         public override bool Equals(object obj)
@@ -257,7 +259,6 @@ public override int GetHashCode()
             hashCode.Add(H);
             hashCode.Add(I);
             hashCode.Add(J);
-            hashCode.Add(K);
             return hashCode.ToHashCode();
         }
     }
@@ -271,14 +272,18 @@ internal struct HashMapValStruct : INetworkSerializeByMemcpy, IEquatable<HashMap
         public uint E;
         public long F;
         public ulong G;
-        public bool H;
-        public char I;
-        public float J;
-        public double K;
+        public char H;
+        public float I;
+        public double J;
 
         public bool Equals(HashMapValStruct other)
         {
-            return A == other.A && B == other.B && C == other.C && D == other.D && E == other.E && F == other.F && G == other.G && H == other.H && I == other.I && J.Equals(other.J) && K.Equals(other.K);
+            return A == other.A && B == other.B && C == other.C && D == other.D && E == other.E && F == other.F && G == other.G && H == other.H && I.Equals(other.I) && J.Equals(other.J);
+        }
+
+        public override string ToString()
+        {
+            return $"{{A: {A}, B: {B}, C:{C}, D:{D}, E:{E}, F:{F}, G:{G}, H:{H}, I:{I}, J:{J}}}";
         }
 
         public override bool Equals(object obj)
@@ -299,7 +304,6 @@ public override int GetHashCode()
             hashCode.Add(H);
             hashCode.Add(I);
             hashCode.Add(J);
-            hashCode.Add(K);
             return hashCode.ToHashCode();
         }
     }
@@ -381,6 +385,11 @@ public override bool Equals(object obj)
             return obj is HashMapKeyClass other && Equals(other);
         }
 
+        public override string ToString()
+        {
+            return Data.ToString();
+        }
+
         public override int GetHashCode()
         {
             return Data.GetHashCode();
@@ -401,6 +410,11 @@ public bool Equals(HashMapValClass other)
             return Data.Equals(other.Data);
         }
 
+        public override string ToString()
+        {
+            return Data.ToString();
+        }
+
         public override bool Equals(object obj)
         {
             return obj is HashMapValClass other && Equals(other);