Skip to content

Update Mono API calls to CoreCLR-compatible API calls #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Mono API calls to CoreCLR-compatible API calls #205

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions com.unity.mobile.android-logcat/Editor/AndroidTools/AndroidBridge.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
using System.Linq;
using System.Reflection;
using UnityEngine;
#if UNITY_6000_5_OR_NEWER
using UnityEngine.Assemblies;
#endif
using UnityEditor;
using Object = System.Object;

Expand Down Expand Up @@ -38,7 +41,11 @@ private static Assembly AndroidExtensions
if (s_AndroidExtensions != null)
return s_AndroidExtensions;
var assemblyName = "UnityEditor.Android.Extensions";
#if UNITY_6000_5_OR_NEWER
var loadedAssemblies = CurrentAssemblies.GetLoadedAssemblies();
#else
var loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies();
#endif

s_AndroidExtensions = loadedAssemblies.FirstOrDefault(a => a.FullName.Contains(assemblyName));
s_AndroidExtensionsState = s_AndroidExtensions == null ? ExtensionState.Unavalaible : ExtensionState.Available;
Expand Down