Merge branch 'develop'

Author: GeorgDangl

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 All notable changes to **Nuke.GitHub** are documented here.
 
+## v1.6.0:
+- Update NUKE to 0.24.1
+
 ## v1.5.0:
 - Update NUKE to 0.19.0
 

Nuke.GitHub.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2027
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29609.76
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = ".build", "build\.build.csproj", "{C57DD98E-6C51-4277-BC58-4CE05F718788}"
 EndProject
@@ -26,7 +26,6 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{C57DD98E-6C51-4277-BC58-4CE05F718788}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C57DD98E-6C51-4277-BC58-4CE05F718788}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C57DD98E-6C51-4277-BC58-4CE05F718788}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CE8839DE-7523-43F6-A8AF-AE3CFE299A6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CE8839DE-7523-43F6-A8AF-AE3CFE299A6B}.Debug|Any CPU.Build.0 = Debug|Any CPU

build/.build.csproj

@@ -2,26 +2,21 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <RootNamespace></RootNamespace>
     <IsPackable>False</IsPackable>
     <NoWarn>CS0649;CS0169</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="0.19.0" />
-    <PackageReference Include="Nuke.CodeGeneration" Version="0.19.0" />
-    <PackageReference Include="GitVersion.CommandLine.DotNetCore" Version="5.0.0-beta2-75">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="docfx.console" Version="2.42.0">
+    <PackageReference Include="Nuke.CodeGeneration" Version="0.24.1" />
+    <PackageReference Include="Nuke.Common" Version="0.24.1" />
+    <PackageDownload Include="GitVersion.Tool" Version="[5.1.1]" />
+    <PackageReference Include="docfx.console" Version="2.48.1">
       <ExcludeAssets>build</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="Nuke.WebDocu" Version="1.3.1-beta0002" />
-    <PackageReference Include="Nuke.Azure.KeyVault" Version="0.4.5-beta0002" />
-    <PackageReference Include="Nuke.DocFX" Version="0.2.0" />
+    <PackageReference Include="Nuke.WebDocu" Version="1.5.0-beta0006" />
   </ItemGroup>
 
   <ItemGroup>

build/Build.cs

@@ -8,7 +8,6 @@
 using System;
 using System.IO;
 using System.Linq;
-using static Nuke.CodeGeneration.CodeGenerator;
 using static Nuke.Common.ChangeLog.ChangelogTasks;
 using static Nuke.Common.Tools.DotNet.DotNetTasks;
 using static Nuke.Common.EnvironmentInfo;
@@ -17,10 +16,12 @@
 using static Nuke.GitHub.ChangeLogExtensions;
 using static Nuke.GitHub.GitHubTasks;
 using static Nuke.WebDocu.WebDocuTasks;
-using Nuke.Azure.KeyVault;
-using static Nuke.DocFX.DocFXTasks;
-using Nuke.DocFX;
+using Nuke.Common.Tools.AzureKeyVault.Attributes;
+using static Nuke.Common.Tools.DocFX.DocFXTasks;
+using Nuke.Common.Tools.DocFX;
 using Nuke.Common.ProjectModel;
+using Nuke.Common.IO;
+using static Nuke.CodeGeneration.CodeGenerator;
 
 class Build : NukeBuild
 {
@@ -78,7 +79,7 @@ class Build : NukeBuild
             DotNetBuild(x => x
                 .SetConfiguration(Configuration)
                 .EnableNoRestore()
-                .SetFileVersion(GitVersion.GetNormalizedFileVersion())
+                .SetFileVersion(GitVersion.AssemblySemFileVer)
                 .SetAssemblyVersion(GitVersion.AssemblySemVer)
                 .SetInformationalVersion(GitVersion.InformationalVersion));
         });

src/Nuke.GitHub/GitHubTasks.cs

@@ -7,6 +7,7 @@
 using Nuke.Common;
 using Nuke.Common.Tooling;
 using Octokit;
+using Nuke.Common.Tools.GitHub;
 
 namespace Nuke.GitHub
 {

src/Nuke.GitHub/Nuke.GitHub.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
     <Description>GitHub interaction for NUKE Build</Description>
     <Authors>Georg Dangl</Authors>
     <Copyright>(c) $([System.DateTime]::Now.Year) Georg Dangl</Copyright>
@@ -10,9 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.1" />
-    <PackageReference Include="Octokit" Version="0.32.0" />
-    <PackageReference Include="Nuke.Common" Version="0.19.0" />
+    <PackageReference Include="Octokit" Version="0.40.0" />
+    <PackageReference Include="Nuke.Common" Version="0.24.1" />
   </ItemGroup>
 
 </Project>