diff --git a/.gitignore b/.gitignore
index e33e282ec..20a1dcb29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,7 +61,7 @@ TestResult.xml
/UnitySDK/Assets/PlayServicesResolver.meta
/UnitySDK/Assets/PlayServicesResolver/
/UnitySDK/Assets/ExternalDependencyManager.meta
-/UnitySDK/Assets/ExternalDependencyManager/
+/UnitySDK/Assets/ExternalDependencyManager/Editor.meta
# Ignore Current Facebook Settings
FacebookSettings.asset*
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b97730817..3c710c427 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Payments price convertion to double
- Improved mobile orientation enum for Unity example
- Improved mobile Tournaments example
+- Changed folder structure for External Dependecy Manager dlls
### Changed
- Bumped SDK to 16.0.0
diff --git a/Facebook.Unity.Editor/Facebook.Unity.Editor.csproj b/Facebook.Unity.Editor/Facebook.Unity.Editor.csproj
index f34eb6724..8e0ef3fe4 100644
--- a/Facebook.Unity.Editor/Facebook.Unity.Editor.csproj
+++ b/Facebook.Unity.Editor/Facebook.Unity.Editor.csproj
@@ -40,7 +40,7 @@
- ..\UnitySDK\Assets\PlayServicesResolver\Editor\Google.VersionHandler.dll
+ ..\UnitySDK\Assets\ExternalDependencyManager\Editor\Google.VersionHandler.dll
diff --git a/Facebook.Unity.Editor/FacebookBuild.cs b/Facebook.Unity.Editor/FacebookBuild.cs
index 4d5c15d0e..81faa5b0d 100644
--- a/Facebook.Unity.Editor/FacebookBuild.cs
+++ b/Facebook.Unity.Editor/FacebookBuild.cs
@@ -31,7 +31,6 @@ internal class FacebookBuild
private const string SDKPath = "Assets/FacebookSDK/SDK/";
private const string ExamplesPath = "Assets/FacebookSDK/Examples/";
private const string PluginsPath = "Assets/FacebookSDK/Plugins/";
- private const string PlayServicesResolverPath = "Assets/PlayServicesResolver/";
private const string StreamingAssetsPath = "Assets/StreamingAssets/";
private const string ExternalDependencyManagerPath = "Assets/ExternalDependencyManager/";
private const string EditorPath = "Assets/Editor/";
@@ -86,21 +85,19 @@ public static string ExportPackage()
string[] sdkFiles = (string[])Directory.GetFiles(SDKPath, "*.*", SearchOption.AllDirectories);
string[] exampleFiles = (string[])Directory.GetFiles(ExamplesPath, "*.*", SearchOption.AllDirectories);
string[] pluginsFiles = (string[])Directory.GetFiles(PluginsPath, "*.*", SearchOption.AllDirectories);
- string[] playServicesResolverFiles = (string[])Directory.GetFiles(PlayServicesResolverPath, "*.*", SearchOption.AllDirectories);
string[] streamingAssetsFiles = (string[])Directory.GetFiles(StreamingAssetsPath, "*.*", SearchOption.AllDirectories);
string[] externalDependencyManagerFiles = (string[])Directory.GetFiles(ExternalDependencyManagerPath, "*.*", SearchOption.AllDirectories);
string[] editorFiles = (string[])Directory.GetFiles(EditorPath, "*.*", SearchOption.AllDirectories);
- string[] files = new string[facebookFiles.Length + sdkFiles.Length + exampleFiles.Length + pluginsFiles.Length + playServicesResolverFiles.Length + streamingAssetsFiles.Length + externalDependencyManagerFiles.Length + editorFiles.Length];
+ string[] files = new string[facebookFiles.Length + sdkFiles.Length + exampleFiles.Length + pluginsFiles.Length + streamingAssetsFiles.Length + externalDependencyManagerFiles.Length + editorFiles.Length];
facebookFiles.CopyTo(files, 0);
sdkFiles.CopyTo(files, facebookFiles.Length);
exampleFiles.CopyTo(files, sdkFiles.Length + facebookFiles.Length);
pluginsFiles.CopyTo(files, sdkFiles.Length + facebookFiles.Length + exampleFiles.Length);
- playServicesResolverFiles.CopyTo(files, sdkFiles.Length + facebookFiles.Length + exampleFiles.Length + pluginsFiles.Length);
- streamingAssetsFiles.CopyTo(files, sdkFiles.Length + facebookFiles.Length + exampleFiles.Length + pluginsFiles.Length + playServicesResolverFiles.Length);
- externalDependencyManagerFiles.CopyTo(files, sdkFiles.Length + facebookFiles.Length + exampleFiles.Length + pluginsFiles.Length + playServicesResolverFiles.Length+ streamingAssetsFiles.Length);
- editorFiles.CopyTo(files, sdkFiles.Length + facebookFiles.Length + exampleFiles.Length + pluginsFiles.Length + playServicesResolverFiles.Length+ streamingAssetsFiles.Length + externalDependencyManagerFiles.Length);
+ streamingAssetsFiles.CopyTo(files, sdkFiles.Length + facebookFiles.Length + exampleFiles.Length + pluginsFiles.Length);
+ externalDependencyManagerFiles.CopyTo(files, sdkFiles.Length + facebookFiles.Length + exampleFiles.Length + pluginsFiles.Length + streamingAssetsFiles.Length);
+ editorFiles.CopyTo(files, sdkFiles.Length + facebookFiles.Length + exampleFiles.Length + pluginsFiles.Length + streamingAssetsFiles.Length + externalDependencyManagerFiles.Length);
AssetDatabase.ExportPackage(
files,
diff --git a/UnitySDK/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll b/UnitySDK/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll
similarity index 100%
rename from UnitySDK/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll
rename to UnitySDK/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll
diff --git a/UnitySDK/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.mdb b/UnitySDK/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb
similarity index 100%
rename from UnitySDK/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.mdb
rename to UnitySDK/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb
diff --git a/UnitySDK/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.mdb.meta b/UnitySDK/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.mdb.meta
deleted file mode 100644
index a31148c35..000000000
--- a/UnitySDK/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.mdb.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 3aa17cd5f43042a1a7381759dc1258a7
-labels:
-- gvh_version-1.2.135.0
-- gvh
-timeCreated: 1538009133
-licenseType: Pro
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/UnitySDK/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.meta b/UnitySDK/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.meta
deleted file mode 100644
index e5db242a6..000000000
--- a/UnitySDK/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.meta
+++ /dev/null
@@ -1,34 +0,0 @@
-fileFormatVersion: 2
-guid: bb6999c8a5ce4ba99688ec579babe5b7
-labels:
-- gvh_version-1.2.135.0
-- gvh
-- gvh_targets-editor
-PluginImporter:
- externalObjects: {}
- serializedVersion: 2
- iconMap: {}
- executionOrder: {}
- isPreloaded: 0
- isOverridable: 0
- platformData:
- - first:
- Any:
- second:
- enabled: 0
- settings: {}
- - first:
- Editor: Editor
- second:
- enabled: 1
- settings:
- DefaultValueInitialized: true
- - first:
- Windows Store Apps: WindowsStoreApps
- second:
- enabled: 0
- settings:
- CPU: AnyCPU
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/scripts/fixdependecies.sh b/scripts/fixdependecies.sh
index e0acd94a4..0c929362a 100755
--- a/scripts/fixdependecies.sh
+++ b/scripts/fixdependecies.sh
@@ -56,3 +56,13 @@ cp "$UNITY_CSPROJ/external-dependency-manager_version-1.2.166_manifest.txt" $UNI
## TO DO: obtain the dependency version dinamically
sed s/_v1.2.166././g "$UNITY_CSPROJ/tmp.txt" > "$UNITY_CSPROJ/external-dependency-manager_version-1.2.166_manifest.txt"
rm "$UNITY_CSPROJ/tmp.txt"
+
+mkdir -p "$UNITY_CSPROJ/1.2.166/"
+mv "$UNITY_CSPROJ/Google.IOSResolver.dll" "$UNITY_CSPROJ/1.2.166/Google.IOSResolver.dll"
+mv "$UNITY_CSPROJ/Google.IOSResolver.dll.mdb" "$UNITY_CSPROJ/1.2.166/Google.IOSResolver.dll.mdb"
+mv "$UNITY_CSPROJ/Google.JarResolver.dll" "$UNITY_CSPROJ/1.2.166/Google.JarResolver.dll"
+mv "$UNITY_CSPROJ/Google.JarResolver.dll.mdb" "$UNITY_CSPROJ/1.2.166/Google.JarResolver.dll.mdb"
+mv "$UNITY_CSPROJ/Google.PackageManagerResolver.dll" "$UNITY_CSPROJ/1.2.166/Google.PackageManagerResolver.dll"
+mv "$UNITY_CSPROJ/Google.PackageManagerResolver.dll.mdb" "$UNITY_CSPROJ/1.2.166/Google.PackageManagerResolver.dll.mdb"
+mv "$UNITY_CSPROJ/Google.VersionHandlerImpl.dll" "$UNITY_CSPROJ/1.2.166/Google.VersionHandlerImpl.dll"
+mv "$UNITY_CSPROJ/Google.VersionHandlerImpl.dll.mdb" "$UNITY_CSPROJ/1.2.166/Google.VersionHandlerImpl.dll.mdb"