Skip to content

Add FieldType.FullName in CloneTo and Fix methods for Field #424

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

Merged
KirillOsenkov merged 5 commits into from
Jul 9, 2026
Merged

Add FieldType.FullName in CloneTo and Fix methods for Field #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fa5c30f
Add `FieldType.FullName` in CloneTo and Fix methods for `Field`
ricaun Jul 9, 2026
43b02a4
Update `Fix` exception.
ricaun Jul 9, 2026
6778828
Update `Fix` to check `Name` first and `FieldType` when more than one…
ricaun Jul 9, 2026
1d5de5b
Remove `Mixins` namespace
ricaun Jul 9, 2026
2042168
Add space...
ricaun Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ILRepack/ReferenceFixator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,12 @@ private FieldReference Fix(FieldReference field)
field.DeclaringType = Fix(field.DeclaringType);
if (field.DeclaringType.IsDefinition && !field.IsDefinition)
{
FieldDefinition def = ((TypeDefinition)field.DeclaringType).Fields.FirstOrDefault(x => x.Name == field.Name);
var matches = ((TypeDefinition)field.DeclaringType).Fields.Where(f => f.Name == field.Name).ToList();
FieldDefinition def = matches.Count > 1 ?
matches.FirstOrDefault(f => f.FieldType.FullName == field.FieldType.FullName) :
matches.FirstOrDefault();
if (def == null)
throw new NullReferenceException("Field \"" + field + "\" not found in type \"" + field.DeclaringType + "\".");
throw new NullReferenceException("Field \"" + field + "\" with field type \"" + field.FieldType + "\" not found in type \"" + field.DeclaringType + "\".");
return def;
}
field.FieldType = Fix(field.FieldType);
Expand Down
2 changes: 1 addition & 1 deletion ILRepack/RepackImporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ private bool ShouldDrop<TMember>(TMember member) where TMember : ICustomAttribut
/// </summary>
private void CloneTo(FieldDefinition field, TypeDefinition nt)
{
if (nt.Fields.Any(x => x.Name == field.Name))
if (nt.Fields.Any(x => x.Name == field.Name && x.FieldType.FullName == field.FieldType.FullName))
{
return;
}
Expand Down