Attempt at fixing slashes

hvanbakel · Sep 14, 2018 · 4bcc6e5 · 4bcc6e5
1 parent dafcc2f
commit 4bcc6e5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git 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(path);
+ return new DirectoryInfo(Extensions.MaybeAdjustFilePath(path));
  }
  }
  }

diff --git 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(filePath);
+ return new FileInfo(Extensions.MaybeAdjustFilePath(filePath));
  }
  )
  .Where(IsAssemblyInfoFile)

diff --git a/Project2015To2017/Transforms/AssemblyFilterHintedPackageReferencesTransformation.cs b/Project2015To2017/Transforms/AssemblyFilterHintedPackageReferencesTransformation.cs
@@ -45,7 +45,7 @@ bool AssemblyMatchesPackage(AssemblyReference assembly, string packagePath)
 
  var fullHintPath = Path.IsPathRooted(hintPath) ? hintPath : Path.GetFullPath(Path.Combine(projectPath, hintPath));
 
- return fullHintPath.ToLower().StartsWith(packagePath);
+ return Extensions.MaybeAdjustFilePath(fullHintPath).ToLower().StartsWith(Extensions.MaybeAdjustFilePath(packagePath));
  }
  }
  }

diff --git a/Project2015To2017/Transforms/ImportsTargetsFilterPackageReferencesTransformation.cs b/Project2015To2017/Transforms/ImportsTargetsFilterPackageReferencesTransformation.cs
@@ -21,7 +21,8 @@ public void Transform(Project definition)
 
  var packageReferenceIds = definition.PackageReferences.Select(x => x.Id).ToArray();
 
- var packagePaths = packageReferenceIds.Select(packageId => Path.Combine(nugetRepositoryPath, packageId).ToLower())
+ var adjustedPath = Extensions.MaybeAdjustFilePath(nugetRepositoryPath);
+ var packagePaths = packageReferenceIds.Select(packageId => Path.Combine(adjustedPath, packageId).ToLower())
  .ToArray();
 
  definition.Imports = FilteredImports(definition.Imports, packagePaths, projectPath);