From 0c516cace3d87bc0e0c0c1302f13f618425e64f7 Mon Sep 17 00:00:00 2001 From: Nick Rudzicz Date: Tue, 17 Oct 2023 10:47:00 -0400 Subject: [PATCH] Fixed: bad args for AssetDatabase.FindAssets When AppleFrameworkUtility.GetPluginLibraryPathForBuildTarget() is being called, the libraryName arguments are coming in with extensions. This causes the .bundle/.framework files to not be found during the post-build process. --- .../Assets/Apple.Core/Editor/AppleCoreBuildStep.cs | 11 ++--------- .../Editor/AppleGameControllerBuildStep.cs | 11 ++--------- .../Apple.GameKit/Editor/AppleGameKitBuildStep.cs | 11 ++--------- 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleCoreBuildStep.cs b/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleCoreBuildStep.cs index 45d488a9..6d4b4378 100644 --- a/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleCoreBuildStep.cs +++ b/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleCoreBuildStep.cs @@ -13,13 +13,6 @@ public class AppleCoreBuildStep : AppleBuildStep { public override string DisplayName => "Apple.Core"; - readonly Dictionary _libraryTable = new Dictionary - { - {BuildTarget.iOS, "AppleCoreNative.framework"}, - {BuildTarget.tvOS, "AppleCoreNative.framework"}, - {BuildTarget.StandaloneOSX, "AppleCoreNativeMac.bundle"} - }; - #if UNITY_EDITOR_OSX public override void OnFinalizePostProcess(AppleBuildProfile appleBuildProfile, BuildTarget buildTarget, string pathToBuiltProject) { @@ -42,9 +35,9 @@ public override void OnFinalizePostProcess(AppleBuildProfile appleBuildProfile, public override void OnProcessFrameworks(AppleBuildProfile _, BuildTarget buildTarget, string pathToBuiltTarget, PBXProject pbxProject) { - if (_libraryTable.ContainsKey(buildTarget)) + if (buildTarget == BuildTarget.iOS || buildTarget == BuildTarget.tvOS || buildTarget == BuildTarget.StandaloneOSX) { - string libraryName = _libraryTable[buildTarget]; + string libraryName = buildTarget == BuildTarget.StandaloneOSX ? "AppleCoreNativeMac" : "AppleCoreNative"; string libraryPath = AppleFrameworkUtility.GetPluginLibraryPathForBuildTarget(libraryName, buildTarget); if (string.IsNullOrEmpty(libraryPath)) { diff --git a/plug-ins/Apple.GameController/Apple.GameController_Unity/Assets/Apple.GameController/Editor/AppleGameControllerBuildStep.cs b/plug-ins/Apple.GameController/Apple.GameController_Unity/Assets/Apple.GameController/Editor/AppleGameControllerBuildStep.cs index 6fb77d12..d94c16ce 100644 --- a/plug-ins/Apple.GameController/Apple.GameController_Unity/Assets/Apple.GameController/Editor/AppleGameControllerBuildStep.cs +++ b/plug-ins/Apple.GameController/Apple.GameController_Unity/Assets/Apple.GameController/Editor/AppleGameControllerBuildStep.cs @@ -14,13 +14,6 @@ public class AppleGameControllerBuildStep : AppleBuildStep { public override string DisplayName => "GameController"; - readonly Dictionary _libraryTable = new Dictionary - { - {BuildTarget.iOS, "GameControllerWrapper.framework"}, - {BuildTarget.tvOS, "GameControllerWrapper.framework"}, - {BuildTarget.StandaloneOSX, "GameControllerWrapper.bundle"} - }; - public bool GCSupportsControllerUserInteraction = true; public bool SupportsMicroGamePad = true; public bool SupportsExtendedGamePad = true; @@ -65,9 +58,9 @@ public override void OnProcessInfoPlist(AppleBuildProfile _, BuildTarget buildTa public override void OnProcessFrameworks(AppleBuildProfile _, BuildTarget buildTarget, string pathToBuiltTarget, PBXProject pbxProject) { - if (_libraryTable.ContainsKey(buildTarget)) + if (buildTarget == BuildTarget.iOS || buildTarget == BuildTarget.tvOS || buildTarget == BuildTarget.StandaloneOSX) { - string libraryName = _libraryTable[buildTarget]; + const string libraryName = "GameControllerWrapper"; string libraryPath = AppleFrameworkUtility.GetPluginLibraryPathForBuildTarget(libraryName, buildTarget); if (String.IsNullOrEmpty(libraryPath)) { diff --git a/plug-ins/Apple.GameKit/Apple.GameKit_Unity/Assets/Apple.GameKit/Editor/AppleGameKitBuildStep.cs b/plug-ins/Apple.GameKit/Apple.GameKit_Unity/Assets/Apple.GameKit/Editor/AppleGameKitBuildStep.cs index a10677cd..7ff12dbd 100644 --- a/plug-ins/Apple.GameKit/Apple.GameKit_Unity/Assets/Apple.GameKit/Editor/AppleGameKitBuildStep.cs +++ b/plug-ins/Apple.GameKit/Apple.GameKit_Unity/Assets/Apple.GameKit/Editor/AppleGameKitBuildStep.cs @@ -14,13 +14,6 @@ public class AppleGameKitBuildStep : AppleBuildStep { public override string DisplayName => "GameKit"; - readonly Dictionary _libraryTable = new Dictionary - { - {BuildTarget.iOS, "GameKitWrapper.framework"}, - {BuildTarget.tvOS, "GameKitWrapper.framework"}, - {BuildTarget.StandaloneOSX, "GameKitWrapper.bundle"} - }; - #if UNITY_EDITOR_OSX public override void OnProcessEntitlements(AppleBuildProfile _, BuildTarget buildTarget, string _1, PlistDocument entitlements) { @@ -32,9 +25,9 @@ public override void OnProcessEntitlements(AppleBuildProfile _, BuildTarget buil public override void OnProcessFrameworks(AppleBuildProfile _, BuildTarget buildTarget, string pathToBuiltTarget, PBXProject pbxProject) { - if (_libraryTable.ContainsKey(buildTarget)) + if (buildTarget == BuildTarget.iOS || buildTarget == BuildTarget.tvOS || buildTarget == BuildTarget.StandaloneOSX) { - string libraryName = _libraryTable[buildTarget]; + const string libraryName = "GameKitWrapper"; string libraryPath = AppleFrameworkUtility.GetPluginLibraryPathForBuildTarget(libraryName, buildTarget); if (String.IsNullOrEmpty(libraryPath)) {