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.

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

Optimise conditional compiles & package dependencies #1346

Open
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

thompson-tomo
Copy link

@thompson-tomo thompson-tomo commented Apr 14, 2024

Gone through and cleaned up conditional compilations to reduce future maintenance and removed redundant conditional code.

At the same time some packages have become conditional when they can be provided by the framework.

@mythz
Copy link
Member

mythz commented Apr 14, 2024

Thanks for the big PR! Can you also approve the Contributor License Agreement so we can look at merging this, thanks.

@mythz
Copy link
Member

mythz commented Apr 14, 2024

We don't want to mix whitespace changes with other code changes in the same PR which makes it a huge PR for us to inititally review and and for others later when looking through the code base commit history. If you can remove the whitespace changes we can look at accepting the build symbol changes separately.

For widespread whitespace changes like this we'll look at running a tool like tool like dotnet format ideally from a GitHub action.

@thompson-tomo thompson-tomo force-pushed the main branch 13 times, most recently from 0f1ceb7 to 9fe000e Compare May 29, 2024 12:49
@thompson-tomo
Copy link
Author

Currently working through painfully removing white space changes.

@thompson-tomo thompson-tomo force-pushed the main branch 14 times, most recently from 7b714f2 to 34c752d Compare May 30, 2024 09:01
@mythz
Copy link
Member

mythz commented May 30, 2024

Wouldn't it be easier to stash your symbol changes, then reset back your codebase back to head then reapply your symbol changes?

This PR is currently in conflict, not sure it's going to be mergeable after your changes. IMO its better to start with a clean PR.

@thompson-tomo thompson-tomo force-pushed the main branch 3 times, most recently from b0b0222 to ad470a3 Compare May 30, 2024 11:14
Copy link
Author

@thompson-tomo thompson-tomo left a comment

Choose a reason for hiding this comment

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

Whitespace changes should now all be reverted and merge conflict was easily fixed. 😃

@thompson-tomo thompson-tomo force-pushed the chore/PackageCleanupConditionalCompilation branch from 2075487 to 647c24a Compare May 30, 2024 11:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants