Merge pull request #623 from Unity-Technologies/tmp/release-to-develop-mergeback

chore: merge release0.1.0 back to mainline, pt 2

Author: mattwalsh-unity

.yamato/project-publish.yml

@@ -10,7 +10,7 @@ publish_{{ project.name }}_{{ package.name }}:
     flavor: b1.large
   commands:
     - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - upm-ci package publish --package-path {{ package.path }} --dry-run
+    - upm-ci package publish --package-path {{ package.path }}
   artifacts:
     artifacts:
       paths:

.yamato/project.metafile

@@ -1,7 +1,12 @@
 # Editors where tests will happen. The first entry of this array is also used
-# for validation
+# for validation.
+#
+# Therefore, **do not** put an older V1-lifecycle ver. 
+#  like 2020.x or 2019.x on top of 'test_editors'
 test_editors:
   - 2021.1
+  - 2021.2
+  - 2020.3
   - 2019.4
   - trunk
 

com.unity.multiplayer.mlapi/Editor/MLAPIProfiler.cs

@@ -8,7 +8,7 @@ namespace UnityEditor
 {
     public class MLAPIProfiler : EditorWindow
     {
-#if !UNITY_2020_2_OR_LATER
+#if !UNITY_2020_2_OR_NEWER
         [MenuItem("Window/MLAPI Profiler")]
         public static void ShowWindow()
         {
@@ -358,4 +358,4 @@ private GUIStyle GetStyleWithTextAlpha(GUIStyle style, float alpha)
             return newStyle;
         }
     }
-}
+}

com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs

@@ -21,6 +21,7 @@ internal static class MLAPIProfilerModule
         [Serializable]
         private class MLAPIProfilerCounter
         {
+            // Note: These fields are named this way for internal serialization
             public string m_Name;
             public string m_Category;
         }
@@ -31,6 +32,7 @@ private class MLAPIProfilerCounter
         [Serializable]
         private class MLAPIProfilerModuleData
         {
+            // Note: These fields are named this way for internal serialization
             public List<MLAPIProfilerCounter> m_ChartCounters = new List<MLAPIProfilerCounter>();
             public List<MLAPIProfilerCounter> m_DetailCounters = new List<MLAPIProfilerCounter>();
             public string m_Name;
@@ -39,33 +41,34 @@ private class MLAPIProfilerModuleData
         [Serializable]
         private class MLAPIModules
         {
+            // Note: These fields are named this way for internal serialization
             public List<MLAPIProfilerModuleData> m_Modules;
         }
 
         private static List<MLAPIProfilerCounter> CreateRPCCounters() => new List<MLAPIProfilerCounter>()
         {
-            new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberOfRPCsSent, m_Category = ProfilerCategory.Network.Name },
-            new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberOfRPCsReceived, m_Category = ProfilerCategory.Network.Name },
-            new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberOfRPCBatchesSent, m_Category = ProfilerCategory.Network.Name },
-            new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberOfRPCBatchesReceived, m_Category = ProfilerCategory.Network.Name },
-            new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberOfRPCQueueProcessed, m_Category = ProfilerCategory.Network.Name },
-            new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberOfRPCsInQueueSize, m_Category = ProfilerCategory.Network.Name },
-            new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberOfRPCsOutQueueSize, m_Category = ProfilerCategory.Network.Name },
+            new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcSent, m_Category = ProfilerCategory.Network.Name },
+            new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcReceived, m_Category = ProfilerCategory.Network.Name },
+            new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcBatchesSent, m_Category = ProfilerCategory.Network.Name },
+            new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcBatchesReceived, m_Category = ProfilerCategory.Network.Name },
+            new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcQueueProcessed, m_Category = ProfilerCategory.Network.Name },
+            new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcInQueueSize, m_Category = ProfilerCategory.Network.Name },
+            new MLAPIProfilerCounter { m_Name = ProfilerConstants.RpcOutQueueSize, m_Category = ProfilerCategory.Network.Name },
         };
 
         private static List<MLAPIProfilerCounter> CreateOperationsCounters() => new List<MLAPIProfilerCounter>()
         {
-            new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberOfConnections, m_Category = ProfilerCategory.Network.Name },
+            new MLAPIProfilerCounter { m_Name = ProfilerConstants.Connections, m_Category = ProfilerCategory.Network.Name },
             new MLAPIProfilerCounter { m_Name = ProfilerConstants.ReceiveTickRate, m_Category = ProfilerCategory.Network.Name },
         };
 
         private static List<MLAPIProfilerCounter> CreateMessagesCounters() => new List<MLAPIProfilerCounter>()
         {
-            new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberOfNamedMessages, m_Category = ProfilerCategory.Network.Name },
-            new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberOfUnnamedMessages, m_Category = ProfilerCategory.Network.Name },
-            new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberBytesSent, m_Category = ProfilerCategory.Network.Name },
-            new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberBytesReceived, m_Category = ProfilerCategory.Network.Name },
-            new MLAPIProfilerCounter { m_Name = ProfilerConstants.NumberNetworkVarsReceived, m_Category = ProfilerCategory.Network.Name },
+            new MLAPIProfilerCounter { m_Name = ProfilerConstants.NamedMessageReceived, m_Category = ProfilerCategory.Network.Name },
+            new MLAPIProfilerCounter { m_Name = ProfilerConstants.UnnamedMessageReceived, m_Category = ProfilerCategory.Network.Name },
+            new MLAPIProfilerCounter { m_Name = ProfilerConstants.ByteSent, m_Category = ProfilerCategory.Network.Name },
+            new MLAPIProfilerCounter { m_Name = ProfilerConstants.ByteReceived, m_Category = ProfilerCategory.Network.Name },
+            new MLAPIProfilerCounter { m_Name = ProfilerConstants.NetworkVarReceived, m_Category = ProfilerCategory.Network.Name },
         };
 
         private delegate List<MLAPIProfilerCounter> CounterListFactoryDelegate();
@@ -75,10 +78,10 @@ private static bool CreateMLAPIDynamicModule(ref MLAPIModules mlapiModules, stri
             var module = mlapiModules.m_Modules.Find(x => x.m_Name == moduleName);
             if (module == null)
             {
-                var newModule = new MLAPIProfilerModuleData();
-                newModule.m_Name = moduleName;
-                newModule.m_ChartCounters = counterListFactoryDelegate();
-                newModule.m_DetailCounters = counterListFactoryDelegate();
+                var newModule = new MLAPIProfilerModuleData
+                {
+                    m_Name = moduleName, m_ChartCounters = counterListFactoryDelegate(), m_DetailCounters = counterListFactoryDelegate(),
+                };
                 mlapiModules.m_Modules.Add(newModule);
                 return true;
             }
@@ -107,4 +110,4 @@ static MLAPIProfilerModule()
 #endif
         }
     }
-}
+}

com.unity.multiplayer.mlapi/Editor/NetworkAnimatorEditor.cs

@@ -35,10 +35,10 @@ private void DrawControls()
             if (EditorGUI.EndChangeCheck()) m_Target.ResetTrackedParams();
 
             var animator = m_Target.Animator;
-            if (ReferenceEquals(animator, null)) return;
+            if (animator == null) return;
 
             var animatorController = animator.runtimeAnimatorController as AnimatorController;
-            if (ReferenceEquals(animatorController, null)) return;
+            if (animatorController == null) return;
 
             EditorGUI.indentLevel += 1;
             var showWarning = false;
@@ -75,4 +75,4 @@ public override void OnInspectorGUI()
             serializedObject.ApplyModifiedProperties();
         }
     }
-}
+}