fixed some edge cases when generating symbolic links

XRTK-Core/Packages/com.xrtk.core/Editor/AssemblyInfo.cs

@@ -5,7 +5,7 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.2.17")]
+[assembly: AssemblyVersion("0.2.18")]
 [assembly: AssemblyTitle("com.xrtk.core.editor")]
 [assembly: AssemblyCompany("XRTK")]
 [assembly: AssemblyCopyright("Copyright (c) XRTK. All rights reserved.")]

XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/SymbolicLinks/SymbolicLink.cs

@@ -14,37 +14,37 @@ public SymbolicLink() { }
 
         public SymbolicLink(string sourceRelativePath, string targetRelativePath)
         {
-            this.sourceRelativePath = sourceRelativePath;
-            this.targetRelativePath = targetRelativePath;
+            SourceRelativePath = sourceRelativePath;
+            TargetRelativePath = targetRelativePath;
         }
 
         [SerializeField]
         private string sourceRelativePath;
 
         public string SourceRelativePath
         {
-            get => sourceRelativePath.ForwardSlashes();
-            internal set => sourceRelativePath = value.ForwardSlashes();
+            get => sourceRelativePath;
+            internal set => sourceRelativePath = value.ForwardSlashes().Replace(SymbolicLinker.ProjectRoot, string.Empty);
         }
 
         public string SourceAbsolutePath
         {
             get => $"{SymbolicLinker.ProjectRoot}{sourceRelativePath}".ForwardSlashes();
-            internal set => sourceRelativePath = value.ForwardSlashes().Replace(SymbolicLinker.ProjectRoot, string.Empty);
+            internal set => sourceRelativePath = value;
         }
 
         [SerializeField]
         private string targetRelativePath;
 
         public string TargetRelativePath
         {
-            get => targetRelativePath.ForwardSlashes();
-            internal set => targetRelativePath = value.ForwardSlashes();
+            get => targetRelativePath;
+            internal set => targetRelativePath = value.ForwardSlashes().Replace(SymbolicLinker.ProjectRoot, string.Empty);
         }
         public string TargetAbsolutePath
         {
             get => $"{SymbolicLinker.ProjectRoot}{targetRelativePath}".ForwardSlashes();
-            internal set => targetRelativePath = value.ForwardSlashes().Replace(SymbolicLinker.ProjectRoot, string.Empty);
+            internal set => targetRelativePath = value;
         }
 
         [SerializeField]

XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/SymbolicLinks/SymbolicLinker.cs

@@ -37,7 +37,7 @@ static SymbolicLinker()
 
         private static GUIStyle symbolicLinkMarkerStyle;
 
-        internal static string ProjectRoot => GitUtilities.RepositoryRootDir;
+        internal static string ProjectRoot => GitUtilities.RepositoryRootDir.ForwardSlashes();
 
         /// <summary>
         /// Is the sync task running?
@@ -211,7 +211,7 @@ internal static bool Add(this SymbolicLink newLink)
                 return false;
             }
 
-            newLink.TargetAbsolutePath = AddSubfolderPathToTarget(newLink.SourceAbsolutePath, newLink.TargetAbsolutePath);
+            newLink.TargetRelativePath = AddSubfolderPathToTarget(newLink.SourceRelativePath, newLink.TargetRelativePath);
 
             if (!CreateSymbolicLink(newLink))
             {
@@ -349,9 +349,7 @@ private static bool IsSymbolicPath(string path)
         }
 
         internal static bool Validate(this SymbolicLink link)
-        {
-            return ValidateSymbolicPath(link.TargetAbsolutePath, link.SourceAbsolutePath);
-        }
+            => ValidateSymbolicPath(link.TargetAbsolutePath, link.SourceAbsolutePath);
 
         private static bool ValidateSymbolicPath(string targetAbsolutePath, string sourceAbsolutePath = null)
         {

XRTK-Core/Packages/com.xrtk.core/Runtime/AssemblyInfo.cs

@@ -6,7 +6,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-[assembly: AssemblyVersion("0.2.17")]
+[assembly: AssemblyVersion("0.2.18")]
 [assembly: AssemblyTitle("com.xrtk.core")]
 [assembly: AssemblyCompany("XRTK")]
 [assembly: AssemblyCopyright("Copyright (c) XRTK. All rights reserved.")]

XRTK-Core/Packages/com.xrtk.core/Runtime/Extensions/StringExtensions.cs

@@ -21,19 +21,15 @@ public static class StringExtensions
         /// <param name="toEncode">String to encode.</param>
         /// <returns>Encoded string.</returns>
         public static string EncodeTo64(this string toEncode)
-        {
-            return Convert.ToBase64String(Encoding.ASCII.GetBytes(toEncode));
-        }
+            => Convert.ToBase64String(Encoding.ASCII.GetBytes(toEncode));
 
         /// <summary>
         /// Decodes string from base 64 ASCII.
         /// </summary>
         /// <param name="encodedData">String to decode.</param>
         /// <returns>Decoded string.</returns>
         public static string DecodeFrom64(this string encodedData)
-        {
-            return Encoding.ASCII.GetString(Convert.FromBase64String(encodedData));
-        }
+            => Encoding.ASCII.GetString(Convert.FromBase64String(encodedData));
 
         /// <summary>
         /// Capitalize the first character and add a space before
@@ -78,33 +74,25 @@ public static string ToProperCase(this string value)
         /// Replaces all back slashes in the string with forward slashes.
         /// </summary>
         public static string ForwardSlashes(this string value)
-        {
-            return value.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
-        }
+            => value.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
 
         /// <summary>
         /// Replaces all forward slashes in the string with back slashes.
         /// </summary>
         public static string BackSlashes(this string value)
-        {
-            return value.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
-        }
+            => value.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
 
         /// <summary>
         /// Returns the URI path, excluding the filename
         /// </summary>
         public static string PathFromURI(this string value)
-        {
-            return value.Substring(0, value.LastIndexOf("/", StringComparison.Ordinal) + 1);
-        }
+            => value.Substring(0, value.LastIndexOf("/", StringComparison.Ordinal) + 1);
 
         /// <summary>
         /// Returns the filename from a URI path
         /// </summary>
         public static string FilenameFromURI(this string value)
-        {
-            return value.Substring(value.LastIndexOf("/", StringComparison.Ordinal) + 1, value.Length - value.LastIndexOf("/", StringComparison.Ordinal) - 1);
-        }
+            => value.Substring(value.LastIndexOf("/", StringComparison.Ordinal) + 1, value.Length - value.LastIndexOf("/", StringComparison.Ordinal) - 1);
 
         /// <summary>
         /// Creates a relative path from one file or folder to another.

XRTK-Core/Packages/com.xrtk.core/package.json

@@ -10,7 +10,7 @@
     "Mixed Reality",
     "DI"
   ],
-  "version": "0.2.17",
+  "version": "0.2.18",
   "unity": "2019.4",
   "license": "MIT",
   "repository": {