Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#1787 Upgrade to .NET 8 #1789

Merged
merged 21 commits into from
Nov 19, 2023
Merged

#1787 Upgrade to .NET 8 #1789

merged 21 commits into from
Nov 19, 2023

Conversation

ggnaegi
Copy link
Member

@ggnaegi ggnaegi commented Nov 19, 2023 •
edited by raman-m
Loading

Closes #1787

Proposed Changes

  • Targeting frameworks net6.0, net7.0, net8.0
  • Using C# Preprocessor when needed
  • Tests and Samples should target net6.0;net7.0;net8.0 too
  • Updating .editorconfig, making sure we are using 2 white spaces for indentation in .xml files

@ggnaegi ggnaegi changed the title Release/net8 1787 Upgrade to .NET 8 Nov 19, 2023
@ggnaegi ggnaegi changed the title 1787 Upgrade to .NET 8 #1787 Upgrade to .NET 8 Nov 19, 2023
@raman-m raman-m added feature A new feature hotfix Gitflow: Hotfix issue, PR related to hotfix branch high High priority labels Nov 19, 2023
@raman-m raman-m linked an issue Nov 19, 2023 that may be closed by this pull request
Ocelot to .NET 8 #1787
Closed
@raman-m
Copy link
Member

raman-m commented Nov 19, 2023

Did you sleep this night? 😮

raman-m
raman-m requested changes Nov 19, 2023
View reviewed changes
Copy link
Member

@raman-m raman-m left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK... Good job! 👍
I see the following gaps:

  • Changed C# files even there is no C# preprocessor directive
  • Don't change source & tests! Only .csproj files! And required for migration.
  • Some proj-files have bad formatting as changes but it seems tabs were not replaced with spaces

.circleci/config.yml Outdated Show resolved Hide resolved
.circleci/config.yml Outdated Show resolved Hide resolved
.editorconfig Show resolved Hide resolved
Ocelot.sln Outdated Show resolved Hide resolved
docker/Dockerfile.base Show resolved Hide resolved
src/Ocelot/WebSockets/ClientWebSocketOptionsProxy.cs Show resolved Hide resolved
test/Ocelot.AcceptanceTests/ConsulWebSocketTests.cs Show resolved Hide resolved
test/Ocelot.AcceptanceTests/RequestIdTests.cs Show resolved Hide resolved
test/Ocelot.UnitTests/Configuration/Validation/FileConfigurationFluentValidatorTests.cs Show resolved Hide resolved
test/Ocelot.UnitTests/LoadBalancer/RoundRobinTests.cs Show resolved Hide resolved
@raman-m
Copy link
Member

raman-m commented Nov 19, 2023

Main concern!
You tried to unite all changes into one PR...
But we have to make new Docker image first to prepare CircleCI pipeline... After that we can update projects...
Are you still sure to merge one PR?

@ggnaegi
Copy link
Member Author

ggnaegi commented Nov 19, 2023 •
edited
Loading

Main concern!
You tried to unite all changes into one PR...
But we have to make new Docker image first to prepare CircleCI pipeline... After that we can update projects...
Are you still sure to merge one PR?

Yes! It was already quite something, all tests are passing locally.

@ggnaegi
Copy link
Member Author

ggnaegi commented Nov 19, 2023

OK... Good job! 👍 I see the following gaps:

  • Changed C# files even there is no C# preprocessor directive
  • Don't change source & tests! Only .csproj files! And required for migration.
  • Some proj-files have bad formatting as changes but it seems tabs were not replaced with spaces

I did only changes when warnings were prompted or build failed.

raman-m
raman-m approved these changes Nov 19, 2023
View reviewed changes
Copy link
Member

@raman-m raman-m left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ready to merge

@ggnaegi
Copy link
Member Author

ggnaegi commented Nov 19, 2023

@raman-m fine for me as soon as the docker image is available 😹

@raman-m raman-m merged commit 24b507e into ThreeMammals:release/net8 Nov 19, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@raman-m raman-m raman-m approved these changes

Assignees

@ggnaegi ggnaegi

Labels
feature A new feature high High priority hotfix Gitflow: Hotfix issue, PR related to hotfix branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Ocelot to .NET 8
2 participants
@ggnaegi @raman-m