[release/10.0] Update TypeMap attribute handling#123558
Merged
steveisok merged 7 commits intorelease/10.0from Jan 26, 2026
Merged
[release/10.0] Update TypeMap attribute handling#123558steveisok merged 7 commits intorelease/10.0from
steveisok merged 7 commits intorelease/10.0from
Conversation
- Mark TypeMapAssemblyTargetAttributes when a typemapuniverse is marked - Recurse through TypeMapAssemblyTarget assemblies to find all TypeMapAttributes - Refactor TypeMapHandler construction and initialization - Use TypeReferenceEqualityComparer for Dictionaries - Add more test coverage
…ap.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Contributor
|
Tagging subscribers to this area: @dotnet/interop-contrib |
Contributor
|
Somehow we missed this one, I thought it had already been cherry-picked. Thank you @AaronRobinsonMSFT! 😅 |
Member
|
Approved over email |
Member
|
Test app for validation using System;
using System.Runtime.InteropServices;
[assembly: TypeMapAssemblyTarget<MyTypeMapGroup>("TypeMapLib")]
[assembly: TypeMap<MyTypeMapGroup>("LocalEntry", typeof(LocalTarget))]
[assembly: TypeMapAssociation<MyTypeMapGroup>(typeof(LocalSource), typeof(LocalProxy))]
public class LocalTarget;
public class LocalSource;
public class LocalProxy;
class Program
{
static int Main()
{
int failures = 0;
// Root the types explicitly so the trimmer keeps them.
// This ensures any failure is purely about the TypeMap attribute discovery,
// not about the types themselves being trimmed.
GC.KeepAlive(typeof(LocalTarget));
GC.KeepAlive(typeof(LocalSource));
GC.KeepAlive(typeof(LocalProxy));
GC.KeepAlive(typeof(GreetingTarget));
GC.KeepAlive(typeof(FarewellTarget));
GC.KeepAlive(typeof(FarewellTrimTarget));
GC.KeepAlive(typeof(GreetingSource));
GC.KeepAlive(typeof(GreetingProxy));
var externalMap = TypeMapping.GetOrCreateExternalTypeMapping<MyTypeMapGroup>();
failures += Check(externalMap.TryGetValue("LocalEntry", out _),
"External map: 'LocalEntry' (same-assembly)");
failures += Check(externalMap.TryGetValue("Greeting", out _),
"External map: 'Greeting' from TypeMapLib (CROSS-ASSEMBLY — fails without PR fix)");
failures += Check(externalMap.TryGetValue("Farewell", out _),
"External map: 'Farewell' from TypeMapLib (CROSS-ASSEMBLY — fails without PR fix)");
var proxyMap = TypeMapping.GetOrCreateProxyTypeMapping<MyTypeMapGroup>();
_ = new LocalSource();
failures += Check(proxyMap.TryGetValue(typeof(LocalSource), out _),
"Proxy map: LocalSource->LocalProxy (same-assembly)");
_ = new GreetingSource();
failures += Check(proxyMap.TryGetValue(typeof(GreetingSource), out _),
"Proxy map: GreetingSource->GreetingProxy from TypeMapLib (CROSS-ASSEMBLY — fails without PR fix)");
if (failures == 0)
Console.WriteLine("\nPASS: All cross-assembly TypeMap entries preserved after trimming.");
else
Console.Error.WriteLine($"\nFAILED: {failures} check(s) failed — trimmer removed cross-assembly TypeMap data.");
return failures;
}
static int Check(bool condition, string description)
{
if (condition)
{
Console.WriteLine($" OK: {description}");
return 0;
}
else
{
Console.Error.WriteLine($" FAIL: {description}");
return 1;
}
}
} |
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Backport of #120477 to release/10.0
/cc @jkoritzinsky @jtschuster
Customer Impact
Type maps created with the new
System.Runtime.InteropServices.TypeMapAttributewould fail to work across assemblies as described when the user publishes their app withPublishTrimmedset totrue. This affects our partner teams who want to take advantage of this API (.NET for Android, CsWinRT).Regression
This was a new API in .NET 10
Testing
Many unit tests were added
Risk
[High/Medium/Low. Justify the indication by mentioning how risks were measured and addressed.]
Low. This only affects a new API in .NET 10 and is a targeted fix with included testing,
IMPORTANT: If this backport is for a servicing release, please verify that:
release/X.0-staging, notrelease/X.0.release/X.0(no-stagingsuffix).Package authoring no longer needed in .NET 9
IMPORTANT: Starting with .NET 9, you no longer need to edit a NuGet package's csproj to enable building and bump the version.
Keep in mind that we still need package authoring in .NET 8 and older versions.