Skip to content

Commit c46a662

Browse files
GeorgDanglGeorgDangl
committed
Merge branch 'develop'
2 parents 73403bd + 9c54846 commit c46a662

13 files changed

+244
-496
lines changed

‎.nuke/build.schema.json

Lines changed: 52 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,5 @@
11
{
22
"$schema": "http://json-schema.org/draft-04/schema#",
3-
"properties": {
4-
"Configuration": {
5-
"type": "string"
6-
},
7-
"DanglCiCdTeamsWebhookUrl": {
8-
"type": "string"
9-
},
10-
"DanglPublicFeedSource": {
11-
"type": "string"
12-
},
13-
"DocuBaseUrl": {
14-
"type": "string"
15-
},
16-
"FeedzAccessToken": {
17-
"type": "string"
18-
},
19-
"GitHubAuthenticationToken": {
20-
"type": "string"
21-
},
22-
"KeyVaultBaseUrl": {
23-
"type": "string"
24-
},
25-
"KeyVaultClientId": {
26-
"type": "string"
27-
},
28-
"KeyVaultClientSecret": {
29-
"type": "string"
30-
},
31-
"KeyVaultTenantId": {
32-
"type": "string"
33-
},
34-
"NuGetApiKey": {
35-
"type": "string"
36-
},
37-
"NukeGitHubDocuApiKey": {
38-
"type": "string"
39-
},
40-
"NukeWebDocuDocuApiKey": {
41-
"type": "string"
42-
},
43-
"Solution": {
44-
"type": "string",
45-
"description": "Path to a solution file that is automatically loaded. Default is Nuke.GitHub.sln"
46-
}
47-
},
483
"definitions": {
494
"Host": {
505
"type": "string",
@@ -150,5 +105,56 @@
150105
}
151106
}
152107
},
153-
"$ref": "#/definitions/NukeBuild"
108+
"allOf": [
109+
{
110+
"properties": {
111+
"Configuration": {
112+
"type": "string"
113+
},
114+
"DanglCiCdTeamsWebhookUrl": {
115+
"type": "string"
116+
},
117+
"DanglPublicFeedSource": {
118+
"type": "string"
119+
},
120+
"DocuBaseUrl": {
121+
"type": "string"
122+
},
123+
"FeedzAccessToken": {
124+
"type": "string"
125+
},
126+
"GitHubAuthenticationToken": {
127+
"type": "string"
128+
},
129+
"KeyVaultBaseUrl": {
130+
"type": "string"
131+
},
132+
"KeyVaultClientId": {
133+
"type": "string"
134+
},
135+
"KeyVaultClientSecret": {
136+
"type": "string"
137+
},
138+
"KeyVaultTenantId": {
139+
"type": "string"
140+
},
141+
"NuGetApiKey": {
142+
"type": "string"
143+
},
144+
"NukeGitHubDocuApiKey": {
145+
"type": "string"
146+
},
147+
"NukeWebDocuDocuApiKey": {
148+
"type": "string"
149+
},
150+
"Solution": {
151+
"type": "string",
152+
"description": "Path to a solution file that is automatically loaded. Default is Nuke.GitHub.sln"
153+
}
154+
}
155+
},
156+
{
157+
"$ref": "#/definitions/NukeBuild"
158+
}
159+
]
154160
}

‎CHANGELOG_GitHub.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

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

5+
# v7.0.0:
6+
- Update NUKE to v9
7+
- The minimum required .NET version is now 8.0
8+
59
## v6.0.0:
610
- Update NUKE to v8
711

‎CHANGELOG_WebDocu.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
All notable changes to **Nuke.WebDocu** are documented here.
44

5+
# v7.0.0:
6+
- Update NUKE to v9
7+
- The minimum required .NET version is now 8.0
8+
59
## v6.0.0:
610
- Update NUKE to v8
711

‎build/.build.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Nuke.Common" Version="8.1.2" />
14+
<PackageReference Include="Nuke.Common" Version="9.0.1" />
1515
<PackageDownload Include="GitVersion.Tool" Version="[5.12.0]" />
1616
<PackageDownload Include="docfx" Version="[2.77.0]" />
17-
<PackageReference Include="Nuke.Tooling.Generator" Version="8.1.2" />
17+
<PackageReference Include="Nuke.Tooling.Generator" Version="9.0.1" />
1818
<!-- The references below are required to compiled the embedded files from
1919
the separate Nuke.GitHub and Nuke.WebDocu projects itself -->
2020
<PackageReference Include="Octokit" Version="13.0.1" />
21-
<PackageReference Include="Azure.Storage.Blobs" Version="12.22.2" />
21+
<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎build/Build.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ private void SendTeamsMessage(string title, string message, bool isError)
103103
.DependsOn(Clean)
104104
.Executes(() =>
105105
{
106-
DotNetRestore();
106+
DotNetRestore(new DotNetRestoreSettings());
107107
});
108108

109109
Target Compile => _ => _
@@ -126,7 +126,7 @@ private void SendTeamsMessage(string title, string message, bool isError)
126126
.SetNoBuild(true)
127127
.SetProjectFile(RootDirectory / "test" / "Nuke.WebDocu.Tests")
128128
.SetTestAdapterPath(".")
129-
.CombineWith(c => new[] { "net7.0" }
129+
.CombineWith(c => new[] { "net8.0" }
130130
.Select(framework => c.SetFramework(framework).SetLoggers($"xunit;LogFilePath={OutputDirectory / $"tests-{framework}.xml"}"))
131131
), degreeOfParallelism: Environment.ProcessorCount, completeOnFailure: true);
132132
});

‎src/Nuke.GitHub/GitHubSettings.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@ namespace Nuke.GitHub
55
{
66
public partial class GitHubSettings
77
{
8-
/// <summary>
9-
/// This property is missing in the auto generated code and I have no idea what this should return by default.
10-
/// </summary>
11-
public override Action<OutputType, string> ProcessLogger => null;
12-
138
public void Validate()
149
{
15-
AssertValid();
10+
if (string.IsNullOrWhiteSpace(Token))
11+
{
12+
throw new ArgumentException("A GitHub token is required for authentication in the GitHub API.");
13+
}
1614
}
1715
}
1816
}

0 commit comments

Comments
 (0)