Merge branch 'hotfix/0.19.2'

Author: matkoch

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [vNext]
 
+## [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
+- Fixed compile errors in build template
+
 ## [0.19.1] / 2019-05-03
 - Fixed `RequirementService` to check for `InjectionAttributeBase`
 
@@ -352,7 +357,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.1...HEAD
+[vNext]: https://github.com/nuke-build/common/compare/0.19.2...HEAD
+[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
 [0.18.0]: https://github.com/nuke-build/common/compare/0.17.7...0.18.0

source/Nuke.Common/Execution/ExecutableTarget.cs

@@ -11,7 +11,7 @@
 
 namespace Nuke.Common.Execution
 {
-    [DebuggerDisplay("{" + nameof(ToDebugString) + "}")]
+    [DebuggerDisplay("{" + nameof(Name) + "}")]
     public class ExecutableTarget
     {
         internal ExecutableTarget()
@@ -44,10 +44,5 @@ internal IReadOnlyCollection<ExecutableTarget> AllDependencies
         public TimeSpan Duration { get; internal set; }
         public bool Invoked { get; internal set; }
         public string SkipReason { get; internal set; }
-
-        internal string ToDebugString()
-        {
-            return Name;
-        }
     }
 }

source/Nuke.Common/Execution/HandleHelpRequestAttribute.cs

@@ -0,0 +1,32 @@
+// Copyright 2019 Maintainers of NUKE.
+// Distributed under the MIT License.
+// https://github.com/nuke-build/nuke/blob/master/LICENSE
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Nuke.Common.Execution
+{
+    [AttributeUsage(AttributeTargets.Class)]
+    internal class HandleHelpRequestsAttribute : Attribute, IPostLogoBuildExtension
+    {
+        public void Execute(
+            NukeBuild build,
+            IReadOnlyCollection<ExecutableTarget> executableTargets,
+            IReadOnlyCollection<ExecutableTarget> executionPlan)
+        {
+            if (NukeBuild.Help || executionPlan.Count == 0)
+            {
+                Logger.Normal(HelpTextService.GetTargetsText(build.ExecutableTargets));
+                Logger.Normal(HelpTextService.GetParametersText(build));
+            }
+
+            if (NukeBuild.Plan)
+                ExecutionPlanHtmlService.ShowPlan(build.ExecutableTargets);
+
+            if (NukeBuild.Help || executionPlan.Count == 0 || NukeBuild.Plan)
+                Environment.Exit(exitCode: 0);
+        }
+    }
+}

source/Nuke.Common/Execution/HandleHelpRequestsAttribute.cs

@@ -45,8 +45,7 @@ namespace Nuke.Common
     /// </code>
     /// </example>
     [PublicAPI]
-    [HandleHelpRequest]
-    [HandlePlanRequest]
+    [HandleHelpRequests]
     [HandleShellCompletion]
     [HandleVisualStudioDebugging]
     public abstract partial class NukeBuild

source/Nuke.Common/Execution/HandlePlanRequestAttribute.cs

@@ -72,11 +72,18 @@ public override object GetValue(MemberInfo member, object instance)
             }
 
             var memberType = member.GetMemberType();
-            if (memberType.IsEnum)
-                return memberType.GetEnumNames().Select(x => (x, Enum.Parse(memberType, x)));
+
             if (memberType.IsSubclassOf(typeof(Enumeration)))
                 return memberType.GetFields(ReflectionService.Static).Select(x => (x.Name, x.GetValue()));
 
+            var enumType = memberType.IsEnum
+                ? memberType
+                : Nullable.GetUnderlyingType(memberType) is Type underlyingType && underlyingType.IsEnum
+                    ? underlyingType
+                    : null;
+            if (enumType != null)
+                return enumType.GetEnumNames().Select(x => (x, Enum.Parse(enumType, x)));
+
             return null;
         }
     }

source/Nuke.Common/NukeBuild.cs

@@ -39,7 +39,9 @@ public static Microsoft.Build.Evaluation.Project ParseProject(
             string configuration = null,
             string targetFramework = null)
         {
-            Environment.SetEnvironmentVariable("MSBUILD_EXE_PATH", s_msbuildPathResolver.Value);
+            Environment.SetEnvironmentVariable("MSBUILD_EXE_PATH",
+                Environment.GetEnvironmentVariable("MSBUILD_EXE_PATH") ??
+                s_msbuildPathResolver.Value);
 
             var projectCollection = new ProjectCollection();
             var msbuildProject = new Microsoft.Build.Evaluation.Project(

source/Nuke.Common/ParameterAttribute.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using Nuke.Common;
 using Nuke.Common.Execution;
@@ -132,8 +132,8 @@ class Build : NukeBuild
                     .SetSymbolSource(SymbolSource)                                              // NUGET
                     .SetApiKey(ApiKey)                                                          // NUGET
                     .CombineWith(                                                               // NUGET
-                        OutputDirectory.GlobFiles("*.nupkg"), (cs, v) => v)                     // NUGET && OUTPUT_DIR
-                        ArtifactsDirectory.GlobFiles("*.nupkg"), (cs, v) => v                   // NUGET && ARTIFACTS_DIR
+                        OutputDirectory.GlobFiles("*.nupkg"), (cs, v) => cs                     // NUGET && OUTPUT_DIR
+                        ArtifactsDirectory.GlobFiles("*.nupkg"), (cs, v) => cs                  // NUGET && ARTIFACTS_DIR
                             .SetTargetPath(v)),                                                 // NUGET
                 degreeOfParallelism: 5,                                                         // NUGET
                 completeOnFailure: true);                                                       // NUGET