Fix incorrect lockfiles being generated in some situations #7307
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What was the end-user or developer problem that led to this PR?
Since 5f24f06, Bundler will automatically complete the resolution it found with extra platforms that are also valid for the resolution that was initially found.
However, if one of the platform specific gems being added brings extra dependencies, the new resolution will never be invalid since we'll be missing the extra dependency.
What is your fix for the problem, implemented in this PR?
This PR fixes the issue by avoiding the addition of platforms and platform specific gems in the above situation.
Closes #7304.
Builds on top of #7306.
Make sure the following tasks are checked