Skip to content

Commit

Permalink
initial wip on net9 changes (#2373)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
david-driscoll authored Nov 29, 2024
1 parent 9891ead commit 2bb9217
Show file tree
Hide file tree
Showing 499 changed files with 15,851 additions and 7,836 deletions.
2 changes: 2 additions & 0 deletions .build/.build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
<PackageReference Include="Nuke.Common" />
<PackageReference Include="GitVersion.Tool" ExcludeAssets="All" />
<PackageReference Include="ReportGenerator" ExcludeAssets="All" />
<PackageReference Include="JetBrains.ReSharper.GlobalTools" ExcludeAssets="All" />
<PackageReference Include="JetBrains.dotCover.CommandLineTools" ExcludeAssets="All" />
<PackageReference Include="Rocket.Surgery.Nuke" />
<PackageReference Include="Polly" />
</ItemGroup>
Expand Down
5 changes: 2 additions & 3 deletions .build/Build.CI.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Nuke.Common.CI.GitHubActions;
using Nuke.Common.CI.GitHubActions.Configuration;
using Rocket.Surgery.Nuke.ContinuousIntegration;
using Rocket.Surgery.Nuke.DotNetCore;
using Rocket.Surgery.Nuke.GithubActions;

#pragma warning disable CA1050
Expand Down Expand Up @@ -62,7 +61,7 @@ public static RocketSurgeonGitHubActionsConfiguration CiMiddleware(RocketSurgeon
.Jobs.OfType<RocketSurgeonsGithubActionsJob>()
.First(z => z.Name.Equals("build", StringComparison.OrdinalIgnoreCase));
job
.UseDotNetSdks("8.0")
.UseDotNetSdks("8.0", "9.0")
.ConfigureStep<CheckoutStep>(step => step.FetchDepth = 0)
.PublishLogs<Pipeline>();

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

return configuration;
}
Expand Down
1 change: 0 additions & 1 deletion .build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public partial class Pipeline : NukeBuild,
ICanTestWithDotNetCore,
ICanPackWithDotNetCore,
IComprehendSamples,
IHaveDataCollector,
ICanClean,
IHaveCommonLintTargets,
// IHavePublicApis,
Expand Down
23 changes: 14 additions & 9 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,19 @@
"commands": ["jb"],
"rollForward": false
},
"nukeeper": {
"version": "0.35.0",
"commands": ["nukeeper"],
"jetbrains.dotcover.commandlinetools": {
"version": "2024.3.0",
"commands": ["dotnet-dotCover"],
"rollForward": false
},
"jetbrains.dottrace.globaltools": {
"version": "2024.3.0",
"commands": ["dottrace"],
"rollForward": false
},
"dotnet-coverage": {
"version": "17.12.6",
"commands": ["dotnet-coverage"],
"rollForward": false
},
"docfx": {
Expand All @@ -38,7 +48,7 @@
"rollForward": false
},
"strawberryshake.tools": {
"version": "14.0.0-rc.2",
"version": "14.2.0-p.4",
"commands": ["dotnet-graphql"],
"rollForward": false
},
Expand All @@ -56,11 +66,6 @@
"version": "0.7.1",
"commands": ["husky"],
"rollForward": false
},
"liquidtestreports.cli": {
"version": "2.0.0-beta.6",
"commands": ["liquid"],
"rollForward": false
}
}
}
4 changes: 2 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3063,7 +3063,7 @@ dotnet_diagnostic.rcs1258.severity = suggestion
dotnet_diagnostic.rcs1259.severity = suggestion

# Add/remove trailing comma
dotnet_diagnostic.rcs1260.severity = suggestion
dotnet_diagnostic.rcs1260.severity = none
# Options: roslynator_trailing_comma_style

# Use pattern matching
Expand Down Expand Up @@ -4677,7 +4677,7 @@ resharper_T4_wrap_lines = true
resharper_toplevel_function_declaration_return_type_style = do_not_change
resharper_toplevel_function_definition_return_type_style = do_not_change
resharper_trailing_comma_in_multiline_lists = true
resharper_trailing_comma_in_singleline_lists = true
resharper_trailing_comma_in_singleline_lists = false
resharper_use_continuous_indent_inside_initializer_braces = true
resharper_use_continuous_indent_inside_parens = true
resharper_use_continuous_line_indent_in_expression_braces = false
Expand Down
2 changes: 1 addition & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["local>RocketSurgeonsGuild/.github:renovate-config"],
"ignorePaths": ["**/node_modules/**", "**/bower_components/**", "**/*.csproj"],
"ignorePaths": ["**/node_modules/**", "**/*.csproj", "Directory.Packages.support.props"],
"packageRules": [
{
"matchCategories": ["js"],
Expand Down
56 changes: 43 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,20 @@ permissions:

jobs:
build:
permissions:
actions: read
checks: write
contents: read
deployments: read
id-token: none
issues: write
discussions: none
packages: none
pages: none
pull-requests: write
repository-projects: none
security-events: none
statuses: write
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -95,6 +109,10 @@ jobs:
uses: actions/[email protected]
with:
dotnet-version: '8.0.x'
- name: 🔨 Use .NET Core 9.0 SDK
uses: actions/[email protected]
with:
dotnet-version: '9.0.x'
- name: 🚒 dotnet workload restore
continue-on-error: true
run: |
Expand All @@ -113,7 +131,7 @@ jobs:
- name: 🚦 Test
id: test
run: |
dotnet .build/bin/Debug/.build.dll --target DotnetCoreTest Test TriggerCodeCoverageReports GenerateCodeCoverageReportCobertura GenerateCodeCoverageBadges GenerateCodeCoverageSummary GenerateCodeCoverageReport
dotnet .build/bin/Debug/.build.dll --target DotnetCoreTest Test CollectCodeCoverage GenerateCodeCoverageReportCobertura GenerateCodeCoverageBadges GenerateCodeCoverageSummary GenerateCodeCoverageReport
- name: 📦 Pack
id: pack
run: |
Expand All @@ -122,18 +140,6 @@ jobs:
id: default
run: |
dotnet .build/bin/Debug/.build.dll --target Default --skip Restore Build Test Pack
- name: 🏺 Publish coverage data
if: always()
uses: actions/[email protected]
with:
name: 'coverage'
path: 'coverage/'
- name: 📫 Publish Coverage
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]')
uses: codecov/[email protected]
with:
name: 'actions-${{ matrix.os }}'
token: '${{ secrets.CODECOV_TOKEN }}'
- name: 🏺 Publish logs
if: always()
uses: actions/[email protected]
Expand All @@ -146,6 +152,30 @@ jobs:
with:
name: 'test data'
path: 'artifacts/test/'
- name: 📫 Publish Test Results
if: always()
uses: EnricoMi/publish-unit-test-result-action@v2
with:
files: 'artifacts/test/**/*.trx'
- name: 🏺 Publish coverage data
if: always()
uses: actions/[email protected]
with:
name: 'coverage'
path: 'coverage/'
- name: 📫 Publish Coverage Comment
if: github.event_name == 'pull_request'
uses: marocchino/sticky-pull-request-comment@v2
with:
header: 'Coverage'
path: 'coverage/summary/SummaryGithub.md'
GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
- name: 📫 Publish Codecov Coverage
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]')
uses: codecov/[email protected]
with:
name: 'actions'
token: '${{ secrets.CODECOV_TOKEN }}'
- name: 🏺 Publish NuGet Packages
if: always()
uses: actions/[email protected]
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: 🔨 Use .NET Core 9.0 SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: '9.0.x'
- name: 🚒 dotnet workload restore
continue-on-error: true
run: |
Expand Down
4 changes: 2 additions & 2 deletions .nuke/build.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"Build",
"Clean",
"CleanWellKnownTemporaryFiles",
"CollectCodeCoverage",
"Default",
"DotnetCoreBuild",
"DotnetCorePack",
Expand All @@ -50,8 +51,7 @@
"Prettier",
"RegenerateBuildConfigurations",
"Restore",
"Test",
"TriggerCodeCoverageReports"
"Test"
]
},
"Verbosity": {
Expand Down
1 change: 0 additions & 1 deletion Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
<Project>
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
<PackageReference Include="JetBrains.ExternalAnnotations" PrivateAssets="all" />
</ItemGroup>
</Project>
Loading

0 comments on commit 2bb9217

Please sign in to comment.