Fixed issues with resolve relative path to solution

davidfowl · Jun 5, 2011 · 8dd3f30 · 8dd3f30
1 parent ff8cdd3
commit 8dd3f30
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/MSBuild.psm1 b/MSBuild.psm1
@@ -84,7 +84,11 @@ function Add-SolutionDirProperty {
         $buildProject = $_ | Get-MSBuildProject
 
          if(!($buildProject.Xml.Properties | ?{ $_.Name -eq 'SolutionDir' })) {
-            $relativeSolutionPath = [NuGet.PathUtility]::EnsureTrailingSlash([NuGet.PathUtility]::GetRelativePath($_.FullName, (Get-SolutionDir)))
+            # Get the relative path to the solution
+            $relativeSolutionPath = [NuGet.PathUtility]::GetRelativePath($_.FullName, $dte.Solution.Properties.Item("Path").Value)
+            $relativeSolutionPath = [IO.Path]::GetDirectoryName($relativeSolutionPath)
+            $relativeSolutionPath = [NuGet.PathUtility]::EnsureTrailingSlash($relativeSolutionPath)
+
             $solutionDirProperty = $buildProject.Xml.AddProperty("SolutionDir", $relativeSolutionPath)
             $solutionDirProperty.Condition = '$(SolutionDir) == '''' Or $(SolutionDir) == ''*Undefined*'''
             $_.Save()

diff --git a/NuGetPowerTools.nuspec b/NuGetPowerTools.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>NuGetPowerTools</id>
-    <version>0.25</version>
+    <version>0.26</version>
     <authors>David Fowler</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Powershell goodies that make working with nuget even easier!</description>