Merge pull request libgit2#1409 from libgit2/ethomson/managedpath

carlosmn · web-flow · commit aa0602696ca8 · 2017-01-13T16:15:27.000+01:00
NativePath: use Assembly.CodeBase
diff --git a/LibGit2Sharp/GlobalSettings.cs b/LibGit2Sharp/GlobalSettings.cs
@@ -23,7 +23,26 @@ static GlobalSettings()
         {
             if (Platform.OperatingSystem == OperatingSystemType.Windows)
             {
-                string managedPath = new Uri(Assembly.GetExecutingAssembly().EscapedCodeBase).LocalPath;
+                /* Assembly.CodeBase is not actually a correctly formatted
+                 * URI.  It's merely prefixed with `file:///` and has its
+                 * backslashes flipped.  This is superior to EscapedCodeBase,
+                 * which does not correctly escape things, and ambiguates a
+                 * space (%20) with a literal `%20` in the path.  Sigh.
+                 */
+                var managedPath = Assembly.GetExecutingAssembly().CodeBase;
+                if (managedPath == null)
+                {
+                    managedPath = Assembly.GetExecutingAssembly().Location;
+                }
+                else if (managedPath.StartsWith("file:///"))
+                {
+                    managedPath = managedPath.Substring(8).Replace('/', '\\');
+                }
+                else if (managedPath.StartsWith("file://"))
+                {
+                    managedPath = @"\\" + managedPath.Substring(7).Replace('/', '\\');
+                }
+
                 nativeLibraryPath = Path.Combine(Path.Combine(Path.GetDirectoryName(managedPath), "lib"), "win32");
             }
 
