Skip to content

Commit 1ce993a

Browse files
chore(deps): update rocket surgery other to v2 (#1771)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Joey Robichaud <joseph.robichaud@microsoft.com>
1 parent e5ecf55 commit 1ce993a

7 files changed

Lines changed: 235 additions & 139 deletions

File tree

.build/Build.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ namespace Build;
1515
[PublicAPI]
1616
[UnsetVisualStudioEnvironmentVariables]
1717
[PackageIcon("http://www.omnisharp.net/images/logo.png")]
18-
[EnsureReadmeIsUpdated]
1918
[DotNetVerbosityMapping]
2019
[MSBuildVerbosityMapping]
2120
[NuGetVerbosityMapping]
@@ -25,7 +24,6 @@ public sealed partial class Solution : NukeBuild,
2524
ICanBuildWithDotNetCore,
2625
ICanTestWithDotNetCore,
2726
ICanPackWithDotNetCore,
28-
IHaveDataCollector,
2927
ICanClean,
3028
ICanUpdateReadme,
3129
IGenerateCodeCoverageReport,
@@ -51,17 +49,17 @@ public sealed partial class Solution : NukeBuild,
5149
.DependsOn(Test)
5250
.DependsOn(Pack);
5351

54-
public Target Build => _ => _.Inherit<ICanBuildWithDotNetCore>(x => x.CoreBuild);
52+
public Target Build => _ => _.Inherit<ICanBuildWithDotNetCore>(x => x.DotnetCoreBuild);
5553

56-
public Target Pack => _ => _.Inherit<ICanPackWithDotNetCore>(x => x.CorePack)
54+
public Target Pack => _ => _.Inherit<ICanPackWithDotNetCore>(x => x.DotnetCorePack)
5755
.DependsOn(Clean);
5856

5957
[ComputedGitVersion] public GitVersion GitVersion { get; } = null!;
6058

61-
public Target Clean => _ => _.Inherit<ICanClean>(x => x.Clean);
62-
public Target Restore => _ => _.Inherit<ICanRestoreWithDotNetCore>(x => x.CoreRestore);
59+
public Target Clean => _ => _.Inherit<ICanClean>(x => x.CleanWellKnownTemporaryFiles);
60+
public Target Restore => _ => _.Inherit<ICanRestoreWithDotNetCore>(x => x.DotnetCoreRestore);
6361

64-
public Target Test => _ => _.Inherit<ICanTestWithDotNetCore>(x => x.CoreTest);
62+
public Target Test => _ => _.Inherit<ICanTestWithDotNetCore>(x => x.DotnetCoreTest);
6563

6664
public Target NpmInstall => _ => _
6765
.Executes(() =>
@@ -79,6 +77,8 @@ public sealed partial class Solution : NukeBuild,
7977
.Before(Default)
8078
.Before(Clean);
8179

80+
public Target Docs => _ => _.Inherit<IGenerateDocFx>(x => x.GenerateDocFx);
81+
8282
[Parameter("Configuration to build")] public Configuration Configuration { get; } = IsLocalBuild ? Configuration.Debug : Configuration.Release;
8383

8484
AbsolutePath ICanUpdateReadme.ReadmeFilePath => RootDirectory / "README.md";

.build/Solution.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ internal class LocalConstants
5656
NonEntryTargets = new[]
5757
{
5858
nameof(ICIEnvironment.CIEnvironment),
59-
nameof(ITriggerCodeCoverageReports.TriggerCodeCoverageReports),
59+
nameof(ITriggerCodeCoverageReports.CollectCodeCoverage),
6060
nameof(ITriggerCodeCoverageReports.GenerateCodeCoverageReportCobertura),
6161
nameof(IGenerateCodeCoverageBadges.GenerateCodeCoverageBadges),
6262
nameof(IGenerateCodeCoverageReport.GenerateCodeCoverageReport),
@@ -96,7 +96,6 @@ RocketSurgeonGitHubActionsConfiguration configuration
9696
{
9797
configuration
9898
.ExcludeRepositoryConfigurationFiles()
99-
.AddNugetPublish()
10099
.Jobs.OfType<RocketSurgeonsGithubActionsJob>()
101100
.First(z => z.Name.Equals("Build", StringComparison.OrdinalIgnoreCase))
102101
.ConfigureStep<CheckoutStep>(step => step.FetchDepth = 0)

.config/dotnet-tools.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@
2929
"jb"
3030
],
3131
"rollForward": false
32+
},
33+
"dotnet-coverage": {
34+
"version": "18.8.0",
35+
"commands": [
36+
"dotnet-coverage"
37+
],
38+
"rollForward": false
3239
}
3340
}
3441
}

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,25 +107,25 @@ jobs:
107107
- name: 🎁 Restore
108108
id: restore
109109
run: |
110-
dotnet nuke Restore --skip
110+
dotnet nuke --target DotnetCoreRestore Restore
111111
- name: Update NuGet Cache
112112
if: always() && steps.restore-nuget-cache.outputs.cache-hit != 'true'
113113
uses: actions/cache/save@v6
114114
with:
115115
key: "${{ runner.os }}-nuget-${{ hashFiles('**/Directory.Packages.props') }}-${{ hashFiles('**/dotnet-tools.json') }}"
116116
path: '${{ github.workspace }}/.nuget/packages'
117-
- name: ⚙ Build
117+
- name: Build
118118
id: build
119119
run: |
120-
dotnet nuke Build --skip
121-
- name: 🚦 Test
120+
dotnet .build/bin/Debug/.build.dll --target DotnetCoreBuild Build
121+
- name: 💨 Test
122122
id: test
123123
run: |
124-
dotnet nuke Test TriggerCodeCoverageReports GenerateCodeCoverageReportCobertura GenerateCodeCoverageBadges GenerateCodeCoverageSummary GenerateCodeCoverageReport --skip
124+
dotnet .build/bin/Debug/.build.dll --target DotnetCoreTest Test CollectCodeCoverage GenerateCodeCoverageReportCobertura GenerateCodeCoverageBadges GenerateCodeCoverageSummary GenerateCodeCoverageReport
125125
- name: 📦 Pack
126126
id: pack
127127
run: |
128-
dotnet nuke Pack --skip
128+
dotnet .build/bin/Debug/.build.dll --target DotnetCorePack Pack --skip Build
129129
- name: Npm install
130130
working-directory: vscode-testextension
131131
run: |

.nuke/build.schema.json

Lines changed: 98 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,77 @@
11
{
22
"$schema": "http://json-schema.org/draft-04/schema#",
3-
"$ref": "#/definitions/build",
4-
"title": "Build Schema",
53
"definitions": {
6-
"build": {
7-
"type": "object",
4+
"Host": {
5+
"type": "string",
6+
"enum": [
7+
"AppVeyor",
8+
"AzurePipelines",
9+
"Bamboo",
10+
"Bitbucket",
11+
"Bitrise",
12+
"GitHubActions",
13+
"GitLab",
14+
"Jenkins",
15+
"Rider",
16+
"SpaceAutomation",
17+
"TeamCity",
18+
"Terminal",
19+
"TravisCI",
20+
"VisualStudio",
21+
"VSCode"
22+
]
23+
},
24+
"ExecutableTarget": {
25+
"type": "string",
26+
"enum": [
27+
"Build",
28+
"BuildVersion",
29+
"Clean",
30+
"CleanWellKnownTemporaryFiles",
31+
"CollectCodeCoverage",
32+
"Default",
33+
"Docs",
34+
"DotnetCoreBuild",
35+
"DotnetCorePack",
36+
"DotnetCoreRestore",
37+
"DotnetCoreTest",
38+
"DotnetToolRestore",
39+
"GenerateCodeCoverageBadges",
40+
"GenerateCodeCoverageReport",
41+
"GenerateCodeCoverageReportCobertura",
42+
"GenerateCodeCoverageSummary",
43+
"GenerateDocFx",
44+
"GenerateReadme",
45+
"NpmInstall",
46+
"Pack",
47+
"Restore",
48+
"Test",
49+
"TestVscodeExtension"
50+
]
51+
},
52+
"Verbosity": {
53+
"type": "string",
54+
"description": "",
55+
"enum": [
56+
"Verbose",
57+
"Normal",
58+
"Minimal",
59+
"Quiet"
60+
]
61+
},
62+
"NukeBuild": {
863
"properties": {
9-
"Artifacts": {
10-
"type": "string",
11-
"description": "The directory where artifacts are to be dropped"
12-
},
13-
"Configuration": {
14-
"type": "string",
15-
"description": "Configuration to build",
16-
"enum": [
17-
"Debug",
18-
"Release"
19-
]
20-
},
2164
"Continue": {
2265
"type": "boolean",
2366
"description": "Indicates to continue a previously failed build attempt"
2467
},
25-
"Coverage": {
26-
"type": "string",
27-
"description": "The directory where coverage artifacts are to be dropped"
28-
},
2968
"Help": {
3069
"type": "boolean",
3170
"description": "Shows the help text for this build assembly"
3271
},
3372
"Host": {
34-
"type": "string",
3573
"description": "Host for execution. Default is 'automatic'",
36-
"enum": [
37-
"AppVeyor",
38-
"AzurePipelines",
39-
"Bamboo",
40-
"Bitbucket",
41-
"Bitrise",
42-
"GitHubActions",
43-
"GitLab",
44-
"Jenkins",
45-
"Rider",
46-
"SpaceAutomation",
47-
"TeamCity",
48-
"Terminal",
49-
"TravisCI",
50-
"VisualStudio",
51-
"VSCode"
52-
]
74+
"$ref": "#/definitions/Host"
5375
},
5476
"NoLogo": {
5577
"type": "boolean",
@@ -74,95 +96,61 @@
7496
"type": "string",
7597
"description": "Root directory during build execution"
7698
},
77-
"Serve": {
78-
"type": "boolean",
79-
"description": "serve the docs"
80-
},
8199
"Skip": {
82100
"type": "array",
83101
"description": "List of targets to be skipped. Empty list skips all dependencies",
84102
"items": {
85-
"type": "string",
86-
"enum": [
87-
"Build",
88-
"BuildVersion",
89-
"Clean",
90-
"CoreBuild",
91-
"CoreDocs",
92-
"CorePack",
93-
"CoreRestore",
94-
"CoreTest",
95-
"Default",
96-
"DotnetToolRestore",
97-
"Generate_Code_Coverage_Badges",
98-
"Generate_Code_Coverage_Report",
99-
"Generate_Code_Coverage_Report_Cobertura",
100-
"Generate_Code_Coverage_Summary",
101-
"GenerateCodeCoverageBadges",
102-
"GenerateCodeCoverageReport",
103-
"GenerateCodeCoverageReportCobertura",
104-
"GenerateCodeCoverageSummary",
105-
"GenerateReadme",
106-
"NpmInstall",
107-
"Pack",
108-
"Restore",
109-
"Test",
110-
"TestVscodeTestExtension",
111-
"Trigger_Code_Coverage_Reports",
112-
"TriggerCodeCoverageReports"
113-
]
103+
"$ref": "#/definitions/ExecutableTarget"
114104
}
115105
},
116-
"Solution": {
117-
"type": "string",
118-
"description": "Path to a solution file that is automatically loaded"
119-
},
120106
"Target": {
121107
"type": "array",
122108
"description": "List of targets to be invoked. Default is '{default_target}'",
123109
"items": {
124-
"type": "string",
125-
"enum": [
126-
"Build",
127-
"BuildVersion",
128-
"Clean",
129-
"CoreBuild",
130-
"CoreDocs",
131-
"CorePack",
132-
"CoreRestore",
133-
"CoreTest",
134-
"Default",
135-
"DotnetToolRestore",
136-
"Generate_Code_Coverage_Badges",
137-
"Generate_Code_Coverage_Report",
138-
"Generate_Code_Coverage_Report_Cobertura",
139-
"Generate_Code_Coverage_Summary",
140-
"GenerateCodeCoverageBadges",
141-
"GenerateCodeCoverageReport",
142-
"GenerateCodeCoverageReportCobertura",
143-
"GenerateCodeCoverageSummary",
144-
"GenerateReadme",
145-
"NpmInstall",
146-
"Pack",
147-
"Restore",
148-
"Test",
149-
"TestVscodeTestExtension",
150-
"Trigger_Code_Coverage_Reports",
151-
"TriggerCodeCoverageReports"
152-
]
110+
"$ref": "#/definitions/ExecutableTarget"
153111
}
154112
},
155113
"Verbosity": {
156-
"type": "string",
157114
"description": "Logging verbosity during build execution. Default is 'Normal'",
115+
"$ref": "#/definitions/Verbosity"
116+
}
117+
}
118+
}
119+
},
120+
"allOf": [
121+
{
122+
"properties": {
123+
"Artifacts": {
124+
"type": "string",
125+
"description": "The directory where artifacts are to be dropped"
126+
},
127+
"Configuration": {
128+
"type": "string",
129+
"description": "Configuration to build",
158130
"enum": [
159-
"Minimal",
160-
"Normal",
161-
"Quiet",
162-
"Verbose"
131+
"Debug",
132+
"Release"
163133
]
134+
},
135+
"Coverage": {
136+
"type": "string",
137+
"description": "The directory where coverage artifacts are to be dropped"
138+
},
139+
"Serve": {
140+
"type": [
141+
"boolean",
142+
"null"
143+
],
144+
"description": "serve the docs"
145+
},
146+
"Solution": {
147+
"type": "string",
148+
"description": "Path to a solution file that is automatically loaded"
164149
}
165150
}
151+
},
152+
{
153+
"$ref": "#/definitions/NukeBuild"
166154
}
167-
}
155+
]
168156
}

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<PackageVersion Include="GitVersion.Tool" Version="6.7.0" />
2727
<PackageVersion Include="JetBrains.ReSharper.CommandLineTools" Version="2025.2.6" />
2828
<PackageVersion Include="ReportGenerator" Version="5.5.10" />
29-
<PackageVersion Include="Rocket.Surgery.Nuke" Version="1.8.36" />
29+
<PackageVersion Include="Rocket.Surgery.Nuke" Version="2.9.12" />
3030
</ItemGroup>
3131
<ItemGroup>
3232
<!-- backwards compat is maintained in Directory.Packages.supports.props -->

0 commit comments

Comments
 (0)