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

Renaming conflicting resources #11505

Merged
merged 1 commit into from
Feb 26, 2025
Merged

Conversation

MichalPavlik
Copy link
Member

Fixes first part of #11494

Context

We have resources with same name but different content in different projects. It prevents merging our resources to single project and proceed with #11494.

Changes Made

A prefix was added to the resource names to avoid conflicts.

Testing

Existing unit tests.

Notes

This is a minimal change to keep existing behavior.

@MichalPavlik MichalPavlik requested a review from Copilot February 26, 2025 11:59

Choose a reason for hiding this comment

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

Copilot reviewed 15 out of 15 changed files in this pull request and generated no comments.

Comments suppressed due to low confidence (3)

src/MSBuild/XMake.cs:1312

  • Please ensure that the new resource key 'XMake.ProjectUpgradeNeededToVcxProj' is correctly defined in the resource files and that any test expectations relying on the old key are updated accordingly.
InitializationException.Throw(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("XMake.ProjectUpgradeNeededToVcxProj", projectFile), null);

src/MSBuild/XMake.cs:4417

  • Confirm that the updated resource key 'XMake.LoggerNotFoundError' is uniformly applied and available across the codebase, as replacing the key may affect logger lookup messages.
InitializationException.VerifyThrow(logger != null, "XMake.LoggerNotFoundError", unquotedParameter);

src/MSBuild/XMake.cs:4421

  • Verify that the new resource key 'XMake.LoggerCreationError' is defined in the resource files, and note that similar changes in subsequent catch blocks (lines 4425, 4429, 4433, 4437) should be checked for consistent resource key availability.
InitializationException.Throw("XMake.LoggerCreationError", unquotedParameter, e, false);
Copy link
Member

@AR-May AR-May left a comment

Choose a reason for hiding this comment

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

LGTM

@MichalPavlik MichalPavlik merged commit e18e7f0 into main Feb 26, 2025
10 checks passed
@MichalPavlik MichalPavlik deleted the dev/mipavlik/fix-resource-duplicates branch February 26, 2025 13:00
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.

3 participants