diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.dll index 32fb70f6..4966eb27 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.dll and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.dll differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.dll.meta b/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.dll.meta index 79931b0b..61e6db6c 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.dll.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.dll.meta @@ -12,6 +12,7 @@ PluginImporter: executionOrder: {} isPreloaded: 0 isOverridable: 0 + validateReferences: 0 platformData: - first: Any: diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.pdb index a63543db..12f8de36 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.pdb and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.pdb differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.JarResolver.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.JarResolver.dll index c9930ca0..ea24cb16 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.JarResolver.dll and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.JarResolver.dll differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.JarResolver.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.JarResolver.pdb index 0240d1dd..299ac87d 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.JarResolver.pdb and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.JarResolver.pdb differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.PackageManagerResolver.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.PackageManagerResolver.dll index ee0f0c78..215d0eab 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.PackageManagerResolver.dll and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.PackageManagerResolver.dll differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.PackageManagerResolver.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.PackageManagerResolver.pdb index 35f10122..257d067a 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.PackageManagerResolver.pdb and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.PackageManagerResolver.pdb differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.VersionHandlerImpl.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.VersionHandlerImpl.dll index f291ffc6..cd4bd2f7 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.VersionHandlerImpl.dll and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.VersionHandlerImpl.dll differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.VersionHandlerImpl.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.VersionHandlerImpl.pdb index 11e02f37..ec5c5993 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.VersionHandlerImpl.pdb and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.185/Google.VersionHandlerImpl.pdb differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll index 430c3483..12c150e2 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll and b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.185_manifest.txt.meta b/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.185_manifest.txt.meta index 876d678e..0971778d 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.185_manifest.txt.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.185_manifest.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: de14403f051e49a4a8b255f2137eed89 +guid: 35afff9011254dc885b0bf7e98aee168 labels: - gvh_version-1.2.185 - gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.185_manifest.txt diff --git a/external-dependency-manager-1.2.185.unitypackage b/external-dependency-manager-1.2.185.unitypackage index 0fb1591e..40391c69 100644 Binary files a/external-dependency-manager-1.2.185.unitypackage and b/external-dependency-manager-1.2.185.unitypackage differ diff --git a/external-dependency-manager-latest.unitypackage b/external-dependency-manager-latest.unitypackage index 0fb1591e..40391c69 100644 Binary files a/external-dependency-manager-latest.unitypackage and b/external-dependency-manager-latest.unitypackage differ diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.dll.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.dll.meta index 79931b0b..61e6db6c 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.dll.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.dll.meta @@ -12,6 +12,7 @@ PluginImporter: executionOrder: {} isPreloaded: 0 isOverridable: 0 + validateReferences: 0 platformData: - first: Any: diff --git a/source/ExportUnityPackage/export_unity_package.py b/source/ExportUnityPackage/export_unity_package.py index 10c5651f..b8f16b5a 100755 --- a/source/ExportUnityPackage/export_unity_package.py +++ b/source/ExportUnityPackage/export_unity_package.py @@ -1851,6 +1851,10 @@ def importer_metadata(self): if "Android" in platforms and cpu_string != "AnyCPU": importer_metadata = Asset.set_cpu_for_android( importer_metadata, cpu_string) + # Set validateReferences, if requested, which should be either 0 or 1 + validateRef = safe_dict_get_value(self._json, "validateReferences", default_value=2) + if validateRef == 0 or validateRef == 1: + importer_metadata["PluginImporter"]["validateReferences"] = validateRef else: raise ProjectConfigurationError( "Unknown importer type %s for package %s, paths %s" % ( diff --git a/source/IOSResolver/src/IOSResolver.cs b/source/IOSResolver/src/IOSResolver.cs index ea312fde..a272810e 100644 --- a/source/IOSResolver/src/IOSResolver.cs +++ b/source/IOSResolver/src/IOSResolver.cs @@ -843,25 +843,41 @@ public static void SettingsDialog() { /// internal static bool MultipleXcodeTargetsSupported { get { - return typeof(UnityEditor.iOS.Xcode.PBXProject).GetMethod( - "GetUnityMainTargetGuid", Type.EmptyTypes) != null; + try { + return MultipleXcodeTargetsSupportedInternal(); + } catch (Exception e) { + return false; + } } } + private static bool MultipleXcodeTargetsSupportedInternal() { + return typeof(UnityEditor.iOS.Xcode.PBXProject).GetMethod( + "GetUnityMainTargetGuid", Type.EmptyTypes) != null; + } + /// /// Name of the Xcode main target generated by Unity. /// public static string XcodeMainTargetName { get { - // NOTE: Unity-iPhone is hard coded in UnityEditor.iOS.Xcode.PBXProject and will no - // longer be exposed via GetUnityTargetName(). It hasn't changed in many years though - // so we'll use this constant as a relatively safe default. - return MultipleXcodeTargetsSupported ? "Unity-iPhone" : - (string)VersionHandler.InvokeStaticMethod(typeof(UnityEditor.iOS.Xcode.PBXProject), - "GetUnityTargetName", null); + try { + return XcodeMainTargetNameInternal(); + } catch (Exception e) { + return "Unity-iPhone"; + } } } + private static string XcodeMainTargetNameInternal() { + // NOTE: Unity-iPhone is hard coded in UnityEditor.iOS.Xcode.PBXProject and will no + // longer be exposed via GetUnityTargetName(). It hasn't changed in many years though + // so we'll use this constant as a relatively safe default. + return MultipleXcodeTargetsSupported ? "Unity-iPhone" : + (string)VersionHandler.InvokeStaticMethod(typeof(UnityEditor.iOS.Xcode.PBXProject), + "GetUnityTargetName", null); + } + /// /// Name of the Xcode UnityFramework target generated by Unity 2019.3+ /// diff --git a/upm/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.dll b/upm/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.dll index 32fb70f6..4966eb27 100755 Binary files a/upm/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.dll and b/upm/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.dll differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.dll.meta b/upm/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.dll.meta index f29bb62a..bc98f23c 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.dll.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.dll.meta @@ -13,6 +13,7 @@ PluginImporter: executionOrder: {} isPreloaded: 0 isOverridable: 0 + validateReferences: 0 platformData: - first: Any: diff --git a/upm/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.pdb b/upm/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.pdb index a63543db..12f8de36 100755 Binary files a/upm/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.pdb and b/upm/ExternalDependencyManager/Editor/1.2.185/Google.IOSResolver.pdb differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.185/Google.JarResolver.dll b/upm/ExternalDependencyManager/Editor/1.2.185/Google.JarResolver.dll index c9930ca0..ea24cb16 100755 Binary files a/upm/ExternalDependencyManager/Editor/1.2.185/Google.JarResolver.dll and b/upm/ExternalDependencyManager/Editor/1.2.185/Google.JarResolver.dll differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.185/Google.JarResolver.pdb b/upm/ExternalDependencyManager/Editor/1.2.185/Google.JarResolver.pdb index 0240d1dd..299ac87d 100755 Binary files a/upm/ExternalDependencyManager/Editor/1.2.185/Google.JarResolver.pdb and b/upm/ExternalDependencyManager/Editor/1.2.185/Google.JarResolver.pdb differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.185/Google.PackageManagerResolver.dll b/upm/ExternalDependencyManager/Editor/1.2.185/Google.PackageManagerResolver.dll index ee0f0c78..215d0eab 100755 Binary files a/upm/ExternalDependencyManager/Editor/1.2.185/Google.PackageManagerResolver.dll and b/upm/ExternalDependencyManager/Editor/1.2.185/Google.PackageManagerResolver.dll differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.185/Google.PackageManagerResolver.pdb b/upm/ExternalDependencyManager/Editor/1.2.185/Google.PackageManagerResolver.pdb index 35f10122..257d067a 100755 Binary files a/upm/ExternalDependencyManager/Editor/1.2.185/Google.PackageManagerResolver.pdb and b/upm/ExternalDependencyManager/Editor/1.2.185/Google.PackageManagerResolver.pdb differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.185/Google.VersionHandlerImpl.dll b/upm/ExternalDependencyManager/Editor/1.2.185/Google.VersionHandlerImpl.dll index f291ffc6..cd4bd2f7 100755 Binary files a/upm/ExternalDependencyManager/Editor/1.2.185/Google.VersionHandlerImpl.dll and b/upm/ExternalDependencyManager/Editor/1.2.185/Google.VersionHandlerImpl.dll differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.185/Google.VersionHandlerImpl.pdb b/upm/ExternalDependencyManager/Editor/1.2.185/Google.VersionHandlerImpl.pdb index 11e02f37..ec5c5993 100755 Binary files a/upm/ExternalDependencyManager/Editor/1.2.185/Google.VersionHandlerImpl.pdb and b/upm/ExternalDependencyManager/Editor/1.2.185/Google.VersionHandlerImpl.pdb differ diff --git a/upm/ExternalDependencyManager/Editor/Google.VersionHandler.dll b/upm/ExternalDependencyManager/Editor/Google.VersionHandler.dll index 430c3483..12c150e2 100755 Binary files a/upm/ExternalDependencyManager/Editor/Google.VersionHandler.dll and b/upm/ExternalDependencyManager/Editor/Google.VersionHandler.dll differ diff --git a/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.185_manifest.txt.meta b/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.185_manifest.txt.meta index 9fb15793..730dec51 100644 --- a/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.185_manifest.txt.meta +++ b/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.185_manifest.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: de14403f051e49a4a8b255f2137eed89 +guid: 35afff9011254dc885b0bf7e98aee168 labels: - gvh - gvh_manifest