Skip to content

Commit

Permalink
Merge branch 'hotfix/0.10.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
matkoch committed Oct 5, 2018
2 parents f9a2faf + 1f9c779 commit f2b740d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [vNext]

## [0.10.3] / 2018-10-05
- Fixed `WinRelativePath` and `UnixRelativePath` to use correct separator

## [0.10.2] / 2018-10-04
- Fixed `RequirementService` to also support shorthand for properties

Expand Down Expand Up @@ -164,7 +167,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Added CLT tasks for Git
- Fixed background color in console output

[vNext]: https://github.com/nuke-build/nuke/compare/0.10.2...HEAD
[vNext]: https://github.com/nuke-build/nuke/compare/0.10.3...HEAD
[0.10.3]: https://github.com/nuke-build/nuke/compare/0.10.2...0.10.3
[0.10.2]: https://github.com/nuke-build/nuke/compare/0.10.1...0.10.2
[0.10.1]: https://github.com/nuke-build/nuke/compare/0.10.0...0.10.1
[0.10.0]: https://github.com/nuke-build/nuke/compare/0.9.1...0.10.0
Expand Down
3 changes: 3 additions & 0 deletions source/Nuke.Common.Tests/PathConstructionTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,9 @@ public void RelativePath_Specific()
{
((string) ((UnixRelativePath) "foo" / "bar")).Should().Be("foo/bar");
((string) ((WinRelativePath) "foo" / "bar")).Should().Be("foo\\bar");

((string) (UnixRelativePath) "foo\\bar").Should().Be("foo/bar");
((string) (WinRelativePath) "foo/bar").Should().Be("foo\\bar");
}

private static string ParseRelativePath(object[] parts)
Expand Down
4 changes: 2 additions & 2 deletions source/Nuke.Common/IO/PathConstruction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ protected UnixRelativePath(string path, char? separator)

public static explicit operator UnixRelativePath([CanBeNull] string path)
{
return new UnixRelativePath(NormalizePath(path), UnixSeparator);
return new UnixRelativePath(NormalizePath(path, UnixSeparator), UnixSeparator);
}
}

Expand All @@ -314,7 +314,7 @@ protected WinRelativePath(string path, char? separator)

public static explicit operator WinRelativePath([CanBeNull] string path)
{
return new WinRelativePath(NormalizePath(path), WinSeparator);
return new WinRelativePath(NormalizePath(path, WinSeparator), WinSeparator);
}
}

Expand Down

0 comments on commit f2b740d

Please sign in to comment.