FEAT: Upgrade to .NET 10 by matthewtoghill · Pull Request #102 · onebeyond/monaco

matthewtoghill · 2025-12-01T22:56:14Z

Description

Upgrade the solution to .NET 10.

chore: Packages updated
fix: Breaking changes resolved with:
- MockQueryable - API change related to AsQueryable()
- Swashbuckle & Microsoft.OpenApi - API changes related to upgrading the OpenApi version
fix: remove [FromFile] annotation on endpoint IFormFile parameter
feat: make use of new unbound generic type support for nameof
feat: move common MSBuild properties to Directory.Build.props file

Related Issue

Closes #101

How Has This Been Tested?

Tests pass
Test apps created from template created successfully, build and run as expected

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I have read the CONTRIBUTING document.
I have added tests to cover my changes.
All new and existing tests passed.

socket-security · 2025-12-01T22:57:01Z

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff	Package	Supply Chain Security	Quality
	respawn@7.0.0
	scalar.aspnetcore@2.12.27
	skiasharp@3.119.0 ⏵ 3.119.1
	xunit.runner.visualstudio@3.1.4 ⏵ 3.1.5	^-1
	skiasharp.nativeassets.linux.nodependencies@3.119.0 ⏵ 3.119.1
	awesomeassertions@9.1.0 ⏵ 9.3.0	^-4
	serilog.sinks.console@6.0.0 ⏵ 6.1.1	^-6
	microsoft.net.test.sdk@17.14.1 ⏵ 18.0.1
	delegatedecompiler.entityframeworkcore5@0.34.2 ⏵ 0.35.3
	keycloak.net.core@1.0.34 ⏵ 1.0.38
	polly.extensions@8.6.3 ⏵ 8.6.5
	polly.core@8.6.3 ⏵ 8.6.5	^-2
	serilog.settings.configuration@9.0.0 ⏵ 10.0.0	^-4
	serilog.extensions.hosting@9.0.0 ⏵ 10.0.0	^-4
	serilog.aspnetcore@9.0.0 ⏵ 10.0.0	^-2
	masstransit@8.5.2 ⏵ 8.5.7	^-6
	masstransit.rabbitmq@8.5.2 ⏵ 8.5.7	^-5
	masstransit.azure.servicebus.core@8.5.2 ⏵ 8.5.7	^-5
	masstransit.entityframeworkcore@8.5.2 ⏵ 8.5.7	⁺¹	⁺²
	fluentvalidation@12.0.0 ⏵ 12.1.1
	fluentvalidation.dependencyinjectionextensions@12.0.0 ⏵ 12.1.1
	asp.versioning.mvc.apiexplorer@8.1.0 ⏵ 8.1.1
	testcontainers.rabbitmq@4.6.0 ⏵ 4.10.0	⁺²
	testcontainers.mssql@4.6.0 ⏵ 4.10.0	⁺⁴
	testcontainers.azurite@4.6.0 ⏵ 4.10.0	⁺²
	testcontainers@4.6.0 ⏵ 4.10.0	⁺⁶
	testcontainers.keycloak@4.6.0 ⏵ 4.10.0	⁺²
	serilog.sinks.applicationinsights@4.0.0 ⏵ 5.0.0	⁺¹
	azure.storage.blobs@12.25.0 ⏵ 12.27.0
	microsoft.extensions.dependencyinjection.abstractions@9.0.0 ⏵ 10.0.2	⁺¹
	microsoft.entityframeworkcore.design@9.0.8 ⏵ 10.0.2
	microsoft.extensions.hosting.abstractions@9.0.0 ⏵ 10.0.2
See 11 more rows in the dashboard

View full report

…er small refactors to update the current code with the most recent language features.

Added CompatibilityLevel configuration to EF Core configuration for most recent features usages.

src/Content/Backend/Solution/Monaco.Template.Backend.sln

src/Content/Backend/Solution/Directory.Build.props

CesarD · 2025-12-10T16:18:42Z

@matthewtoghill please check the latest changes out... I've replaced the Swashbuckle implementation for Swagger with Scalar and also included the document and operation transformers for the API security so everything can work pretty similar to how it was with Swashbuckle, but without all the custom code for fixing its issues.
Feel free to give it a try and check out the different scenarios. It should exclude the security transformations if Auth flag is disabled.

… block extension methods.

…auth flag is false as base property is also removed

matthewtoghill · 2025-12-15T18:16:32Z

@matthewtoghill please check the latest changes out... I've replaced the Swashbuckle implementation for Swagger with Scalar and also included the document and operation transformers for the API security so everything can work pretty similar to how it was with Swashbuckle, but without all the custom code for fixing its issues. Feel free to give it a try and check out the different scenarios. It should exclude the security transformations if Auth flag is disabled.

Looks good, there was an old issue related to the auth flag being false that is now fixed, or it can be fixed another way if you prefer. When auth or apiService flags are false then the IntegrationTest base class does not include the RequiresAuthentication property.

EntityTypeConfiguration now uses ValueGeneratedNever for IDs, shifting ID generation from the database to the application (via Guid.NewGuid()). Updated entity constructors, command handlers, and tests to align with this approach. Adjusted EF Core migrations and model snapshots to remove ValueGeneratedOnAdd. Cleaned up related test and factory code for consistency.

...nt/Backend/Solution/Monaco.Template.Backend.Common.Api/OpenApi/OAuth2OperationTransformer.cs

Refactored MediatorExtensions to support CancellationToken in all methods, improving async and cancellation handling. Introduced CreatedResponse record for standardized creation responses. Updated Companies, Products, and Files endpoints to use new Mediator methods and return Created<CreatedResponse>. Adjusted integration tests to validate CreatedResponse. Improved code clarity and authorization policy checks.

CesarD · 2025-12-28T21:12:36Z

@matthewtoghill please review the latest changes I introduced.
Basically, I refactored a little bit the MediatR extensions we had to improve a little bit their naming and also to include the CancellationToken in the async calls being made. I also included a couple more methods for simplifying how to return other types of responses from the endpoint in case of success.

Lastly, please be kind to let me know if you find any issue when running the whole tests battery (including the Integration ones in the same process)... I experienced an issue with the CreateProduct one, where the assertion checking if the ProductCreated message has been consumed is failing, but when I run it individually it succeeds, so I'm not sure if it's my crappy laptop or what, so if you could run it and let me know, that would be great!

Thanks! Cheers!

- Use [Collection("IntegrationTests")] to share AppFixture across all test classes, starting containers only once per run - Add Respawn for fast, reliable DB resets between tests - Apply DB migrations once in fixture, not per test - Remove redundant DbContext/migration logic from test base - Disable test collection parallelization via xunit.runner.schema.json - Update dependencies and project files for Respawn and config - Simplify and clarify test setup/teardown for better reliability

CesarD

I have added a few fixes to Integration Tests and reconsidered @matthewtoghill 's proposal for implementing Spawner for resetting the DB between test classes. Now Integration Tests will share the same AppFixture so there won't be a constant regeneration of test containers between runs and as a consequence these tests have suffered a huge boost in execution speed.

I left out some considerations on the integration tests that I need to address

matthewtoghill · 2026-02-01T22:47:57Z

@matthewtoghill please review the latest changes I introduced. Basically, I refactored a little bit the MediatR extensions we had to improve a little bit their naming and also to include the CancellationToken in the async calls being made. I also included a couple more methods for simplifying how to return other types of responses from the endpoint in case of success.

Lastly, please be kind to let me know if you find any issue when running the whole tests battery (including the Integration ones in the same process)... I experienced an issue with the CreateProduct one, where the assertion checking if the ProductCreated message has been consumed is failing, but when I run it individually it succeeds, so I'm not sure if it's my crappy laptop or what, so if you could run it and let me know, that would be great!

Thanks! Cheers!

@CesarD - I get the same issue with the test, but this seems to be fixed when I revert the change to lines 334 and 339 from
(await apiTestHarness.Published.SelectAsync<ProductCreated>().AnyAsync())
back to
(await apiTestHarness.Published.Any<ProductCreated>())

and

(await consumerHarness.Consumed.SelectAsync<ProductCreated>().AnyAsync())
back to
(await consumerHarness.Consumed.Any<ProductCreated>())

I've pushed this and some other fixes from my testing. I think we should be there for merging this PR now?

…s as no longer needed

CesarD · 2026-02-01T22:58:32Z

@matthewtoghill please review the latest changes I introduced. Basically, I refactored a little bit the MediatR extensions we had to improve a little bit their naming and also to include the CancellationToken in the async calls being made. I also included a couple more methods for simplifying how to return other types of responses from the endpoint in case of success.

Lastly, please be kind to let me know if you find any issue when running the whole tests battery (including the Integration ones in the same process)... I experienced an issue with the CreateProduct one, where the assertion checking if the ProductCreated message has been consumed is failing, but when I run it individually it succeeds, so I'm not sure if it's my crappy laptop or what, so if you could run it and let me know, that would be great!

Thanks! Cheers!

@CesarD - I get the same issue with the test, but this seems to be fixed when I revert the change to lines 334 and 339 from
(await apiTestHarness.Published.SelectAsync<ProductCreated>().AnyAsync())
back to
(await apiTestHarness.Published.Any<ProductCreated>())

and

(await consumerHarness.Consumed.SelectAsync<ProductCreated>().AnyAsync())
back to
(await consumerHarness.Consumed.Any<ProductCreated>())

I've pushed this and some other fixes from my testing. I think we should be there for merging this PR now?

I actually found out the issue but haven't gotten the chance to finish applying the fix yet:
The Test Harness can only be created and used once per test, if you use it more than once, then it can't assert correctly which was done and where, hence why a test always fails when running the whole test suite and succeeds when running it independently. This is something that I have also already confirmed with the docs and with Chris Patterson himself, so I need to rework the IntegrationTest and AppFixture a little bit in order to organize things in a way that allows to easily generate a new WebAppFactory with the TestHarness registered for the tests that require it. I'll try to have it done this week, if possible.

Refactor and modernize integration test infrastructure: - Pin Testcontainers images for SQL Server, RabbitMQ, Azurite, Keycloak - Require IServiceProvider for DbContext resolution; update all usages - Move MassTransit test harness setup to extension methods - Add GetCustomFactory for flexible Web/Worker factory config - Remove direct IHost usage for worker; use DI instead - Use per-test FlurlClient with proper disposal - Improve resource cleanup in AppFixture.DisposeAsync - Use Parallel.ForEachAsync for blob cleanup in ProductsTests - Enhance MassTransit message assertions for content matching - General code cleanup and modernization for maintainability and test isolation

CesarD · 2026-03-02T17:04:09Z

@matthewtoghill please review the latest changes I introduced. Basically, I refactored a little bit the MediatR extensions we had to improve a little bit their naming and also to include the CancellationToken in the async calls being made. I also included a couple more methods for simplifying how to return other types of responses from the endpoint in case of success.
Lastly, please be kind to let me know if you find any issue when running the whole tests battery (including the Integration ones in the same process)... I experienced an issue with the CreateProduct one, where the assertion checking if the ProductCreated message has been consumed is failing, but when I run it individually it succeeds, so I'm not sure if it's my crappy laptop or what, so if you could run it and let me know, that would be great!
Thanks! Cheers!

@CesarD - I get the same issue with the test, but this seems to be fixed when I revert the change to lines 334 and 339 from
(await apiTestHarness.Published.SelectAsync<ProductCreated>().AnyAsync())
back to
(await apiTestHarness.Published.Any<ProductCreated>())
and
(await consumerHarness.Consumed.SelectAsync<ProductCreated>().AnyAsync())
back to
(await consumerHarness.Consumed.Any<ProductCreated>())
I've pushed this and some other fixes from my testing. I think we should be there for merging this PR now?

I actually found out the issue but haven't gotten the chance to finish applying the fix yet: The Test Harness can only be created and used once per test, if you use it more than once, then it can't assert correctly which was done and where, hence why a test always fails when running the whole test suite and succeeds when running it independently. This is something that I have also already confirmed with the docs and with Chris Patterson himself, so I need to rework the IntegrationTest and AppFixture a little bit in order to organize things in a way that allows to easily generate a new WebAppFactory with the TestHarness registered for the tests that require it. I'll try to have it done this week, if possible.

Ok @matthewtoghill, I have finally pushed the latest version with the fixes and refactors needed for the Integration Tests to work correctly. Now they have a bit better isolation and so the instantiation of a new instance of the WebAppFactory and the WorkerServiceFactory allow to register them with the Test Harness only when needed and use it only once so it doesn't get reused across different tests which is what was messing them up in the first place.
Please feel free to test it and let me know if you find anything odd. Integration Tests run super fast now!

BTW: sorry for the long wait, I had to sort some other things out and couldn't spare the time for this, but now it's finally done 😄

matthewtoghill added 6 commits December 1, 2025 08:22

feat: update target framework on projects to dotnet 10

febce6c

feat: update release pipeline to use dotnet-version 10.x

1d0c713

chore: update readme

04f3827

fix: remove FromForm annotation on endpoint for IFormFile parameter

fb3d167

chore: update packages and resolve breaking changes

3c06631

feat: update use of nameof with support for unbound generic types

ded88d2

CesarD self-requested a review December 2, 2025 02:00

matthewtoghill and others added 6 commits December 3, 2025 11:10

chore: formatting

10ad0c4

Applying C# 14 new features to code, such as extension blocks and oth…

feb2b7f

…er small refactors to update the current code with the most recent language features.

Resolving merge conflicts.

922ee59

Updated dependencies.

2fa537a

Added CompatibilityLevel configuration to EF Core configuration for most recent features usages.

chore: move common MSBuild properties to Directory.Build.props file

e3596dc

chore: update packages

14a8fc7

matthewtoghill commented Dec 10, 2025

View reviewed changes

src/Content/Backend/Solution/Monaco.Template.Backend.sln Outdated Show resolved Hide resolved

matthewtoghill commented Dec 10, 2025

View reviewed changes

src/Content/Backend/Solution/Directory.Build.props Show resolved Hide resolved

refactor: Migrate OpenAPI docs from Swagger to Scalar.AspNetCore

1a00035

CesarD and others added 5 commits December 11, 2025 01:53

refactor: finished converting the last missing extension methods into…

3d515d7

… block extension methods.

chore: update packages

226b0e6

chore: remove RequiresAuthentication from integration tests when the …

67f4af3

…auth flag is false as base property is also removed

feat: remove sln file

ba2d991

chore: match condition to base class

dcc6cdb

matthewtoghill commented Dec 23, 2025

View reviewed changes

...nt/Backend/Solution/Monaco.Template.Backend.Common.Api/OpenApi/OAuth2OperationTransformer.cs Outdated Show resolved Hide resolved

CesarD added 2 commits December 28, 2025 21:47

Undo accidental cleanup.

fa691aa

CesarD added 2 commits January 21, 2026 00:29

Update NuGet package versions to latest releases

badcdbb

Formatting.

5a7d697

CesarD previously approved these changes Jan 21, 2026

View reviewed changes

CesarD self-requested a review January 21, 2026 18:14

matthewtoghill added 3 commits February 1, 2026 18:28

fix: revert change to product test

b6fb8d8

chore: update packages and comment formatting

27a68de

fix: integration test issues

470b72f

chore: remove template config special custom operations for slnx file…

f1b5237

…s as no longer needed

Resolved merge conflicts.

719238a

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FEAT: Upgrade to .NET 10#102

FEAT: Upgrade to .NET 10#102
matthewtoghill wants to merge 30 commits intoonebeyond:mainfrom
matthewtoghill:feat/dotnet-10

matthewtoghill commented Dec 1, 2025 •

edited

Loading

Uh oh!

socket-security bot commented Dec 1, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

CesarD commented Dec 10, 2025

Uh oh!

matthewtoghill commented Dec 15, 2025

Uh oh!

Uh oh!

CesarD commented Dec 28, 2025

Uh oh!

CesarD left a comment

Uh oh!

matthewtoghill commented Feb 1, 2026

Uh oh!

CesarD commented Feb 1, 2026

Uh oh!

CesarD commented Mar 2, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

matthewtoghill commented Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Related Issue

How Has This Been Tested?

Types of changes

Checklist:

Uh oh!

socket-security bot commented Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

CesarD commented Dec 10, 2025

Uh oh!

matthewtoghill commented Dec 15, 2025

Uh oh!

Uh oh!

CesarD commented Dec 28, 2025

Uh oh!

CesarD left a comment

Choose a reason for hiding this comment

Uh oh!

matthewtoghill commented Feb 1, 2026

Uh oh!

CesarD commented Feb 1, 2026

Uh oh!

CesarD commented Mar 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

matthewtoghill commented Dec 1, 2025 •

edited

Loading

socket-security bot commented Dec 1, 2025 •

edited

Loading

CesarD commented Mar 2, 2026 •

edited

Loading