Skip to content

Commit 2bb9217

Browse files
initial wip on net9 changes (#2373)
* initial wip on net9 changes * continued net9 * started work on openapi upgrade * started on fluent openapi validation stuffs * hmm * more work towards getting things wired in * everything but graphql working * nice tests pass?!? * nice tests pass?!? * well things work now, lets see how ci goes
1 parent 9891ead commit 2bb9217

File tree

499 files changed

+15851
-7836
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

499 files changed

+15851
-7836
lines changed

.build/.build.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
<PackageReference Include="Nuke.Common" />
1616
<PackageReference Include="GitVersion.Tool" ExcludeAssets="All" />
1717
<PackageReference Include="ReportGenerator" ExcludeAssets="All" />
18+
<PackageReference Include="JetBrains.ReSharper.GlobalTools" ExcludeAssets="All" />
19+
<PackageReference Include="JetBrains.dotCover.CommandLineTools" ExcludeAssets="All" />
1820
<PackageReference Include="Rocket.Surgery.Nuke" />
1921
<PackageReference Include="Polly" />
2022
</ItemGroup>

.build/Build.CI.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using Nuke.Common.CI.GitHubActions;
22
using Nuke.Common.CI.GitHubActions.Configuration;
33
using Rocket.Surgery.Nuke.ContinuousIntegration;
4-
using Rocket.Surgery.Nuke.DotNetCore;
54
using Rocket.Surgery.Nuke.GithubActions;
65

76
#pragma warning disable CA1050
@@ -62,7 +61,7 @@ public static RocketSurgeonGitHubActionsConfiguration CiMiddleware(RocketSurgeon
6261
.Jobs.OfType<RocketSurgeonsGithubActionsJob>()
6362
.First(z => z.Name.Equals("build", StringComparison.OrdinalIgnoreCase));
6463
job
65-
.UseDotNetSdks("8.0")
64+
.UseDotNetSdks("8.0", "9.0")
6665
.ConfigureStep<CheckoutStep>(step => step.FetchDepth = 0)
6766
.PublishLogs<Pipeline>();
6867

@@ -74,7 +73,7 @@ public static RocketSurgeonGitHubActionsConfiguration LintStagedMiddleware(Rocke
7473
configuration
7574
.Jobs.OfType<RocketSurgeonsGithubActionsJob>()
7675
.First(z => z.Name.Equals("Build", StringComparison.OrdinalIgnoreCase))
77-
.UseDotNetSdks("8.0");
76+
.UseDotNetSdks("8.0", "9.0");
7877

7978
return configuration;
8079
}

.build/Build.cs

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ public partial class Pipeline : NukeBuild,
2323
ICanTestWithDotNetCore,
2424
ICanPackWithDotNetCore,
2525
IComprehendSamples,
26-
IHaveDataCollector,
2726
ICanClean,
2827
IHaveCommonLintTargets,
2928
// IHavePublicApis,

.config/dotnet-tools.json

+14-9
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,19 @@
2727
"commands": ["jb"],
2828
"rollForward": false
2929
},
30-
"nukeeper": {
31-
"version": "0.35.0",
32-
"commands": ["nukeeper"],
30+
"jetbrains.dotcover.commandlinetools": {
31+
"version": "2024.3.0",
32+
"commands": ["dotnet-dotCover"],
33+
"rollForward": false
34+
},
35+
"jetbrains.dottrace.globaltools": {
36+
"version": "2024.3.0",
37+
"commands": ["dottrace"],
38+
"rollForward": false
39+
},
40+
"dotnet-coverage": {
41+
"version": "17.12.6",
42+
"commands": ["dotnet-coverage"],
3343
"rollForward": false
3444
},
3545
"docfx": {
@@ -38,7 +48,7 @@
3848
"rollForward": false
3949
},
4050
"strawberryshake.tools": {
41-
"version": "14.0.0-rc.2",
51+
"version": "14.2.0-p.4",
4252
"commands": ["dotnet-graphql"],
4353
"rollForward": false
4454
},
@@ -56,11 +66,6 @@
5666
"version": "0.7.1",
5767
"commands": ["husky"],
5868
"rollForward": false
59-
},
60-
"liquidtestreports.cli": {
61-
"version": "2.0.0-beta.6",
62-
"commands": ["liquid"],
63-
"rollForward": false
6469
}
6570
}
6671
}

.editorconfig

+2-2
Original file line numberDiff line numberDiff line change
@@ -3063,7 +3063,7 @@ dotnet_diagnostic.rcs1258.severity = suggestion
30633063
dotnet_diagnostic.rcs1259.severity = suggestion
30643064

30653065
# Add/remove trailing comma
3066-
dotnet_diagnostic.rcs1260.severity = suggestion
3066+
dotnet_diagnostic.rcs1260.severity = none
30673067
# Options: roslynator_trailing_comma_style
30683068

30693069
# Use pattern matching
@@ -4677,7 +4677,7 @@ resharper_T4_wrap_lines = true
46774677
resharper_toplevel_function_declaration_return_type_style = do_not_change
46784678
resharper_toplevel_function_definition_return_type_style = do_not_change
46794679
resharper_trailing_comma_in_multiline_lists = true
4680-
resharper_trailing_comma_in_singleline_lists = true
4680+
resharper_trailing_comma_in_singleline_lists = false
46814681
resharper_use_continuous_indent_inside_initializer_braces = true
46824682
resharper_use_continuous_indent_inside_parens = true
46834683
resharper_use_continuous_line_indent_in_expression_braces = false

.github/renovate.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33
"extends": ["local>RocketSurgeonsGuild/.github:renovate-config"],
4-
"ignorePaths": ["**/node_modules/**", "**/bower_components/**", "**/*.csproj"],
4+
"ignorePaths": ["**/node_modules/**", "**/*.csproj", "Directory.Packages.support.props"],
55
"packageRules": [
66
{
77
"matchCategories": ["js"],

.github/workflows/ci.yml

+43-13
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,20 @@ permissions:
8484

8585
jobs:
8686
build:
87+
permissions:
88+
actions: read
89+
checks: write
90+
contents: read
91+
deployments: read
92+
id-token: none
93+
issues: write
94+
discussions: none
95+
packages: none
96+
pages: none
97+
pull-requests: write
98+
repository-projects: none
99+
security-events: none
100+
statuses: write
87101
runs-on: ubuntu-latest
88102
steps:
89103
- name: Checkout
@@ -95,6 +109,10 @@ jobs:
95109
uses: actions/[email protected]
96110
with:
97111
dotnet-version: '8.0.x'
112+
- name: 🔨 Use .NET Core 9.0 SDK
113+
uses: actions/[email protected]
114+
with:
115+
dotnet-version: '9.0.x'
98116
- name: 🚒 dotnet workload restore
99117
continue-on-error: true
100118
run: |
@@ -113,7 +131,7 @@ jobs:
113131
- name: 🚦 Test
114132
id: test
115133
run: |
116-
dotnet .build/bin/Debug/.build.dll --target DotnetCoreTest Test TriggerCodeCoverageReports GenerateCodeCoverageReportCobertura GenerateCodeCoverageBadges GenerateCodeCoverageSummary GenerateCodeCoverageReport
134+
dotnet .build/bin/Debug/.build.dll --target DotnetCoreTest Test CollectCodeCoverage GenerateCodeCoverageReportCobertura GenerateCodeCoverageBadges GenerateCodeCoverageSummary GenerateCodeCoverageReport
117135
- name: 📦 Pack
118136
id: pack
119137
run: |
@@ -122,18 +140,6 @@ jobs:
122140
id: default
123141
run: |
124142
dotnet .build/bin/Debug/.build.dll --target Default --skip Restore Build Test Pack
125-
- name: 🏺 Publish coverage data
126-
if: always()
127-
uses: actions/[email protected]
128-
with:
129-
name: 'coverage'
130-
path: 'coverage/'
131-
- name: 📫 Publish Coverage
132-
if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || ((github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.pull_request.user.login != 'renovate[bot]' && github.event.pull_request.user.login != 'dependabot[bot]')
133-
uses: codecov/[email protected]
134-
with:
135-
name: 'actions-${{ matrix.os }}'
136-
token: '${{ secrets.CODECOV_TOKEN }}'
137143
- name: 🏺 Publish logs
138144
if: always()
139145
uses: actions/[email protected]
@@ -146,6 +152,30 @@ jobs:
146152
with:
147153
name: 'test data'
148154
path: 'artifacts/test/'
155+
- name: 📫 Publish Test Results
156+
if: always()
157+
uses: EnricoMi/publish-unit-test-result-action@v2
158+
with:
159+
files: 'artifacts/test/**/*.trx'
160+
- name: 🏺 Publish coverage data
161+
if: always()
162+
uses: actions/[email protected]
163+
with:
164+
name: 'coverage'
165+
path: 'coverage/'
166+
- name: 📫 Publish Coverage Comment
167+
if: github.event_name == 'pull_request'
168+
uses: marocchino/sticky-pull-request-comment@v2
169+
with:
170+
header: 'Coverage'
171+
path: 'coverage/summary/SummaryGithub.md'
172+
GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
173+
- name: 📫 Publish Codecov Coverage
174+
if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || ((github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.pull_request.user.login != 'renovate[bot]' && github.event.pull_request.user.login != 'dependabot[bot]')
175+
uses: codecov/[email protected]
176+
with:
177+
name: 'actions'
178+
token: '${{ secrets.CODECOV_TOKEN }}'
149179
- name: 🏺 Publish NuGet Packages
150180
if: always()
151181
uses: actions/[email protected]

.github/workflows/lint.yml

+4
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ jobs:
6363
uses: actions/setup-dotnet@v4
6464
with:
6565
dotnet-version: '8.0.x'
66+
- name: 🔨 Use .NET Core 9.0 SDK
67+
uses: actions/setup-dotnet@v4
68+
with:
69+
dotnet-version: '9.0.x'
6670
- name: 🚒 dotnet workload restore
6771
continue-on-error: true
6872
run: |

.nuke/build.schema.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"Build",
2828
"Clean",
2929
"CleanWellKnownTemporaryFiles",
30+
"CollectCodeCoverage",
3031
"Default",
3132
"DotnetCoreBuild",
3233
"DotnetCorePack",
@@ -50,8 +51,7 @@
5051
"Prettier",
5152
"RegenerateBuildConfigurations",
5253
"Restore",
53-
"Test",
54-
"TriggerCodeCoverageReports"
54+
"Test"
5555
]
5656
},
5757
"Verbosity": {

Directory.Build.targets

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<Project>
33
<ItemGroup>
44
<PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
5-
<PackageReference Include="JetBrains.ExternalAnnotations" PrivateAssets="all" />
65
</ItemGroup>
76
</Project>

0 commit comments

Comments
 (0)