Merge branch 'develop-2.0.0' into fix/localhost-resolution

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Runtime/Components/RigidbodyContactEventManager.cs

@@ -374,8 +374,13 @@ public void Execute(int index)
 
                 var result = new JobResultStruct()
                 {
+#if UNITY_6000_3_0A6_OR_HIGHER
+                    ThisInstanceID = PairedHeaders[index].bodyEntityId,
+                    OtherInstanceID = PairedHeaders[index].otherBodyEntityId,
+#else
                     ThisInstanceID = PairedHeaders[index].bodyInstanceID,
                     OtherInstanceID = PairedHeaders[index].otherBodyInstanceID,
+#endif
                     AverageNormal = averageNormal,
                     HasCollisionStay = collisionStaycount != 0,
                     AverageCollisionStayNormal = averageCollisionStay,

com.unity.netcode.gameobjects/Runtime/Unity.Netcode.Runtime.asmdef

@@ -72,6 +72,11 @@
             "name": "Unity",
             "expression": "6000.1.0a1",
             "define": "HOSTNAME_RESOLUTION_AVAILABLE"
+        },
+        {
+            "name": "Unity",
+            "expression": "6000.3.0a6",
+            "define": "UNITY_6000_3_0A6_OR_HIGHER"
         }
     ],
     "noEngineReferences": false