From 9278ef0f3154e710e78f92aad0a103fcb9cb191c Mon Sep 17 00:00:00 2001 From: "Florian RICHER (MrDev023)" Date: Mon, 3 Jun 2019 16:55:33 +0200 Subject: [PATCH] Fix Mac OS X Version --- Assets/Plugins/Linux/libportmidi.so.meta | 3 +- Assets/Plugins/Mac.bundle.meta | 33 +++++++++++++++ .../{Mac.meta => Mac.bundle/Contents.meta} | 2 +- Assets/Plugins/Mac.bundle/Contents/MacOS.meta | 8 ++++ .../Contents/MacOS}/libportmidi.dylib | Bin .../Contents/MacOS/libportmidi.dylib.meta | 32 +++++++++++++++ Assets/Plugins/Mac.bundle/Info.plist | 38 ++++++++++++++++++ .../Info.plist.meta} | 2 +- Assets/Plugins/Windows/portmidi.dll.meta | 3 +- Assets/Scripts/PortMidiConst.cs.meta | 11 +++++ Packages/manifest.json | 14 ++++++- ProjectSettings/EditorBuildSettings.asset | 2 +- ProjectSettings/ProjectVersion.txt | 3 +- ProjectSettings/XRSettings.asset | 10 +++++ 14 files changed, 154 insertions(+), 7 deletions(-) create mode 100644 Assets/Plugins/Mac.bundle.meta rename Assets/Plugins/{Mac.meta => Mac.bundle/Contents.meta} (77%) create mode 100644 Assets/Plugins/Mac.bundle/Contents/MacOS.meta rename Assets/Plugins/{Mac => Mac.bundle/Contents/MacOS}/libportmidi.dylib (100%) create mode 100644 Assets/Plugins/Mac.bundle/Contents/MacOS/libportmidi.dylib.meta create mode 100644 Assets/Plugins/Mac.bundle/Info.plist rename Assets/Plugins/{Mac/libportmidi.dylib.meta => Mac.bundle/Info.plist.meta} (74%) create mode 100644 Assets/Scripts/PortMidiConst.cs.meta create mode 100644 ProjectSettings/XRSettings.asset diff --git a/Assets/Plugins/Linux/libportmidi.so.meta b/Assets/Plugins/Linux/libportmidi.so.meta index c1d1dd8..c3843c7 100644 --- a/Assets/Plugins/Linux/libportmidi.so.meta +++ b/Assets/Plugins/Linux/libportmidi.so.meta @@ -9,6 +9,7 @@ PluginImporter: isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - first: '': Any @@ -67,7 +68,7 @@ PluginImporter: second: enabled: 1 settings: - CPU: x86_64 + CPU: AnyCPU - first: Standalone: LinuxUniversal second: diff --git a/Assets/Plugins/Mac.bundle.meta b/Assets/Plugins/Mac.bundle.meta new file mode 100644 index 0000000..0829710 --- /dev/null +++ b/Assets/Plugins/Mac.bundle.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: a425b391f01c8894aa43b87c20214852 +folderAsset: yes +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Mac.meta b/Assets/Plugins/Mac.bundle/Contents.meta similarity index 77% rename from Assets/Plugins/Mac.meta rename to Assets/Plugins/Mac.bundle/Contents.meta index abfddbc..b71d93a 100644 --- a/Assets/Plugins/Mac.meta +++ b/Assets/Plugins/Mac.bundle/Contents.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a425b391f01c8894aa43b87c20214852 +guid: 0c8566bc4c811b644b0a8835ff828101 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Plugins/Mac.bundle/Contents/MacOS.meta b/Assets/Plugins/Mac.bundle/Contents/MacOS.meta new file mode 100644 index 0000000..fd0f6fe --- /dev/null +++ b/Assets/Plugins/Mac.bundle/Contents/MacOS.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2aec25c95e75cf545912d023242af0d9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Mac/libportmidi.dylib b/Assets/Plugins/Mac.bundle/Contents/MacOS/libportmidi.dylib similarity index 100% rename from Assets/Plugins/Mac/libportmidi.dylib rename to Assets/Plugins/Mac.bundle/Contents/MacOS/libportmidi.dylib diff --git a/Assets/Plugins/Mac.bundle/Contents/MacOS/libportmidi.dylib.meta b/Assets/Plugins/Mac.bundle/Contents/MacOS/libportmidi.dylib.meta new file mode 100644 index 0000000..7abc750 --- /dev/null +++ b/Assets/Plugins/Mac.bundle/Contents/MacOS/libportmidi.dylib.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: cc1e4960e482b2844b08013a26acb81e +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Mac.bundle/Info.plist b/Assets/Plugins/Mac.bundle/Info.plist new file mode 100644 index 0000000..bb58381 --- /dev/null +++ b/Assets/Plugins/Mac.bundle/Info.plist @@ -0,0 +1,38 @@ + + + + + BuildMachineOSBuild + 11G63 + CFBundleDevelopmentRegion + English + CFBundleExecutable + libportmidi.dylib + CFBundleIdentifier + fr.mrdev023.libportmidi + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + BNDL + CFBundleSignature + ???? + CFBundleVersion + 1.42 + CSResourcesFileMapped + yes + DTCompiler + + DTPlatformBuild + 4H1503 + DTPlatformVersion + GM + DTSDKBuild + 11E52 + DTSDKName + macosx10.7 + DTXcode + 0463 + DTXcodeBuild + 4H1503 + + diff --git a/Assets/Plugins/Mac/libportmidi.dylib.meta b/Assets/Plugins/Mac.bundle/Info.plist.meta similarity index 74% rename from Assets/Plugins/Mac/libportmidi.dylib.meta rename to Assets/Plugins/Mac.bundle/Info.plist.meta index fe2364a..04ccf93 100644 --- a/Assets/Plugins/Mac/libportmidi.dylib.meta +++ b/Assets/Plugins/Mac.bundle/Info.plist.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cc1e4960e482b2844b08013a26acb81e +guid: 4f5ae46c29a68fa4a817c8f8be1eaa43 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Plugins/Windows/portmidi.dll.meta b/Assets/Plugins/Windows/portmidi.dll.meta index 7d1a8c8..ab59d88 100644 --- a/Assets/Plugins/Windows/portmidi.dll.meta +++ b/Assets/Plugins/Windows/portmidi.dll.meta @@ -9,6 +9,7 @@ PluginImporter: isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - first: '': Any @@ -67,7 +68,7 @@ PluginImporter: second: enabled: 1 settings: - CPU: x86_64 + CPU: AnyCPU - first: Standalone: LinuxUniversal second: diff --git a/Assets/Scripts/PortMidiConst.cs.meta b/Assets/Scripts/PortMidiConst.cs.meta new file mode 100644 index 0000000..2b99a85 --- /dev/null +++ b/Assets/Scripts/PortMidiConst.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d30d9e7032bf4484eafd50da73c01059 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 4136464..8d39674 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,7 +1,19 @@ { "dependencies": { - "com.unity.package-manager-ui": "2.0.3", + "com.unity.2d.sprite": "1.0.0", + "com.unity.2d.tilemap": "1.0.0", + "com.unity.ext.nunit": "1.0.0", + "com.unity.ide.rider": "1.0.4", + "com.unity.ide.visualstudio": "1.0.5", + "com.unity.ide.vscode": "1.0.4", + "com.unity.multiplayer-hlapi": "1.0.2", + "com.unity.package-manager-ui": "2.2.0", + "com.unity.test-framework": "1.0.13", + "com.unity.timeline": "1.1.0", + "com.unity.ugui": "1.0.0", + "com.unity.xr.legacyinputhelpers": "2.0.2", "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.audio": "1.0.0", diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 82ab0f5..7cc6142 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -7,5 +7,5 @@ EditorBuildSettings: m_Scenes: - enabled: 1 path: Assets/Scenes/SampleScene.unity - guid: 2cda990e2423bbf4892e6590ba056729 + guid: fd506f344a3065a4a8fd96d938c61f93 m_configObjects: {} diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 1b2cd94..a562139 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1,2 @@ -m_EditorVersion: 2018.3.6f1 +m_EditorVersion: 2019.2.0b4 +m_EditorVersionWithRevision: 2019.2.0b4 (243498937c5d) diff --git a/ProjectSettings/XRSettings.asset b/ProjectSettings/XRSettings.asset new file mode 100644 index 0000000..482590c --- /dev/null +++ b/ProjectSettings/XRSettings.asset @@ -0,0 +1,10 @@ +{ + "m_SettingKeys": [ + "VR Device Disabled", + "VR Device User Alert" + ], + "m_SettingValues": [ + "False", + "False" + ] +} \ No newline at end of file