Skip to content

Commit 30f3065

Browse files
Bump Nuke.Common from 5.2.1 to 6.0.1 (#131)
* Bump Nuke.Common from 5.2.1 to 6.0.1 Bumps [Nuke.Common](https://github.com/nuke-build/nuke) from 5.2.1 to 6.0.1. - [Release notes](https://github.com/nuke-build/nuke/releases) - [Changelog](https://github.com/nuke-build/nuke/blob/develop/CHANGELOG.md) - [Commits](nuke-build/nuke@5.2.1...6.0.1) --- updated-dependencies: - dependency-name: Nuke.Common dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Fix compilation Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Reegeek <[email protected]>
1 parent dd9060b commit 30f3065

File tree

4 files changed

+12
-16
lines changed

4 files changed

+12
-16
lines changed

.nuke/build.schema.json

-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
"type": "boolean",
1919
"description": "Indicates to continue a previously failed build attempt"
2020
},
21-
"GitHubToken": {
22-
"type": "string",
23-
"description": "GitHub Token"
24-
},
2521
"Help": {
2622
"type": "boolean",
2723
"description": "Shows the help text for this build assembly"

Build/Nuke/Build.AzurePipelinesAttribute.cs

+6-5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Nuke.Common.CI.AzurePipelines.Configuration;
66
using Nuke.Common.Execution;
77
using Nuke.Common.Tooling;
8+
using Nuke.Common.Utilities.Collections;
89

910
partial class Build
1011
{
@@ -26,16 +27,15 @@ protected override AzurePipelinesStage GetStage(AzurePipelinesImage image, IRead
2627
case AzurePipelinesImage.WindowsLatest:
2728
case AzurePipelinesImage.Windows2019:
2829
case AzurePipelinesImage.Vs2017Win2016:
29-
case AzurePipelinesImage.Vs2015Win2012R2:
30-
case AzurePipelinesImage.Win1803:
30+
case AzurePipelinesImage.Windows2022:
3131
targetToExcludes = new []{ nameof(TestCoreOnly), nameof(CompileCoreOnly), nameof(PackCoreOnly)};
3232
break;
3333
case AzurePipelinesImage.Ubuntu1604:
3434
case AzurePipelinesImage.Ubuntu1804:
3535
case AzurePipelinesImage.UbuntuLatest:
3636
case AzurePipelinesImage.MacOsLatest:
3737
case AzurePipelinesImage.MacOs1014:
38-
case AzurePipelinesImage.MacOs1013:
38+
case AzurePipelinesImage.MacOs11:
3939
targetToExcludes = new[] { nameof(Test), nameof(Compile), nameof(Pack), nameof(PackCoreOnly) };
4040
break;
4141
default:
@@ -47,9 +47,9 @@ protected override AzurePipelinesStage GetStage(AzurePipelinesImage image, IRead
4747
return base.GetStage(image, filterRelevantTargets);
4848
}
4949

50-
protected override AzurePipelinesJob GetJob(ExecutableTarget executableTarget, LookupTable<ExecutableTarget, AzurePipelinesJob> jobs, IReadOnlyCollection<ExecutableTarget> relevantTargets)
50+
protected override AzurePipelinesJob GetJob(ExecutableTarget executableTarget, LookupTable<ExecutableTarget, AzurePipelinesJob> jobs, IReadOnlyCollection<ExecutableTarget> relevantTargets, AzurePipelinesImage image)
5151
{
52-
var job = base.GetJob(executableTarget, jobs, relevantTargets);
52+
var job = base.GetJob(executableTarget, jobs, relevantTargets, image);
5353
var dictionary = new Dictionary<string, string>
5454
{
5555
{nameof(Compile), "⚙️"},
@@ -66,5 +66,6 @@ protected override AzurePipelinesJob GetJob(ExecutableTarget executableTarget, L
6666
: $"{prefix}{job.DisplayName} 🧩";
6767
return job;
6868
}
69+
6970
}
7071
}

Build/Nuke/Build.cs

+5-6
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
GitHubActionsImage.WindowsLatest,
2424
AutoGenerate = false,
2525
On = new[] { GitHubActionsTrigger.Push },
26-
ImportGitHubTokenAs = nameof(GitHubToken),
26+
EnableGitHubContext = true,
2727
InvokedTargets = new[] { nameof(Test), nameof(Pack) })]
2828
[GitHubActions(
2929
"continuousCore",
3030
GitHubActionsImage.UbuntuLatest,
3131
GitHubActionsImage.MacOsLatest,
3232
AutoGenerate = false,
3333
On = new[] { GitHubActionsTrigger.Push },
34-
ImportGitHubTokenAs = nameof(GitHubToken),
34+
EnableGitHubContext = true,
3535
InvokedTargets = new[] { nameof(TestCoreOnly) })]
3636
[AzurePipelines(
3737
suffix: null,
@@ -60,7 +60,6 @@ partial class Build : Nuke.Common.NukeBuild
6060

6161
[CI] readonly AzurePipelines AzurePipelines;
6262

63-
[Parameter("GitHub Token")] readonly string GitHubToken;
6463

6564
AbsolutePath SourceDirectory => RootDirectory / "src";
6665
AbsolutePath ResultDirectory => RootDirectory / ".result";
@@ -90,7 +89,7 @@ partial class Build : Nuke.Common.NukeBuild
9089
void ExecutesCompile(bool excludeNetFramework)
9190
{
9291

93-
Logger.Info(excludeNetFramework ? "Exclude net framework" : "Include net framework");
92+
Serilog.Log.Information(excludeNetFramework ? "Exclude net framework" : "Include net framework");
9493
if (excludeNetFramework)
9594
{
9695
var projectWithFrameworkAndPlatform =
@@ -133,7 +132,7 @@ from platform in project.GetPlatforms()
133132

134133
void ExecutesTest(bool excludeNetFramework)
135134
{
136-
Logger.Info(excludeNetFramework ? "Exclude net framework" : "Include net framework");
135+
Serilog.Log.Information(excludeNetFramework ? "Exclude net framework" : "Include net framework");
137136

138137
var groupTestConfigurations =
139138
(from project in TestProjects
@@ -162,7 +161,7 @@ from platform in project.GetPlatformsForTests()
162161
.SetFramework(v.framework)
163162
.DisableNoBuild()
164163
.SetProperty("Platform", v.platform)
165-
.SetLogger($"trx;LogFileName={v.project.Name}-{v.framework}.trx"));
164+
.SetLoggers($"trx;LogFileName={v.project.Name}-{v.framework}.trx"));
166165
});
167166

168167
TestResultDirectory.GlobFiles("*.trx").ForEach(x =>

Build/Nuke/NukeBuild.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Nuke.Common" Version="5.2.1" />
14+
<PackageReference Include="Nuke.Common" Version="6.0.1" />
1515
<PackageDownload Include="GitVersion.Tool" Version="[5.6.8]" />
1616
</ItemGroup>
1717

0 commit comments

Comments
 (0)