Merge branch 'master' into 2021.3

# Conflicts:
#	Packages/manifest.json
#	Packages/packages-lock.json

Author: JohannesDeml

Assets/Plugins/WebGL/WebTools/EventListeners/WebEventListeners.cs

@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UnityEngine;
 
@@ -36,6 +37,7 @@ private static void OnBeforeSceneLoadRuntimeMethod()
 		}
 #endif
 
+		[Conditional("UNITY_WEBGL")]
 		public static void AddEventListener(string eventName, Action callback)
 		{
 			instance.AddEventListenerInternal(eventName, callback);
@@ -59,7 +61,7 @@ private void AddEventListenerInternal(string eventName, Action callback)
 				// Add event listener on javascript side
 				_AddJsEventListener(eventName);
 #elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
-			Debug.Log($"<color=#00CCCC>{nameof(WebEventListeners)}.{nameof(AddEventListenerInternal)} add callback for {eventName}</color>");
+			UnityEngine.Debug.Log($"<color=#00CCCC>{nameof(WebEventListeners)}.{nameof(AddEventListenerInternal)} add callback for {eventName}</color>");
 #endif
 			}
 		}

Assets/Scripts/Editor/BuildScript.cs

@@ -106,7 +106,11 @@ public static void Build(string[] args)
 					break;
 				}
 				case BuildTarget.StandaloneOSX:
+#if UNITY_2021_3_OR_NEWER
+					PlayerSettings.SetScriptingBackend(NamedBuildTarget.Standalone, ScriptingImplementation.Mono2x);
+#else
 					PlayerSettings.SetScriptingBackend(BuildTargetGroup.Standalone, ScriptingImplementation.Mono2x);
+#endif
 					break;
 				case BuildTarget.WebGL:
 #if UNITY_2021_2_OR_NEWER

Packages/manifest.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "com.jd.guidresolver": "1.1.0",
+    "com.jd.guidresolver": "1.2.0",
     "com.unity.connect.share": "4.2.4",
     "com.unity.ide.rider": "3.0.38",
     "com.unity.ide.visualstudio": "2.0.25",

Packages/packages-lock.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "com.jd.guidresolver": {
-      "version": "1.1.0",
+      "version": "1.2.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {