From c972c15a6cabe446e38c0ce1253cbd3383a3db8a Mon Sep 17 00:00:00 2001 From: Andrew Boyarshin Date: Mon, 10 Sep 2018 18:26:41 +0700 Subject: [PATCH] Minor slashes fix improvements for #193 --- Project2015To2017/Definition/Solution.cs | 2 +- Project2015To2017/Reading/AssemblyInfoReader.cs | 2 +- .../AssemblyFilterHintedPackageReferencesTransformation.cs | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Project2015To2017/Definition/Solution.cs b/Project2015To2017/Definition/Solution.cs index 90c55ab..87ab9d5 100644 --- a/Project2015To2017/Definition/Solution.cs +++ b/Project2015To2017/Definition/Solution.cs @@ -28,7 +28,7 @@ public DirectoryInfo NuGetPackagesPath //return the explicitly set path, or if there isn't one, then assume the 'packages' folder is in the solution folder var path = repositoryPathSetting ?? Path.GetFullPath(Path.Combine(solutionFolder, "packages")); - return new DirectoryInfo(Extensions.MaybeAdjustFilePath(path)); + return new DirectoryInfo(Extensions.MaybeAdjustFilePath(path, solutionFolder)); } } } diff --git a/Project2015To2017/Reading/AssemblyInfoReader.cs b/Project2015To2017/Reading/AssemblyInfoReader.cs index d445309..e340fba 100644 --- a/Project2015To2017/Reading/AssemblyInfoReader.cs +++ b/Project2015To2017/Reading/AssemblyInfoReader.cs @@ -35,7 +35,7 @@ public AssemblyAttributes Read(Project project) .Select(x => { var filePath = Path.IsPathRooted(x) ? x : Path.GetFullPath(Path.Combine(projectPath, x)); - return new FileInfo(Extensions.MaybeAdjustFilePath(filePath)); + return new FileInfo(Extensions.MaybeAdjustFilePath(filePath, projectPath)); } ) .Where(IsAssemblyInfoFile) diff --git a/Project2015To2017/Transforms/AssemblyFilterHintedPackageReferencesTransformation.cs b/Project2015To2017/Transforms/AssemblyFilterHintedPackageReferencesTransformation.cs index aa96da7..9857e50 100644 --- a/Project2015To2017/Transforms/AssemblyFilterHintedPackageReferencesTransformation.cs +++ b/Project2015To2017/Transforms/AssemblyFilterHintedPackageReferencesTransformation.cs @@ -43,9 +43,11 @@ bool AssemblyMatchesPackage(AssemblyReference assembly, string packagePath) return false; } + hintPath = Extensions.MaybeAdjustFilePath(hintPath, projectPath); + var fullHintPath = Path.IsPathRooted(hintPath) ? hintPath : Path.GetFullPath(Path.Combine(projectPath, hintPath)); - return Extensions.MaybeAdjustFilePath(fullHintPath).ToLower().StartsWith(Extensions.MaybeAdjustFilePath(packagePath)); + return fullHintPath.ToLowerInvariant().StartsWith(Extensions.MaybeAdjustFilePath(packagePath, projectPath)); } } }