Merge pull request #164 from jaredpar/fix-generic

Couple of bug fixes
GitTools · Jul 6, 2017 · c69ed59 · c69ed59
2 parents e6e222c + 26fb807
commit c69ed59
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/GitLink.NuGet/GitLink.NuGet.nuproj b/src/GitLink.NuGet/GitLink.NuGet.nuproj
@@ -14,7 +14,9 @@
     <ProjectGuid>29e78909-b7fb-472c-a9a0-1749a8be9a9a</ProjectGuid>
   </PropertyGroup>
   <PropertyGroup>
-    <NuProjPath>$(UserProfile)\.nuget\packages\NuProj\0.11.14-beta\tools</NuProjPath>
+    <_NuGetRoot>$(UserProfile)\.nuget\packages</_NuGetRoot>
+    <_NuGetRoot Condition="'$(NUGET_PACKAGES)' != ''">$(NUGET_PACKAGES)</_NuGetRoot>
+    <NuProjPath>$(_NuGetRoot)\NuProj\0.11.14-beta\tools</NuProjPath>
   </PropertyGroup>
   <Import Project="$(NuProjPath)\NuProj.props" Condition="Exists('$(NuProjPath)\NuProj.props')" />
   <PropertyGroup Label="Configuration">
@@ -47,4 +49,4 @@
     <Content Include="tools\LICENSE.txt" />
   </ItemGroup>
   <Import Project="$(NuProjPath)\NuProj.targets" />
-</Project>
+</Project>
diff --git a/src/GitLink/Extensions/RepositoryExtensions.cs b/src/GitLink/Extensions/RepositoryExtensions.cs
@@ -74,7 +74,7 @@ private static string GetRelativePath(string target, string relativeTo)
 
             Uri baseUri = new Uri(relativeTo, UriKind.Absolute);
             Uri targetUri = new Uri(target, UriKind.Absolute);
-            return baseUri.MakeRelativeUri(targetUri).ToString();
+            return Uri.UnescapeDataString(baseUri.MakeRelativeUri(targetUri).ToString());
         }
     }
 }