Skip to content

Commit a4dd964

Browse files
committed
Merge branch 'hotfix/0.17.5'
2 parents a95caaf + b310429 commit a4dd964

File tree

3 files changed

+18
-14
lines changed

3 files changed

+18
-14
lines changed

CHANGELOG.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
66

77
## [vNext]
88

9+
## [0.17.5] / 2019-03-03
10+
- Fixed `GlobDirectories` and `GlobFiles` to not collect items lazily
11+
912
## [0.17.4] / 2019-03-02
1013
- Fixed bootstrapping script to not set `NUGET_XMLDOC_MODE`
1114

@@ -321,7 +324,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
321324
- Added CLT tasks for Git
322325
- Fixed background color in console output
323326

324-
[vNext]: https://github.com/nuke-build/common/compare/0.17.4...HEAD
327+
[vNext]: https://github.com/nuke-build/common/compare/0.17.5...HEAD
328+
[0.17.5]: https://github.com/nuke-build/common/compare/0.17.4...0.17.5
325329
[0.17.4]: https://github.com/nuke-build/common/compare/0.17.3...0.17.4
326330
[0.17.3]: https://github.com/nuke-build/common/compare/0.17.2...0.17.3
327331
[0.17.2]: https://github.com/nuke-build/common/compare/0.17.1...0.17.2

build/Build.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ from framework in project.GetTargetFrameworks()
161161
});
162162

163163
Target Publish => _ => _
164-
.DependsOn(Test, Pack)
164+
.DependsOn(Clean, Test, Pack)
165165
.Requires(() => ApiKey, () => SlackWebhook, () => GitterAuthToken)
166166
.Requires(() => GitHasCleanWorkingCopy())
167167
.Requires(() => Configuration.Equals(Configuration.Release))

source/Nuke.Common/IO/PathConstruction.cs

+12-12
Original file line numberDiff line numberDiff line change
@@ -72,27 +72,27 @@ public static bool IsDescendantPath(string basePath, string destinationPath)
7272
}
7373

7474
[Pure]
75-
public static IEnumerable<string> GlobFiles(string directory, params string[] patterns)
75+
public static IReadOnlyCollection<string> GlobFiles(string directory, params string[] patterns)
7676
{
7777
var directoryInfo = new DirectoryInfo(directory);
78-
return patterns.SelectMany(x => directoryInfo.GlobFiles(x)).Select(x => x.FullName);
78+
return patterns.SelectMany(x => directoryInfo.GlobFiles(x)).Select(x => x.FullName).ToList();
7979
}
8080

81-
[Pure]
82-
public static IEnumerable<string> GlobDirectories(string directory, params string[] patterns)
81+
public static IReadOnlyCollection<AbsolutePath> GlobFiles(this AbsolutePath directory, params string[] patterns)
8382
{
84-
var directoryInfo = new DirectoryInfo(directory);
85-
return patterns.SelectMany(x => directoryInfo.GlobDirectories(x)).Select(x => x.FullName);
83+
return GlobFiles((string) directory, patterns).Select(x => (AbsolutePath) x).ToList();
8684
}
87-
88-
public static IEnumerable<AbsolutePath> GlobDirectories(this AbsolutePath directory, params string[] patterns)
85+
86+
[Pure]
87+
public static IReadOnlyCollection<string> GlobDirectories(string directory, params string[] patterns)
8988
{
90-
return GlobDirectories((string) directory, patterns).Select(x => (AbsolutePath) x);
89+
var directoryInfo = new DirectoryInfo(directory);
90+
return patterns.SelectMany(x => directoryInfo.GlobDirectories(x)).Select(x => x.FullName).ToList();
9191
}
92-
93-
public static IEnumerable<AbsolutePath> GlobFiles(this AbsolutePath directory, params string[] patterns)
92+
93+
public static IReadOnlyCollection<AbsolutePath> GlobDirectories(this AbsolutePath directory, params string[] patterns)
9494
{
95-
return GlobFiles((string) directory, patterns).Select(x => (AbsolutePath) x);
95+
return GlobDirectories((string) directory, patterns).Select(x => (AbsolutePath) x).ToList();
9696
}
9797

9898
private const char WinSeparator = '\\';

0 commit comments

Comments
 (0)