Skip to content

Commit 839dc43

Browse files
committed
Merge branch 'develop-2.0.0' into chore/optimize-object-message-flags
# Conflicts: # com.unity.netcode.gameobjects/CHANGELOG.md
2 parents 5c7f25d + b56e216 commit 839dc43

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

com.unity.netcode.gameobjects/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
# Changelog
23

34
All notable changes to this project will be documented in this file.
@@ -19,6 +20,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
1920
### Changed
2021

2122
- Improve performance of `CreateObjectMessage`. (#3800)
23+
- First pass of CoreCLR engine API changes. (#3799)
2224
- Changed NetworkAnimator to use the `RpcAttribute` along with the appropriate `SendTo` parameter. (#3586)
2325
- Improve performance of `NetworkTransformState`. (#3770)
2426

com.unity.netcode.gameobjects/Editor/NetworkManagerEditor.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
using Unity.Netcode.Editor.Configuration;
66
using UnityEditor;
77
using UnityEngine;
8+
#if UNITY_6000_5_OR_NEWER
9+
using UnityEngine.Assemblies;
10+
#endif
811

912
namespace Unity.Netcode.Editor
1013
{
@@ -60,7 +63,11 @@ private void ReloadTransports()
6063
{
6164
m_TransportTypes.Clear();
6265

66+
#if UNITY_6000_5_OR_NEWER
67+
var assemblies = CurrentAssemblies.GetLoadedAssemblies();
68+
#else
6369
var assemblies = AppDomain.CurrentDomain.GetAssemblies();
70+
#endif
6471

6572
foreach (var assembly in assemblies)
6673
{

0 commit comments

Comments
 (0)