Fixed incorrect assembly path detection

UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML

@@ -781,12 +781,12 @@
         </member>
         <member name="M:DG.Tweening.TweenExtensions.PathGetPoint(DG.Tweening.Tween,System.Single)">
             <summary>
-            Returns the a point on a path (returns <code>Vector3.zero</code> if this is not a path tween, if the tween is invalid, or if the path is not yet initialized),
+            Returns a point on a path based on the given path percentage
-            based on the given path percentage (0 to 1).
+            (returns <code>Vector3.zero</code> if this is not a path tween, if the tween is invalid, or if the path is not yet initialized)
             A path is initialized after its tween starts, or immediately if the tween was created with the Path Editor (DOTween Pro feature).
             You can force a path to be initialized by calling <code>myTween.ForceInit()</code>.
             </summary>
-            <param name="pathPercentage">Percentage of the path on which to get the point (0 to 1)</param>
+            <param name="pathPercentage">Percentage of the path (0 to 1) on which to get the point</param>
         </member>
         <member name="M:DG.Tweening.TweenExtensions.PathLength(DG.Tweening.Tween)">
             <summary>

UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.XML

@@ -56,5 +56,10 @@
             <param name="adbFilePath">File path (relative to Unity's project folder)</param>
             <param name="createIfMissing">If TRUE and the requested asset doesn't exist, forces its creation</param>
         </member>
+        <member name="M:DG.DOTweenEditor.Core.EditorUtils.GetAssemblyFilePath(System.Reflection.Assembly)">
+            <summary>
+            Full path for the given loaded assembly, assembly file included
+            </summary>
+        </member>
     </members>
 </doc>

UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML

@@ -781,12 +781,12 @@
         </member>
         <member name="M:DG.Tweening.TweenExtensions.PathGetPoint(DG.Tweening.Tween,System.Single)">
             <summary>
-            Returns the a point on a path (returns <code>Vector3.zero</code> if this is not a path tween, if the tween is invalid, or if the path is not yet initialized),
+            Returns a point on a path based on the given path percentage
-            based on the given path percentage (0 to 1).
+            (returns <code>Vector3.zero</code> if this is not a path tween, if the tween is invalid, or if the path is not yet initialized)
             A path is initialized after its tween starts, or immediately if the tween was created with the Path Editor (DOTween Pro feature).
             You can force a path to be initialized by calling <code>myTween.ForceInit()</code>.
             </summary>
-            <param name="pathPercentage">Percentage of the path on which to get the point (0 to 1)</param>
+            <param name="pathPercentage">Percentage of the path (0 to 1) on which to get the point</param>
         </member>
         <member name="M:DG.Tweening.TweenExtensions.PathLength(DG.Tweening.Tween)">
             <summary>

UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.XML

@@ -56,5 +56,10 @@
             <param name="adbFilePath">File path (relative to Unity's project folder)</param>
             <param name="createIfMissing">If TRUE and the requested asset doesn't exist, forces its creation</param>
         </member>
+        <member name="M:DG.DOTweenEditor.Core.EditorUtils.GetAssemblyFilePath(System.Reflection.Assembly)">
+            <summary>
+            Full path for the given loaded assembly, assembly file included
+            </summary>
+        </member>
     </members>
 </doc>

UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML

@@ -781,12 +781,12 @@
         </member>
         <member name="M:DG.Tweening.TweenExtensions.PathGetPoint(DG.Tweening.Tween,System.Single)">
             <summary>
-            Returns the a point on a path (returns <code>Vector3.zero</code> if this is not a path tween, if the tween is invalid, or if the path is not yet initialized),
+            Returns a point on a path based on the given path percentage
-            based on the given path percentage (0 to 1).
+            (returns <code>Vector3.zero</code> if this is not a path tween, if the tween is invalid, or if the path is not yet initialized)
             A path is initialized after its tween starts, or immediately if the tween was created with the Path Editor (DOTween Pro feature).
             You can force a path to be initialized by calling <code>myTween.ForceInit()</code>.
             </summary>
-            <param name="pathPercentage">Percentage of the path on which to get the point (0 to 1)</param>
+            <param name="pathPercentage">Percentage of the path (0 to 1) on which to get the point</param>
         </member>
         <member name="M:DG.Tweening.TweenExtensions.PathLength(DG.Tweening.Tween)">
             <summary>

UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.XML

@@ -56,5 +56,10 @@
             <param name="adbFilePath">File path (relative to Unity's project folder)</param>
             <param name="createIfMissing">If TRUE and the requested asset doesn't exist, forces its creation</param>
         </member>
+        <member name="M:DG.DOTweenEditor.Core.EditorUtils.GetAssemblyFilePath(System.Reflection.Assembly)">
+            <summary>
+            Full path for the given loaded assembly, assembly file included
+            </summary>
+        </member>
     </members>
 </doc>

UnityTests.Unity5/Assets/Demigiant/DemiLib/DemiLib.xml

@@ -4,10 +4,9 @@
         <name>DemiLib</name>
     </assembly>
     <members>
-        <member name="T:DG.DemiLib.DeSkinColor">
+        <member name="F:DG.DemiLib.Core.GUIUtils.isProSkin">
             <summary>
-            Contains both free and pro skins color variations,
+            Set when calling <code>DeGUIManage.BeginGUI</code>
-            and automatically returns the correct one when converted to Color
             </summary>
         </member>
         <member name="T:DG.DemiLib.DeColorPalette">
@@ -27,9 +26,10 @@
             Content colors
             </summary>
         </member>
-        <member name="F:DG.DemiLib.Core.GUIUtils.isProSkin">
+        <member name="T:DG.DemiLib.DeSkinColor">
             <summary>
-            Set when calling <code>DeGUIManage.BeginGUI</code>
+            Contains both free and pro skins color variations,
+            and automatically returns the correct one when converted to Color
             </summary>
         </member>
     </members>

UnityTests.Unity5/Assets/Demigiant/DemiLib/Editor/DemiEditor.XML

@@ -4,6 +4,16 @@
         <name>DemiEditor</name>
     </assembly>
     <members>
+        <member name="T:DG.DemiEditor.TextureExtensions">
+            <summary>
+            Texture extensions
+            </summary>
+        </member>
+        <member name="M:DG.DemiEditor.TextureExtensions.SetFormat(UnityEngine.Texture2D,UnityEngine.FilterMode,System.Int32)">
+            <summary>
+            Checks that the texture uses the correct import settings, and applies them if they're incorrect.
+            </summary>
+        </member>
         <member name="T:DG.DemiEditor.DeGUI">
             <summary>
             Global Demigiant GUI manager
@@ -36,6 +46,31 @@
             (or resets them to the default ones if NULL)
             </summary>
         </member>
+        <member name="T:DG.DemiEditor.AssemblyExtensions">
+            <summary>
+            Assembly extensions
+            </summary>
+        </member>
+        <member name="M:DG.DemiEditor.AssemblyExtensions.ADBDir(System.Reflection.Assembly)">
+            <summary>AssetDatabase path to the assembly directory, without final slash</summary>
+        </member>
+        <member name="T:DG.DemiEditor.DeFileUtils">
+            <summary>
+            File utils
+            </summary>
+        </member>
+        <member name="F:DG.DemiEditor.DeFileUtils.ADBPathSlash">
+            <summary>Path slash for AssetDatabase format</summary>
+        </member>
+        <member name="F:DG.DemiEditor.DeFileUtils.ADBPathSlashToReplace">
+            <summary>Path slash to replace for AssetDatabase format</summary>
+        </member>
+        <member name="F:DG.DemiEditor.DeFileUtils.PathSlash">
+            <summary>Current OS path slash</summary>
+        </member>
+        <member name="F:DG.DemiEditor.DeFileUtils.PathSlashToReplace">
+            <summary>Path slash to replace on current OS</summary>
+        </member>
         <member name="T:DG.DemiEditor.DeStylePalette">
             <summary>
             Stores a GUIStyle palette, which can be passed to default DeGUI layouts when calling <code>DeGUI.BeginGUI</code>,
@@ -134,6 +169,16 @@
             Sets the margin of the style
             </summary>
         </member>
+        <member name="M:DG.DemiEditor.DeGUIExtensions.MarginLeft(UnityEngine.GUIStyle,System.Int32)">
+            <summary>
+            Sets the left margin of the style
+            </summary>
+        </member>
+        <member name="M:DG.DemiEditor.DeGUIExtensions.MarginRight(UnityEngine.GUIStyle,System.Int32)">
+            <summary>
+            Sets the right margin of the style
+            </summary>
+        </member>
         <member name="M:DG.DemiEditor.DeGUIExtensions.MarginTop(UnityEngine.GUIStyle,System.Int32)">
             <summary>
             Sets the top margin of the style
@@ -194,23 +239,6 @@
             Sets the stretchWidth property of the style
             </summary>
         </member>
-        <member name="T:DG.DemiEditor.DeFileUtils">
-            <summary>
-            File utils
-            </summary>
-        </member>
-        <member name="F:DG.DemiEditor.DeFileUtils.ADBPathSlash">
-            <summary>Path slash for AssetDatabase format</summary>
-        </member>
-        <member name="F:DG.DemiEditor.DeFileUtils.ADBPathSlashToReplace">
-            <summary>Path slash to replace for AssetDatabase format</summary>
-        </member>
-        <member name="F:DG.DemiEditor.DeFileUtils.PathSlash">
-            <summary>Current OS path slash</summary>
-        </member>
-        <member name="F:DG.DemiEditor.DeFileUtils.PathSlashToReplace">
-            <summary>Path slash to replace on current OS</summary>
-        </member>
         <member name="T:DG.DemiEditor.DeGUILayout">
             <summary>
             GUILayout methods
@@ -229,6 +257,9 @@
             <summary>Button that can be toggled on and off</summary>
             <summary>Button that can be toggled on and off</summary>
         </member>
+        <member name="M:DG.DemiEditor.DeGUILayout.ToolbarFoldoutButton(System.Boolean,System.String)">
+            <summary>Toolbar foldout button</summary>
+        </member>
         <member name="M:DG.DemiEditor.DeGUILayout.ToggleButton(System.Boolean,System.String,UnityEngine.GUILayoutOption[])">
             <summary>Button that can be toggled on and off</summary>
         </member>
@@ -281,25 +312,22 @@
         <member name="M:DG.DemiEditor.DeGUILayout.Toolbar(System.String,UnityEngine.Color,UnityEngine.GUIStyle,UnityEngine.GUIStyle,UnityEngine.GUILayoutOption[])">
             <summary>A toolbar with a label</summary>
         </member>
+        <member name="M:DG.DemiEditor.DeGUILayout.BeginVBox(UnityEngine.GUIStyle)">
+            <summary>Vertical box layout with style and color options</summary>
+        </member>
+        <member name="M:DG.DemiEditor.DeGUILayout.BeginVBox(System.Nullable{UnityEngine.Color},UnityEngine.GUIStyle)">
+            <summary>Vertical box layout with style and color options</summary>
+        </member>
+        <member name="M:DG.DemiEditor.DeGUILayout.EndVBox">
+            <summary>End vertical box layout</summary>
+        </member>
         <member name="M:DG.DemiEditor.DeGUILayout.HorizontalDivider(System.Nullable{UnityEngine.Color},System.Int32,System.Int32,System.Int32)">
             <summary>Divider</summary>
         </member>
-        <member name="T:DG.DemiEditor.AssemblyExtensions">
+        <member name="T:DG.DemiEditor.DeSkinStyle">
             <summary>
-            Assembly extensions
+            Contains both free and pro skins GUIStyle variations,
-            </summary>
+            and automatically returns the correct one when converted to GUIStyle
-        </member>
-        <member name="M:DG.DemiEditor.AssemblyExtensions.ADBDir(System.Reflection.Assembly)">
-            <summary>AssetDatabase path to the assembly, without final slash</summary>
-        </member>
-        <member name="T:DG.DemiEditor.TextureExtensions">
-            <summary>
-            Texture extensions
-            </summary>
-        </member>
-        <member name="M:DG.DemiEditor.TextureExtensions.SetFormat(UnityEngine.Texture2D,UnityEngine.FilterMode,System.Int32)">
-            <summary>
-            Checks that the texture uses the correct import settings, and applies them if they're incorrect.
             </summary>
         </member>
     </members>

_DOTween.Assembly/DOTween/DOTween.cs

@@ -32,7 +32,7 @@ namespace DG.Tweening
     public class DOTween
     {
         /// <summary>DOTween's version</summary>
-        public static readonly string Version = "1.0.665";
+        public static readonly string Version = "1.0.675";
 
         ///////////////////////////////////////////////
         // Options ////////////////////////////////////

_DOTween.Assembly/DOTweenEditor/Core/EditorUtils.cs

@@ -141,6 +141,27 @@ namespace DG.DOTweenEditor.Core
             return source;
         }
 
+        /// <summary>
+        /// Full path for the given loaded assembly, assembly file included
+        /// </summary>
+        public static string GetAssemblyFilePath(Assembly assembly)
+        {
+
+            string codeBase = assembly.CodeBase;
+            UriBuilder uri = new UriBuilder(codeBase);
+            string path = Uri.UnescapeDataString(uri.Path);
+            if (path.Substring(path.Length - 3) == "dll") return path;
+
+//            string codeBase = assembly.CodeBase;
+//            UriBuilder uri = new UriBuilder(codeBase);
+//            string path = Path.GetDirectoryName(Uri.UnescapeDataString(uri.Path));
+//            string lastChar = path.Substring(path.Length - 4);
+//            if (lastChar == "dll") return path;
+
+            // Invalid path, use Location
+            return Path.GetFullPath(assembly.Location);
+        }
+
         // ===================================================================================
         // METHODS ---------------------------------------------------------------------------
 
@@ -161,18 +182,20 @@ namespace DG.DOTweenEditor.Core
         // AssetDatabase formatted path to DOTween's Editor folder
         static void StoreEditorADBDir()
         {
-            string codeBase = Assembly.GetExecutingAssembly().CodeBase;
+//            string codeBase = Assembly.GetExecutingAssembly().CodeBase;
-            UriBuilder uri = new UriBuilder(codeBase);
+//            UriBuilder uri = new UriBuilder(codeBase);
-            string fullPath = Path.GetDirectoryName(Uri.UnescapeDataString(uri.Path));
+//            string fullPath = Path.GetDirectoryName(Uri.UnescapeDataString(uri.Path));
+            string fullPath = Path.GetDirectoryName(GetAssemblyFilePath(Assembly.GetExecutingAssembly()));
             string adbPath = fullPath.Substring(Application.dataPath.Length + 1);
             _editorADBDir = adbPath.Replace("\\", "/") + "/";
         }
 
         static void StoreDOTweenDirs()
         {
-            string codeBase = Assembly.GetExecutingAssembly().CodeBase;
+//            string codeBase = Assembly.GetExecutingAssembly().CodeBase;
-            UriBuilder uri = new UriBuilder(codeBase);
+//            UriBuilder uri = new UriBuilder(codeBase);
-            _dotweenDir = Path.GetDirectoryName(Uri.UnescapeDataString(uri.Path));
+//            _dotweenDir = Path.GetDirectoryName(Uri.UnescapeDataString(uri.Path));
+            _dotweenDir = Path.GetDirectoryName(GetAssemblyFilePath(Assembly.GetExecutingAssembly()));
             string pathSeparator = _dotweenDir.IndexOf("/") != -1 ? "/" : "\\";
             _dotweenDir = _dotweenDir.Substring(0, _dotweenDir.LastIndexOf(pathSeparator) + 1);
 

_DOTween.Assembly/bin/DOTween.XML

@@ -781,12 +781,12 @@
         </member>
         <member name="M:DG.Tweening.TweenExtensions.PathGetPoint(DG.Tweening.Tween,System.Single)">
             <summary>
-            Returns the a point on a path (returns <code>Vector3.zero</code> if this is not a path tween, if the tween is invalid, or if the path is not yet initialized),
+            Returns a point on a path based on the given path percentage
-            based on the given path percentage (0 to 1).
+            (returns <code>Vector3.zero</code> if this is not a path tween, if the tween is invalid, or if the path is not yet initialized)
             A path is initialized after its tween starts, or immediately if the tween was created with the Path Editor (DOTween Pro feature).
             You can force a path to be initialized by calling <code>myTween.ForceInit()</code>.
             </summary>
-            <param name="pathPercentage">Percentage of the path on which to get the point (0 to 1)</param>
+            <param name="pathPercentage">Percentage of the path (0 to 1) on which to get the point</param>
         </member>
         <member name="M:DG.Tweening.TweenExtensions.PathLength(DG.Tweening.Tween)">
             <summary>

_DOTween.Assembly/bin/Editor/DOTweenEditor.XML

@@ -56,5 +56,10 @@
             <param name="adbFilePath">File path (relative to Unity's project folder)</param>
             <param name="createIfMissing">If TRUE and the requested asset doesn't exist, forces its creation</param>
         </member>
+        <member name="M:DG.DOTweenEditor.Core.EditorUtils.GetAssemblyFilePath(System.Reflection.Assembly)">
+            <summary>
+            Full path for the given loaded assembly, assembly file included
+            </summary>
+        </member>
     </members>
 </doc>