Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
GeorgDangl committed Nov 12, 2020
2 parents 1a4db78 + 4b50108 commit 81e63cc
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 12 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

All notable changes to **Nuke.GitHub** are documented here.

## v2.0.0:
- Update NUKE to v5.0.0

## v1.6.2:
- Update internal dependencies and regenerate code

Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Nuke.GitHub

[![Build Status](https://jenkins.dangl.me/buildStatus/icon?job=Nuke.GitHub/develop)](https://jenkins.dangl.me/job/Nuke.GitHub/develop)
[![Build Status](https://jenkins.dangl.me/buildStatus/icon?job=GeorgDangl%2FNuke.GitHub%2Fdevelop)](https://jenkins.dangl.me/job/GeorgDangl/job/Nuke.GitHub/job/develop/)

[![Built with Nuke](http://nuke.build/rounded)](https://www.nuke.build)

![NuGet](https://img.shields.io/nuget/v/Nuke.GitHub.svg)
Expand Down
10 changes: 5 additions & 5 deletions build/.build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<RootNamespace></RootNamespace>
<IsPackable>False</IsPackable>
<NoWarn>CS0649;CS0169</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nuke.CodeGeneration" Version="0.24.11" />
<PackageReference Include="Nuke.Common" Version="0.24.11" />
<PackageReference Include="Nuke.CodeGeneration" Version="5.0.0" />
<PackageReference Include="Nuke.Common" Version="5.0.0" />
<PackageDownload Include="GitVersion.Tool" Version="[5.1.1]" />
<PackageReference Include="docfx.console" Version="2.56.1">
<PackageReference Include="docfx.console" Version="2.56.5">
<ExcludeAssets>build</ExcludeAssets>
</PackageReference>
<PackageReference Include="Nuke.WebDocu" Version="1.6.0" />
<PackageReference Include="Nuke.WebDocu" Version="2.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class Build : NukeBuild
[GitVersion] readonly GitVersion GitVersion;
[GitRepository] readonly GitRepository GitRepository;

[Parameter] readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
[Parameter] readonly string Configuration = IsLocalBuild ? "Debug" : "Release";

[KeyVaultSecret] string DocuBaseUrl;
[KeyVaultSecret] string GitHubAuthenticationToken;
Expand Down Expand Up @@ -102,7 +102,7 @@ class Build : NukeBuild

Target Push => _ => _
.DependsOn(Pack)
.Requires(() => Configuration == Configuration.Release)
.Requires(() => Configuration == "Release")
.Executes(() =>
{
if (string.IsNullOrWhiteSpace(PublicMyGetSource))
Expand Down
2 changes: 1 addition & 1 deletion src/Nuke.GitHub/GitHubSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public partial class GitHubSettings
/// <summary>
/// This property is missing in the auto generated code and I have no idea what this should return by default.
/// </summary>
public override Action<OutputType, string> CustomLogger => null;
public override Action<OutputType, string> ProcessCustomLogger => null;

public void Validate()
{
Expand Down
6 changes: 3 additions & 3 deletions src/Nuke.GitHub/Nuke.GitHub.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<Description>GitHub interaction for NUKE Build</Description>
<Authors>Georg Dangl</Authors>
<Copyright>(c) $([System.DateTime]::Now.Year) Georg Dangl</Copyright>
Expand All @@ -10,8 +10,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Octokit" Version="0.40.0" />
<PackageReference Include="Nuke.Common" Version="0.24.11" />
<PackageReference Include="Octokit" Version="0.48.0" />
<PackageReference Include="Nuke.Common" Version="5.0.0" />
</ItemGroup>

</Project>

0 comments on commit 81e63cc

Please sign in to comment.