Merge branch 'release/0.20.0'

matkoch · matkoch · commit ece91fc606c5 · 2019-05-29T22:05:59.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [vNext]
 
+## [0.20.0] / 2019-05-29
+- Changed `Solution.GetProject` to allow resolution from full path
+- Changed HTML execution plan to be shown left-to-right
+- Added `When` overload for combinatorial settings
+- Added `Project.GetOutputType` method for convenience
+- Added `GlobbingOptionsAttribute` for configuration of case-sensitivity
+- Fixed casing of `NuGet.exe`
+- Fixed `TeamServices` to resolve `BuildNumber` as `string`
+
 ## [0.19.2] / 2019-05-10
 - Fixed `ProjectModelTasks` to use existing `MSBUILD_EXE_PATH` value
 - Fixed `ParameterService` to consider nullable enum types in value set calculation
@@ -357,7 +366,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/common/compare/0.19.2...HEAD
+[vNext]: https://github.com/nuke-build/common/compare/0.20.0...HEAD
+[0.20.0]: https://github.com/nuke-build/common/compare/0.19.2...0.20.0
 [0.19.2]: https://github.com/nuke-build/common/compare/0.19.1...0.19.2
 [0.19.1]: https://github.com/nuke-build/common/compare/0.19.0...0.19.1
 [0.19.0]: https://github.com/nuke-build/common/compare/0.18.0...0.19.0
diff --git a/build/specifications/NuGet.json b/build/specifications/NuGet.json
@@ -10,7 +10,7 @@
   "officialUrl": "https://docs.microsoft.com/en-us/nuget/tools/nuget-exe-cli-reference",
   "help": "The NuGet Command Line Interface (CLI) provides the full extent of NuGet functionality to install, create, publish, and manage packages.",
   "packageId": "NuGet.CommandLine",
-  "packageExecutable": "nuget.exe",
+  "packageExecutable": "NuGet.exe",
   "tasks": [
     {
       "postfix": "Push",
diff --git a/source/Nuke.Common/BuildServers/TeamServices.cs b/source/Nuke.Common/BuildServers/TeamServices.cs
@@ -1,4 +1,4 @@
-// Copyright 2019 Maintainers of NUKE.
+﻿// Copyright 2019 Maintainers of NUKE.
 // Distributed under the MIT License.
 // https://github.com/nuke-build/nuke/blob/master/LICENSE
 
@@ -40,7 +40,7 @@ internal TeamServices(Action<string> messageSink = null)
         public string AgentWorkFolder => Variable("AGENT_WORKFOLDER");
         public string ArtifactStagingDirectory => Variable("BUILD_ARTIFACTSTAGINGDIRECTORY");
         public long BuildId => Variable<long>("BUILD_BUILDID");
-        public long BuildNumber => Variable<long>("BUILD_BUILDNUMBER");
+        [NoConvert] public string BuildNumber => Variable<string>("BUILD_BUILDNUMBER");
         public string BuildUri => Variable("BUILD_BUILDURI");
         public string BinariesDirectory => Variable("BUILD_BINARIESDIRECTORY");
         public string DefinitionName => Variable("BUILD_DEFINITIONNAME");
diff --git a/source/Nuke.Common/Execution/execution-plan.html b/source/Nuke.Common/Execution/execution-plan.html
@@ -73,10 +73,11 @@
 
   <body>
     <div class="mermaid">
-graph TD
+graph LR
 __GRAPH__
 
 linkStyle default interpolate basis
+        <!-- https://github.com/knsv/mermaid/issues/26 -->
     </div>
   </body>
 
diff --git a/source/Nuke.Common/IO/PathConstruction.cs b/source/Nuke.Common/IO/PathConstruction.cs
@@ -1,4 +1,4 @@
-// Copyright 2019 Maintainers of NUKE.
+﻿// Copyright 2019 Maintainers of NUKE.
 // Distributed under the MIT License.
 // https://github.com/nuke-build/nuke/blob/master/LICENSE
 
@@ -11,18 +11,39 @@
 using System.Linq;
 using GlobExpressions;
 using JetBrains.Annotations;
+using Nuke.Common.Execution;
 using Nuke.Common.Utilities;
 
 // ReSharper disable ArrangeMethodOrOperatorBody
 
 namespace Nuke.Common.IO
 {
+    /// <summary>
+    /// Indicates the case sensitivity used for globbing.
+    /// </summary>
+    public enum GlobbingCaseSensitivity
+    {
+        /// <summary>
+        /// Automatically determines whether to use case-sensitive or case-insensitive matching when globbing. This
+        /// means using case-insensitive matching when running on Windows, and case-sensitive otherwise.
+        /// </summary>
+        Auto,
+        /// <summary>
+        /// Globbing patterns will be case-sensitive.
+        /// </summary>
+        CaseSensitive,
+        /// <summary>
+        /// Globbing patterns will be case-insensitive.
+        /// </summary>
+        CaseInsensitive
+    }
+
     /// <summary>
     /// <p>Provides an abstraction for generating Windows/Unix/UNC-compliant
     /// file-system paths independently of the underlying operating system. Usages should be restricted to the moment
     /// of construction, i.e., avoid using it as part of an API.</p>
     /// <p>Casting a string with <c>(RelativePath)</c> will construct any intermediate part of a path using the specific separators
-    /// for the currently running operating-system. By using <c>(WinRelativePath)</c> and <c>(UnixRelativePath)</c> other separators can be 
+    /// for the currently running operating-system. By using <c>(WinRelativePath)</c> and <c>(UnixRelativePath)</c> other separators can be
     /// used intentionally. Casting with <c>(AbsolutePath)</c> ensures that the path is rooted as Windows/Unix/UNC-path. The operators
     /// <c>/</c> and <c>+</c> allow to append sub-directories.</p>
     /// <p>Resulting paths are automatically normalized if possible. So <c>C:\foo\..\bar\.</c> will become <c>C:\bar</c>.</p>
@@ -45,6 +66,24 @@ namespace Nuke.Common.IO
     [PublicAPI]
     public static class PathConstruction
     {
+        internal static GlobbingCaseSensitivity GlobbingCaseSensitivity;
+
+        private static GlobOptions GlobOptions
+        {
+            get
+            {
+                switch (GlobbingCaseSensitivity)
+                {
+                    case GlobbingCaseSensitivity.CaseSensitive:
+                        return GlobOptions.None;
+                    case GlobbingCaseSensitivity.CaseInsensitive:
+                        return GlobOptions.CaseInsensitive;
+                    default:
+                        return EnvironmentInfo.IsWin ? GlobOptions.CaseInsensitive : GlobOptions.None;
+                }
+            }
+        }
+
         // TODO: check usages
         [Pure]
         public static string GetRelativePath(string basePath, string destinationPath, bool normalize = true)
@@ -75,7 +114,7 @@ public static bool IsDescendantPath(string basePath, string destinationPath)
         public static IReadOnlyCollection<string> GlobFiles(string directory, params string[] patterns)
         {
             var directoryInfo = new DirectoryInfo(directory);
-            return patterns.SelectMany(x => directoryInfo.GlobFiles(x)).Select(x => x.FullName).ToList();
+            return patterns.SelectMany(x => Glob.Files(directoryInfo, x, GlobOptions)).Select(x => x.FullName).ToList();
         }
 
         public static IReadOnlyCollection<AbsolutePath> GlobFiles(this AbsolutePath directory, params string[] patterns)
@@ -87,7 +126,7 @@ public static IReadOnlyCollection<AbsolutePath> GlobFiles(this AbsolutePath dire
         public static IReadOnlyCollection<string> GlobDirectories(string directory, params string[] patterns)
         {
             var directoryInfo = new DirectoryInfo(directory);
-            return patterns.SelectMany(x => directoryInfo.GlobDirectories(x)).Select(x => x.FullName).ToList();
+            return patterns.SelectMany(x => Glob.Directories(directoryInfo, x, GlobOptions)).Select(x => x.FullName).ToList();
         }
 
         public static IReadOnlyCollection<AbsolutePath> GlobDirectories(this AbsolutePath directory, params string[] patterns)
@@ -415,4 +454,24 @@ public override string ToString()
             }
         }
     }
+
+    /// <summary>
+    /// Allows to configure the case-sensitivity used for globbing operations in <see cref="PathConstruction"/>.
+    /// </summary>
+    [PublicAPI]
+    [AttributeUsage(AttributeTargets.Class)]
+    public sealed class GlobbingOptionsAttribute : Attribute, IPreLogoBuildExtension
+    {
+        private readonly GlobbingCaseSensitivity _caseSensitivity;
+
+        public GlobbingOptionsAttribute(GlobbingCaseSensitivity caseSensitivity)
+        {
+            _caseSensitivity = caseSensitivity;
+        }
+
+        public void Execute(NukeBuild build, IReadOnlyCollection<ExecutableTarget> executableTargets, IReadOnlyCollection<ExecutableTarget> executionPlan)
+        {
+            PathConstruction.GlobbingCaseSensitivity = _caseSensitivity;
+        }
+    }
 }
diff --git a/source/Nuke.Common/ProjectModel/ProjectExtensions.cs b/source/Nuke.Common/ProjectModel/ProjectExtensions.cs
@@ -69,5 +69,11 @@ public static IReadOnlyCollection<string> GetTargetFrameworks(this Project proje
 
             return new string[0];
         }
+
+        public static string GetOutputType(this Project project)
+        {
+            var msbuildProject = project.GetMSBuildProject();
+            return msbuildProject.GetProperty("OutputType").EvaluatedValue;
+        }
     }
 }
diff --git a/source/Nuke.Common/ProjectModel/Solution.cs b/source/Nuke.Common/ProjectModel/Solution.cs
@@ -8,6 +8,7 @@
 using System.Text.RegularExpressions;
 using JetBrains.Annotations;
 using Nuke.Common.IO;
+using Nuke.Common.Utilities;
 
 namespace Nuke.Common.ProjectModel
 {
@@ -57,9 +58,10 @@ public SolutionFolder GetSolutionFolder(string name)
         }
 
         [CanBeNull]
-        public Project GetProject(string name)
+        public Project GetProject(string nameOrFullPath)
         {
-            return AllProjects.SingleOrDefault(x => name.Equals(x.Name, StringComparison.Ordinal));
+            return AllProjects.SingleOrDefault(x => nameOrFullPath.Equals(x.Name, StringComparison.Ordinal)) ??
+                   AllProjects.SingleOrDefault(x => x.Path.ToString().EqualsOrdinalIgnoreCase(nameOrFullPath));
         }
 
         public IEnumerable<Project> GetProjects(string wildcardPattern)
diff --git a/source/Nuke.Common/Tooling/ToolSettings.When.cs b/source/Nuke.Common/Tooling/ToolSettings.When.cs
@@ -14,5 +14,11 @@ public static T When<T>(this T settings, bool condition, Configure<T> configurat
         {
             return condition ? configurator(settings) : settings;
         }
+
+        public static T[] When<T>(this T[] settings, Func<T, bool> condition, Configure<T> configurator)
+            where T : ToolSettings
+        {
+            return settings.Select(x => condition(x) ? x : configurator(x)).ToArray();
+        }
     }
 }
diff --git a/source/Nuke.Common/Tools/NuGet/NuGet.Generated.cs b/source/Nuke.Common/Tools/NuGet/NuGet.Generated.cs
@@ -28,7 +28,7 @@ public static partial class NuGetTasks
         /// </summary>
         public static string NuGetPath =>
             ToolPathResolver.TryGetEnvironmentExecutable("NUGET_EXE") ??
-            ToolPathResolver.GetPackageExecutable("NuGet.CommandLine", "nuget.exe");
+            ToolPathResolver.GetPackageExecutable("NuGet.CommandLine", "NuGet.exe");
         public static Action<OutputType, string> NuGetLogger { get; set; } = ProcessTasks.DefaultLogger;
         /// <summary>
         ///   The NuGet Command Line Interface (CLI) provides the full extent of NuGet functionality to install, create, publish, and manage packages.

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`"officialUrl": "https://docs.microsoft.com/en-us/nuget/tools/nuget-exe-cli-reference",`
`11`	`11`	`"help": "The NuGet Command Line Interface (CLI) provides the full extent of NuGet functionality to install, create, publish, and manage packages.",`
`12`	`12`	`"packageId": "NuGet.CommandLine",`
`13`		`- "packageExecutable": "nuget.exe",`
	`13`	`+ "packageExecutable": "NuGet.exe",`
`14`	`14`	`"tasks": [`
`15`	`15`	`{`
`16`	`16`	`"postfix": "Push",`
Original file line number	Diff line number	Diff line change
`@@ -69,5 +69,11 @@ public static IReadOnlyCollection<string> GetTargetFrameworks(this Project proje`
`69`	`69`
`70`	`70`	`return new string[0];`
`71`	`71`	`}`
	`72`	`+`
	`73`	`+ public static string GetOutputType(this Project project)`
	`74`	`+ {`
	`75`	`+ var msbuildProject = project.GetMSBuildProject();`
	`76`	`+ return msbuildProject.GetProperty("OutputType").EvaluatedValue;`
	`77`	`+ }`
`72`	`78`	`}`
`73`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`using System.Text.RegularExpressions;`
`9`	`9`	`using JetBrains.Annotations;`
`10`	`10`	`using Nuke.Common.IO;`
	`11`	`+using Nuke.Common.Utilities;`
`11`	`12`
`12`	`13`	`namespace Nuke.Common.ProjectModel`
`13`	`14`	`{`
`@@ -57,9 +58,10 @@ public SolutionFolder GetSolutionFolder(string name)`
`57`	`58`	`}`
`58`	`59`
`59`	`60`	`[CanBeNull]`
`60`		`- public Project GetProject(string name)`
	`61`	`+ public Project GetProject(string nameOrFullPath)`
`61`	`62`	`{`
`62`		`- return AllProjects.SingleOrDefault(x => name.Equals(x.Name, StringComparison.Ordinal));`
	`63`	`+ return AllProjects.SingleOrDefault(x => nameOrFullPath.Equals(x.Name, StringComparison.Ordinal)) ??`
	`64`	`+ AllProjects.SingleOrDefault(x => x.Path.ToString().EqualsOrdinalIgnoreCase(nameOrFullPath));`
`63`	`65`	`}`
`64`	`66`
`65`	`67`	`public IEnumerable<Project> GetProjects(string wildcardPattern)`
Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,11 @@ public static T When<T>(this T settings, bool condition, Configure<T> configurat`
`14`	`14`	`{`
`15`	`15`	`return condition ? configurator(settings) : settings;`
`16`	`16`	`}`
	`17`	`+`
	`18`	`+ public static T[] When<T>(this T[] settings, Func<T, bool> condition, Configure<T> configurator)`
	`19`	`+ where T : ToolSettings`
	`20`	`+ {`
	`21`	`+ return settings.Select(x => condition(x) ? x : configurator(x)).ToArray();`
	`22`	`+ }`
`17`	`23`	`}`
`18`	`24`	`}`