Skip to content

Consider namespace during collision detection #396

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 1 commit into from
Feb 28, 2025
Merged

Consider namespace during collision detection #396

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions ILRepack/RepackImporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public TypeDefinition Import(TypeDefinition type, Collection<TypeDefinition> col
return null;
}

TypeDefinition nt = _repackContext.TargetAssemblyMainModule.GetType(type.FullName);
TypeDefinition nt = _repackContext.TargetAssemblyMainModule.Types.FirstOrDefault(x => x.Name == type.Name && x.Namespace == type.Namespace);
bool justCreatedType = false;
if (nt == null)
{
Expand All @@ -165,20 +165,23 @@ public TypeDefinition Import(TypeDefinition type, Collection<TypeDefinition> col
else if (!type.IsPublic || internalize)
{
var originalModule = _repackContext.MappingHandler.GetOriginalModule(nt);

_logger.Verbose($"- Renaming previously imported type {nt.FullName} from {originalModule.Name}");

// rename the type previously imported.
// renaming the new one before import made Cecil throw an exception.
string other = GenerateName(nt, originalModule?.Mvid.ToString());

//Check whether renamed type already exists
TypeDefinition otherNt = _repackContext.TargetAssemblyMainModule.GetType(other);
TypeDefinition otherNt = _repackContext.TargetAssemblyMainModule.Types.FirstOrDefault(x => x.Name == other && x.Namespace == nt.Namespace);
if (otherNt != null)
{
var otherOriginalModule = _repackContext.MappingHandler.GetOriginalModule(otherNt);
_logger.Verbose($"- Collision found with type {otherNt.FullName} from {otherOriginalModule.Name}. Renaming now to a random name");
//Create a random name
other = GenerateName(nt);
}

_logger.Verbose("Renaming " + nt.FullName + " into " + other);
_logger.Verbose($"- Renaming {nt.FullName} from {originalModule.Name} into {nt.Namespace}.{other}");
nt.Name = other;
nt = CreateType(type, col, internalize, null);
justCreatedType = true;
Expand Down