Skip to content

Commit 747d540

Browse files
david-driscolldavid-driscoll
committed
Updated build and test dependencies to the latest
1 parent 112f240 commit 747d540

28 files changed

+3207
-370
lines changed

‎.build/.build.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
77
<RootNamespace></RootNamespace>
88
<IsPackable>False</IsPackable>
99
<NoWarn>CS0649;CS0169</NoWarn>
10+
<NukeTelemetryVersion>1</NukeTelemetryVersion>
1011
</PropertyGroup>
1112

1213
<ItemGroup>

‎.build/Build.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ public partial class Solution : NukeBuild,
2828
IGenerateCodeCoverageReport,
2929
IGenerateCodeCoverageSummary,
3030
IGenerateCodeCoverageBadges,
31-
IHaveConfiguration<Configuration>,
32-
ICanLint
31+
IHaveConfiguration<Configuration>
3332
{
3433
/// <summary>
3534
/// Support plugins are available for:

‎.build/Solution.cs

+36-37
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
InvokeTargets = new[] { nameof(Default) },
1212
NonEntryTargets = new[] {
1313
nameof(ICIEnvironment.CIEnvironment),
14-
nameof(ITriggerCodeCoverageReports.Trigger_Code_Coverage_Reports),
15-
nameof(ITriggerCodeCoverageReports.Generate_Code_Coverage_Report_Cobertura),
16-
nameof(IGenerateCodeCoverageBadges.Generate_Code_Coverage_Badges),
17-
nameof(IGenerateCodeCoverageReport.Generate_Code_Coverage_Report),
18-
nameof(IGenerateCodeCoverageSummary.Generate_Code_Coverage_Summary),
14+
nameof(ITriggerCodeCoverageReports.TriggerCodeCoverageReports),
15+
nameof(ITriggerCodeCoverageReports.GenerateCodeCoverageReportCobertura),
16+
nameof(IGenerateCodeCoverageBadges.GenerateCodeCoverageBadges),
17+
nameof(IGenerateCodeCoverageReport.GenerateCodeCoverageReport),
18+
nameof(IGenerateCodeCoverageSummary.GenerateCodeCoverageSummary),
1919
nameof(Default)
2020
},
2121
ExcludedTargets = new[]
@@ -26,20 +26,24 @@
2626
}
2727
)]
2828
[GitHubActionsSteps(
29-
"ci", GitHubActionsImage.MacOsLatest, GitHubActionsImage.WindowsLatest, GitHubActionsImage.UbuntuLatest,
29+
"ci",
30+
GitHubActionsImage.MacOsLatest,
31+
GitHubActionsImage.WindowsLatest,
32+
GitHubActionsImage.UbuntuLatest,
3033
AutoGenerate = false,
3134
On = new[] { GitHubActionsTrigger.Push },
3235
OnPushTags = new[] { "v*" },
33-
OnPushBranches = new[] { "master", "next" },
34-
OnPullRequestBranches = new[] { "master", "next" },
36+
OnPushBranches = new[] { "master", "main", "next" },
37+
OnPullRequestBranches = new[] { "master", "main", "next" },
3538
InvokedTargets = new[] { nameof(Default) },
36-
NonEntryTargets = new[] {
39+
NonEntryTargets = new[]
40+
{
3741
nameof(ICIEnvironment.CIEnvironment),
38-
nameof(ITriggerCodeCoverageReports.Trigger_Code_Coverage_Reports),
39-
nameof(ITriggerCodeCoverageReports.Generate_Code_Coverage_Report_Cobertura),
40-
nameof(IGenerateCodeCoverageBadges.Generate_Code_Coverage_Badges),
41-
nameof(IGenerateCodeCoverageReport.Generate_Code_Coverage_Report),
42-
nameof(IGenerateCodeCoverageSummary.Generate_Code_Coverage_Summary),
42+
nameof(ITriggerCodeCoverageReports.TriggerCodeCoverageReports),
43+
nameof(ITriggerCodeCoverageReports.GenerateCodeCoverageReportCobertura),
44+
nameof(IGenerateCodeCoverageBadges.GenerateCodeCoverageBadges),
45+
nameof(IGenerateCodeCoverageReport.GenerateCodeCoverageReport),
46+
nameof(IGenerateCodeCoverageSummary.GenerateCodeCoverageSummary),
4347
nameof(Default)
4448
},
4549
ExcludedTargets = new[] { nameof(ICanClean.Clean), nameof(ICanRestoreWithDotNetCore.DotnetToolRestore) },
@@ -48,27 +52,40 @@
4852
[PrintBuildVersion]
4953
[PrintCIEnvironment]
5054
[UploadLogs]
55+
[TitleEvents]
5156
public partial class Solution
5257
{
5358
public static RocketSurgeonGitHubActionsConfiguration Middleware(RocketSurgeonGitHubActionsConfiguration configuration)
5459
{
55-
var buildJob = configuration.Jobs.First(z => z.Name == "Build");
60+
var buildJob = configuration.Jobs.OfType<RocketSurgeonsGithubActionsJob>().First(z => z.Name == "Build");
61+
buildJob.FailFast = false;
5662
var checkoutStep = buildJob.Steps.OfType<CheckoutStep>().Single();
5763
// For fetch all
5864
checkoutStep.FetchDepth = 0;
65+
buildJob.Environment["NUGET_PACKAGES"] = "${{ github.workspace }}/.nuget/packages";
5966
buildJob.Steps.InsertRange(
6067
buildJob.Steps.IndexOf(checkoutStep) + 1, new BaseGitHubActionsStep[] {
6168
new RunStep("Fetch all history for all tags and branches") {
6269
Run = "git fetch --prune"
6370
},
64-
new SetupDotNetStep("Use .NET Core 2.1 SDK") {
65-
DotNetVersion = "2.1.x"
71+
new UsingStep("NuGet Cache")
72+
{
73+
Uses = "actions/cache@v2",
74+
With =
75+
{
76+
["path"] = "${{ github.workspace }}/.nuget/packages",
77+
// keep in mind using central package versioning here
78+
["key"] =
79+
"${{ runner.os }}-nuget-${{ hashFiles('**/Directory.Build.targets', '**/Directory.Build.props', '**/*.csproj') }}",
80+
["restore-keys"] = @"|
81+
${{ runner.os }}-nuget-"
82+
}
6683
},
6784
new SetupDotNetStep("Use .NET Core 3.1 SDK") {
6885
DotNetVersion = "3.1.x"
6986
},
70-
new SetupDotNetStep("Use .NET Core 5.0 SDK") {
71-
DotNetVersion = "5.0.x"
87+
new SetupDotNetStep("Use .NET Core 6.0 SDK") {
88+
DotNetVersion = "6.0.x"
7289
},
7390
}
7491
);
@@ -115,24 +132,6 @@ public static RocketSurgeonGitHubActionsConfiguration Middleware(RocketSurgeonGi
115132
}
116133
);
117134

118-
119-
/*
120-
121-
- publish: "${{ parameters.Artifacts }}/logs/"
122-
displayName: Publish Logs
123-
artifact: "Logs${{ parameters.Postfix }}"
124-
condition: always()
125-
126-
- publish: ${{ parameters.Coverage }}
127-
displayName: Publish Coverage
128-
artifact: "Coverage${{ parameters.Postfix }}"
129-
condition: always()
130-
131-
- publish: "${{ parameters.Artifacts }}/nuget/"
132-
displayName: Publish NuGet Artifacts
133-
artifact: "NuGet${{ parameters.Postfix }}"
134-
condition: always()
135-
*/
136135
return configuration;
137136
}
138137
}

‎.config/dotnet-tools.json

+52-46
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,54 @@
11
{
2-
"version": 1,
3-
"isRoot": true,
4-
"tools": {
5-
"cake.tool": {
6-
"version": "1.1.0",
7-
"commands": [
8-
"dotnet-cake"
9-
]
10-
},
11-
"gitversion.tool": {
12-
"version": "5.7.0",
13-
"commands": [
14-
"dotnet-gitversion"
15-
]
16-
},
17-
"dotnet-reportgenerator-globaltool": {
18-
"version": "4.8.12",
19-
"commands": [
20-
"reportgenerator"
21-
]
22-
},
23-
"codecov.tool": {
24-
"version": "1.13.0",
25-
"commands": [
26-
"codecov"
27-
]
28-
},
29-
"nuke.globaltool": {
30-
"version": "5.3.0",
31-
"commands": [
32-
"nuke"
33-
]
34-
},
35-
"nukeeper": {
36-
"version": "0.34.0",
37-
"commands": [
38-
"nukeeper"
39-
]
40-
},
41-
"jetbrains.resharper.globaltools": {
42-
"version": "2021.2.1",
43-
"commands": [
44-
"jb"
45-
]
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"dotnet-outdated": {
6+
"version": "2.11.0",
7+
"commands": [
8+
"dotnet-outdated"
9+
]
10+
},
11+
"gitversion.tool": {
12+
"version": "5.8.2",
13+
"commands": [
14+
"dotnet-gitversion"
15+
]
16+
},
17+
"dotnet-reportgenerator-globaltool": {
18+
"version": "5.0.4",
19+
"commands": [
20+
"reportgenerator"
21+
]
22+
},
23+
"nuke.globaltool": {
24+
"version": "6.0.1",
25+
"commands": [
26+
"nuke"
27+
]
28+
},
29+
"codecov.tool": {
30+
"version": "1.13.0",
31+
"commands": [
32+
"codecov"
33+
]
34+
},
35+
"jetbrains.resharper.globaltools": {
36+
"version": "2021.3.3",
37+
"commands": [
38+
"jb"
39+
]
40+
},
41+
"dotnet-format": {
42+
"version": "5.1.250801",
43+
"commands": [
44+
"dotnet-format"
45+
]
46+
},
47+
"nukeeper": {
48+
"version": "0.35.0",
49+
"commands": [
50+
"nukeeper"
51+
]
52+
}
4653
}
47-
}
48-
}
54+
}

0 commit comments

Comments
 (0)