Skip to content

Don't use Dictionary<K,V> to avoid duplicate value exception (#7340) #7345

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
jonathanpeppers merged 1 commit into from
Sep 7, 2022
Merged

Don't use Dictionary<K,V> to avoid duplicate value exception (#7340) #7345

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions src/Xamarin.Android.Build.Tasks/Utilities/TypeMapGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ internal sealed class ModuleReleaseData
public byte[] MvidBytes;
public AssemblyDefinition Assembly;
public TypeMapReleaseEntry[] Types;
public Dictionary<uint, TypeMapReleaseEntry> DuplicateTypes;
public List<TypeMapReleaseEntry> DuplicateTypes;
public string AssemblyName;
public string AssemblyNameLabel;
public string OutputFilePath;
Expand Down Expand Up @@ -382,7 +382,7 @@ bool GenerateRelease (bool skipJniAddNativeMethodRegistrationAttributeScan, List
Assembly = td.Module.Assembly,
AssemblyName = td.Module.Assembly.Name.Name,
TypesScratch = new Dictionary<string, TypeMapReleaseEntry> (StringComparer.Ordinal),
DuplicateTypes = new Dictionary<uint, TypeMapReleaseEntry> (),
DuplicateTypes = new List<TypeMapReleaseEntry> (),
};
tempModules.Add (moduleUUID, moduleData);
}
Expand Down Expand Up @@ -410,7 +410,7 @@ bool GenerateRelease (bool skipJniAddNativeMethodRegistrationAttributeScan, List
// build) and has no value for the end user. The message is left here because it may be useful to us
// in our devloop at some point.
//logger ($"Warning: duplicate Java type name '{entry.JavaName}' in assembly '{moduleData.AssemblyName}' (new token: {entry.Token}).");
moduleData.DuplicateTypes.Add (entry.Token, entry);
moduleData.DuplicateTypes.Add (entry);
} else
moduleData.TypesScratch.Add (entry.JavaName, entry);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Utilities/TypeMappingReleaseNativeAssemblyGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ void WriteMapModules (NativeAssemblyGenerator generator, StreamWriter mapOutput,
if (mapOutput != null) {
WriteManagedMaps (generator, mapOutput, mapName, data.Types);
if (data.DuplicateTypes.Count > 0) {
WriteManagedMaps (generator, mapOutput, duplicateMapName, data.DuplicateTypes.Values);
WriteManagedMaps (generator, mapOutput, duplicateMapName, data.DuplicateTypes);
}
}
}
Expand Down