Merge branch 'develop'

Author: GeorgDangl

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 All notable changes to **Nuke.GitHub** are documented here.
 
+## v1.1.0:
+- Update to NUKE 0.4.0
+
 ## v1.0.2
 - Use the official NUKE logo for the package
 

build/.build.csproj

@@ -9,7 +9,7 @@
     <NoWarn>CS0649;CS0169</NoWarn>
 
     <!-- NUKE CONFIGURATION -->
-    <NukeVersion>0.2.0</NukeVersion>
+    <NukeVersion>0.4.0</NukeVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,7 +19,7 @@
     <PackageReference Include="docfx.console" Version="2.31.0">
       <ExcludeAssets>build</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="Nuke.WebDocu" Version="1.0.2" />
+    <PackageReference Include="Nuke.WebDocu" Version="1.1.0" />
   </ItemGroup>
 
   <ItemGroup>

build/Build.cs

@@ -2,9 +2,9 @@
 using Nuke.Common.Tools.DocFx;
 using Nuke.Common.Tools.DotNet;
 using Nuke.Common.Tools.GitVersion;
-using Nuke.Core;
-using Nuke.Core.Utilities;
-using Nuke.Core.Utilities.Collections;
+using Nuke.Common;
+using Nuke.Common.Utilities;
+using Nuke.Common.Utilities.Collections;
 using Nuke.GitHub;
 using Nuke.WebDocu;
 using System;
@@ -15,12 +15,13 @@
 using static Nuke.Common.ChangeLog.ChangelogTasks;
 using static Nuke.Common.Tools.DocFx.DocFxTasks;
 using static Nuke.Common.Tools.DotNet.DotNetTasks;
-using static Nuke.Core.EnvironmentInfo;
-using static Nuke.Core.IO.FileSystemTasks;
-using static Nuke.Core.IO.PathConstruction;
+using static Nuke.Common.EnvironmentInfo;
+using static Nuke.Common.IO.FileSystemTasks;
+using static Nuke.Common.IO.PathConstruction;
 using static Nuke.GitHub.ChangeLogExtensions;
 using static Nuke.GitHub.GitHubTasks;
 using static Nuke.WebDocu.WebDocuTasks;
+using Nuke.Common.Tooling;
 
 class Build : NukeBuild
 {
@@ -42,6 +43,9 @@ class Build : NukeBuild
     [Parameter] string GitHubAuthenticationToken;
 
     string DocFxFile => SolutionDirectory / "docfx.json";
+
+    // This is used to to infer which dotnet sdk version to use when generating DocFX metadata
+    string DocFxDotNetSdkVersion = "2.1.4";
     string ChangeLogFile => RootDirectory / "CHANGELOG.md";
 
     Target Clean => _ => _
@@ -63,7 +67,8 @@ class Build : NukeBuild
         .Executes(() =>
         {
             DotNetBuild(s => DefaultDotNetBuild
-                .SetFileVersion(GitVersion.AssemblySemVer));
+                .SetFileVersion(GitVersion.GetNormalizedFileVersion())
+                .SetAssemblyVersion(GitVersion.AssemblySemVer));
         });
 
     Target Pack => _ => _
@@ -98,13 +103,12 @@ class Build : NukeBuild
         .DependsOn(Restore)
         .Executes(() =>
         {
-            if (IsLocalBuild)
-            {
-                SetVariable("VSINSTALLDIR", @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional");
-                SetVariable("VisualStudioVersion", "15.0");
-            }
-
-            DocFxMetadata(DocFxFile, s => s.SetLogLevel(DocFxLogLevel.Verbose));
+            // So it uses a fixed, known version of MsBuild to generate the metadata. Otherwise,
+            // updates of dotnet or Visual Studio could introduce incompatibilities and generation failures
+            var dotnetPath = Path.GetDirectoryName(ToolPathResolver.GetPathExecutable("dotnet.exe"));
+            var msBuildPath = Path.Combine(dotnetPath, "sdk", DocFxDotNetSdkVersion, "MSBuild.dll");
+            SetVariable("MSBUILD_EXE_PATH", msBuildPath);
+            DocFxMetadata(DocFxFile, s => s.SetLogLevel(DocFxLogLevel.Warning));
         });
 
     Target BuildDocumentation => _ => _
@@ -122,7 +126,7 @@ class Build : NukeBuild
 
             DocFxBuild(DocFxFile, s => s
                 .ClearXRefMaps()
-                .SetLogLevel(DocFxLogLevel.Verbose));
+                .SetLogLevel(DocFxLogLevel.Warning));
 
             File.Delete(SolutionDirectory / "index.md");
             Directory.Delete(SolutionDirectory / "api", true);
@@ -148,7 +152,7 @@ class Build : NukeBuild
         .DependsOn(Pack)
         .Requires(() => GitHubAuthenticationToken)
         .OnlyWhen(() => GitVersion.BranchName.Equals("master") || GitVersion.BranchName.Equals("origin/master"))
-        .Executes<Task>(async () =>
+        .Executes(() =>
         {
             var releaseTag = $"v{GitVersion.MajorMinorPatch}";
 
@@ -159,23 +163,26 @@ class Build : NukeBuild
 
             var repositoryInfo = GetGitHubRepositoryInfo(GitRepository);
 
-            await PublishRelease(new GitHubReleaseSettings()
-                .SetArtifactPaths(GlobFiles(OutputDirectory, "*.nupkg").NotEmpty().ToArray())
-                .SetCommitSha(GitVersion.Sha)
-                .SetReleaseNotes(completeChangeLog)
-                .SetRepositoryName(repositoryInfo.repositoryName)
-                .SetRepositoryOwner(repositoryInfo.gitHubOwner)
-                .SetTag(releaseTag)
-                .SetToken(GitHubAuthenticationToken)
-            );
+            PublishRelease(new GitHubReleaseSettings()
+                    .SetArtifactPaths(GlobFiles(OutputDirectory, "*.nupkg").NotEmpty().ToArray())
+                    .SetCommitSha(GitVersion.Sha)
+                    .SetReleaseNotes(completeChangeLog)
+                    .SetRepositoryName(repositoryInfo.repositoryName)
+                    .SetRepositoryOwner(repositoryInfo.gitHubOwner)
+                    .SetTag(releaseTag)
+                    .SetToken(GitHubAuthenticationToken)
+                )
+                .ConfigureAwait(false)
+                .GetAwaiter()
+                .GetResult();
         });
 
     Target Generate => _ => _
         .DependsOn(Restore)
         .Executes(() =>
         {
             GenerateCode(
-                metadataDirectory: RootDirectory / "src" / "Nuke.GitHub" / "MetaData",
+                specificationDirectory: RootDirectory / "src" / "Nuke.GitHub" / "MetaData",
                 generationBaseDirectory: RootDirectory / "src" / "Nuke.GitHub",
                 baseNamespace: "Nuke.GitHub"
             );

src/Nuke.GitHub/GitHubTasks.Generated.cs

@@ -1,15 +1,15 @@
-// Copyright Matthias Koch 2018.
+// Copyright Matthias Koch, Sebastian Karasek 2018.
 // Distributed under the MIT License.
 // https://github.com/nuke-build/nuke/blob/master/LICENSE
 
-// Generated with Nuke.CodeGeneration, Version: 0.2.0 [CommitSha: 2b38bd4a].
+// Generated with Nuke.CodeGeneration, Version: 0.4.0 [CommitSha: c494ebb7].
 
 using JetBrains.Annotations;
+using Nuke.Common;
+using Nuke.Common.Execution;
+using Nuke.Common.Tooling;
 using Nuke.Common.Tools;
-using Nuke.Core;
-using Nuke.Core.Execution;
-using Nuke.Core.Tooling;
-using Nuke.Core.Utilities.Collections;
+using Nuke.Common.Utilities.Collections;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;

src/Nuke.GitHub/GitHubTasks.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Nuke.Common.Git;
-using Nuke.Core;
+using Nuke.Common;
 using Octokit;
 
 namespace Nuke.GitHub

src/Nuke.GitHub/Nuke.GitHub.csproj

@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="11.1.0" />
     <PackageReference Include="Octokit" Version="0.29.0" />
-    <PackageReference Include="Nuke.Common" Version="0.2.0" />
+    <PackageReference Include="Nuke.Common" Version="0.4.0" />
   </ItemGroup>
 
 </Project>