Add do...while loop in the SetValue method of SerializationResourceManager.cs until resourceName is unique #13578
+10
−3
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LeafShi1
requested review from
Copilot,
KlausLoeffelmann,
ricardobossan and
Epica3055
There was a problem hiding this comment.
Pull Request Overview
This PR ensures that SetValue in SerializationResourceManager.cs repeatedly generates a new resourceName until it’s unique, fixing duplicate suffixes when serializing collections.
- Replaces single conditional append with a
do…whileloop to retry name generation - Changes the existence check from
TryGetValueon the base name toContainsKeyon the currentresourceName - Updates how
countis retrieved and used when building the new name
Comments suppressed due to low confidence (1)
src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/ResourceCodeDomSerializer.SerializationResourceManager.cs:787
- Because
countis appended before it’s incremented, the first generated name can benameBase0whenappendCountis true but no existing entries are found. Movecount++before formattingresourceName(or restructure the loop) so the suffix starts at 1.
resourceName = $"{nameBase}{count}";
...omponentModel/Design/Serialization/ResourceCodeDomSerializer.SerializationResourceManager.cs
Outdated
Show resolved
Hide resolved
…nager.cs until resourceName is unique
LeafShi1
force-pushed
the
Issue_12595_fix_SetValue_SerializationResourceManager.cs
branch
from
3395dff to
55afccb
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #13578 +/- ##
===================================================
- Coverage 76.59901% 76.59527% -0.00375%
===================================================
Files 3230 3230
Lines 639161 639217 +56
Branches 47297 47304 +7
===================================================
+ Hits 489591 489610 +19
- Misses 145988 146038 +50
+ Partials 3582 3569 -13
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
|
All LGTM! |
LeafShi1
deleted the
Issue_12595_fix_SetValue_SerializationResourceManager.cs
branch
KlausLoeffelmann
pushed a commit
to KlausLoeffelmann/winforms
that referenced
this pull request
Jun 16, 2025
…nager.cs until resourceName is unique (dotnet#13578) * Add do...while loop in the SetValue method of SerializationResourceManager.cs until resourceName is unique * Check nameBase directly rather than resourceName for clarity
|
/backport to release/8.0 |
|
Started backporting to release/8.0: https://github.com/dotnet/winforms/actions/runs/15725589917 |
|
/backport to release/9.0 |
|
Started backporting to release/9.0: https://github.com/dotnet/winforms/actions/runs/15725601101 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #12595
Root Cause
This issue is caused by replacing
for (;;)withif (appendCount || _nameTable.TryGetValue(nameBase, out count))in PR #8332, which leads to resource name conflicts.Proposed changes
Customer Impact
Regression?
Risk
Screenshots
Before
Paste after the second time, the resource will end up using the same number 1 over and over
After
Resource suffixes are increasing
Test methodology
Test environment(s)
Microsoft Reviewers: Open in CodeFlow