Optimize generated activation factories for authored components

src/WinRT.Generator.Core/Extensions/SignatureComparerExtensions.cs

@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using AsmResolver.DotNet.Signatures;
+
+namespace WindowsRuntime.Generator;
+
+/// <summary>
+/// Extensions for <see cref="SignatureComparer"/>.
+/// </summary>
+internal static class SignatureComparerExtensions
+{
+    /// <summary>
+    /// Backing field for the <see cref="IgnoreVersion"/> extension property.
+    /// </summary>
+    private static readonly SignatureComparer IgnoreVersion = new(SignatureComparisonFlags.VersionAgnostic);
+
+    extension(SignatureComparer)
+    {
+        /// <summary>
+        /// Gets a shared, version-agnostic <see cref="SignatureComparer"/>, suitable for comparing
+        /// AsmResolver entities (e.g. as the <see cref="System.Collections.Generic.IEqualityComparer{T}"/>
+        /// for a <see cref="System.Collections.Generic.HashSet{T}"/> of <see cref="AsmResolver.DotNet.TypeDefinition"/>).
+        /// </summary>
+        public static SignatureComparer IgnoreVersion => IgnoreVersion;
+    }
+}

src/WinRT.Generator.Core/WinRT.Generator.Core.csproj

@@ -40,5 +40,8 @@
     <InternalsVisibleTo Include="cswinrtprojectiongen" />
     <InternalsVisibleTo Include="cswinrtprojectionrefgen" />
     <InternalsVisibleTo Include="cswinrtwinmdgen" />
+
+    <!-- The projection writer library consumes shared helpers (e.g. SignatureComparer.IgnoreVersion). -->
+    <InternalsVisibleTo Include="WinRT.Projection.Writer" />
   </ItemGroup>
 </Project>

src/WinRT.Interop.Generator/Builders/InteropTypeDefinitionBuilder.IObservableMap2.cs

@@ -5,6 +5,7 @@
 using AsmResolver.DotNet;
 using AsmResolver.DotNet.Signatures;
 using AsmResolver.PE.DotNet.Metadata.Tables;
+using WindowsRuntime.Generator;
 using WindowsRuntime.InteropGenerator.Factories;
 using WindowsRuntime.InteropGenerator.Generation;
 using WindowsRuntime.InteropGenerator.Helpers;
@@ -533,4 +534,4 @@ public static void ImplType(
             implType.Properties.Add(mapChangedTableProperty);
         }
     }
-}
+}

src/WinRT.Interop.Generator/Builders/InteropTypeDefinitionBuilder.IObservableVector1.cs

@@ -5,6 +5,7 @@
 using AsmResolver.DotNet;
 using AsmResolver.DotNet.Signatures;
 using AsmResolver.PE.DotNet.Metadata.Tables;
+using WindowsRuntime.Generator;
 using WindowsRuntime.InteropGenerator.Factories;
 using WindowsRuntime.InteropGenerator.Generation;
 using WindowsRuntime.InteropGenerator.Helpers;
@@ -521,4 +522,4 @@ public static void ImplType(
             emitState.TrackTypeDefinition(implType, vectorType, "Impl");
         }
     }
-}
+}

src/WinRT.Interop.Generator/Discovery/InteropTypeDiscovery.Generics.cs

@@ -3,6 +3,7 @@
 
 using AsmResolver.DotNet;
 using AsmResolver.DotNet.Signatures;
+using WindowsRuntime.Generator;
 using WindowsRuntime.InteropGenerator.Errors;
 using WindowsRuntime.InteropGenerator.Generation;
 using WindowsRuntime.InteropGenerator.Helpers;
@@ -636,4 +637,4 @@ private static void TryTrackManagedGenericTypeInstance(
             interopReferences: interopReferences,
             module: module);
     }
-}
+}

src/WinRT.Interop.Generator/Discovery/InteropTypeDiscovery.cs

@@ -7,6 +7,7 @@
 using System.Linq;
 using AsmResolver.DotNet;
 using AsmResolver.DotNet.Signatures;
+using WindowsRuntime.Generator;
 using WindowsRuntime.InteropGenerator.Errors;
 using WindowsRuntime.InteropGenerator.Generation;
 using WindowsRuntime.InteropGenerator.Helpers;
@@ -562,4 +563,4 @@ private static bool TryAddExposedInterfaceType(
 
         return true;
     }
-}
+}

src/WinRT.Interop.Generator/Extensions/ComExtensions.cs

@@ -4,6 +4,7 @@
 using System.Diagnostics.CodeAnalysis;
 using AsmResolver.DotNet;
 using AsmResolver.DotNet.Signatures;
+using WindowsRuntime.Generator;
 using WindowsRuntime.InteropGenerator.References;
 
 namespace WindowsRuntime.InteropGenerator;
@@ -72,4 +73,4 @@ public bool TryGetInterfaceInformationType(InteropReferences interopReferences,
             return true;
         }
     }
-}
+}

src/WinRT.Interop.Generator/Extensions/IHasCustomAttributeExtensions.cs

@@ -5,6 +5,7 @@
 using AsmResolver;
 using AsmResolver.DotNet;
 using AsmResolver.DotNet.Signatures;
+using WindowsRuntime.Generator;
 
 namespace WindowsRuntime.InteropGenerator;
 
@@ -100,4 +101,4 @@ public static bool HasCustomAttribute(this IHasCustomAttribute member, ITypeDesc
     {
         return TryGetCustomAttribute(member, attributeType, out _);
     }
-}
+}

src/WinRT.Interop.Generator/Extensions/ModuleDefinitionExtensions.cs

@@ -9,6 +9,7 @@
 using AsmResolver.DotNet;
 using AsmResolver.DotNet.Signatures;
 using AsmResolver.PE.DotNet.Metadata.Tables;
+using WindowsRuntime.Generator;
 using WindowsRuntime.InteropGenerator.Helpers;
 using WindowsRuntime.InteropGenerator.Visitors;
 
@@ -304,4 +305,4 @@ public static IEnumerable<ModuleDefinition> OrderByFullyQualifiedName(this IEnum
     {
         return modules.Order(ModuleDefinitionComparer.Instance);
     }
-}
+}

src/WinRT.Interop.Generator/Extensions/SignatureComparerExtensions.cs

@@ -12,20 +12,8 @@ namespace WindowsRuntime.InteropGenerator;
 /// </summary>
 internal static class SignatureComparerExtensions
 {
-#pragma warning disable IDE0052 // TODO: remove this once Roslyn bug is fixed
-    /// <summary>
-    /// Backing field for <see cref="get_IgnoreVersion"/>.
-    /// </summary>
-    private static readonly SignatureComparer IgnoreVersion = new(SignatureComparisonFlags.VersionAgnostic);
-#pragma warning restore IDE0052
-
     extension(SignatureComparer comparer)
     {
-        /// <summary>
-        /// An immutable default instance of <see cref="SignatureComparer"/>, with <see cref="SignatureComparisonFlags.VersionAgnostic"/>.
-        /// </summary>
-        public static SignatureComparer IgnoreVersion => IgnoreVersion;
-
         /// <summary>
         /// Creates an <see cref="IEqualityComparer{T}"/> instance for a pair of <see cref="TypeSignature"/> values.
         /// </summary>

src/WinRT.Interop.Generator/Extensions/TypeDefinitionExtensions.cs

@@ -8,6 +8,7 @@
 using AsmResolver.DotNet;
 using AsmResolver.DotNet.Signatures;
 using AsmResolver.PE.DotNet.Metadata.Tables;
+using WindowsRuntime.Generator;
 
 #pragma warning disable IDE0046
 
@@ -344,4 +345,4 @@ public IEnumerable<GenericInstanceTypeSignature> EnumerateGenericInstanceInterfa
             }
         }
     }
-}
+}

src/WinRT.Interop.Generator/Extensions/WindowsRuntimeExtensions.cs

@@ -8,6 +8,7 @@
 using AsmResolver.DotNet;
 using AsmResolver.DotNet.Signatures;
 using AsmResolver.PE.DotNet.Metadata.Tables;
+using WindowsRuntime.Generator;
 using WindowsRuntime.InteropGenerator.References;
 
 #pragma warning disable IDE0046
@@ -1186,4 +1187,4 @@ file static class WellKnownMetadataNames
     /// The <c>"WindowsRuntimeComponentAssemblyAttribute"</c> text.
     /// </summary>
     public static readonly Utf8String WindowsRuntimeComponentAssemblyAttribute = "WindowsRuntimeComponentAssemblyAttribute"u8;
-}
+}

src/WinRT.Interop.Generator/Factories/InteropMethodDefinitionFactory.IReadOnlyDictionary2Impl.cs

@@ -6,6 +6,7 @@
 using AsmResolver.DotNet.Signatures;
 using AsmResolver.PE.DotNet.Cil;
 using AsmResolver.PE.DotNet.Metadata.Tables;
+using WindowsRuntime.Generator;
 using WindowsRuntime.InteropGenerator.Generation;
 using WindowsRuntime.InteropGenerator.References;
 using static AsmResolver.PE.DotNet.Cil.CilOpCodes;
@@ -512,4 +513,4 @@ public static MethodDefinition Split(
             return splitMethod;
         }
     }
-}
+}

src/WinRT.Interop.Generator/Factories/InteropMethodDefinitionFactory.IReadOnlyList1Impl.cs

@@ -6,6 +6,7 @@
 using AsmResolver.DotNet.Signatures;
 using AsmResolver.PE.DotNet.Cil;
 using AsmResolver.PE.DotNet.Metadata.Tables;
+using WindowsRuntime.Generator;
 using WindowsRuntime.InteropGenerator.Generation;
 using WindowsRuntime.InteropGenerator.References;
 using static AsmResolver.PE.DotNet.Cil.CilOpCodes;
@@ -493,4 +494,4 @@ _ when elementType.IsTypeOfException(interopReferences) => interopReferences.IRe
             return getManyImplMethod;
         }
     }
-}
+}

src/WinRT.Interop.Generator/Generation/InteropGenerator.Discover.cs

@@ -10,6 +10,7 @@
 using AsmResolver.DotNet;
 using AsmResolver.DotNet.Signatures;
 using AsmResolver.PE;
+using WindowsRuntime.Generator;
 using WindowsRuntime.Generator.Errors;
 using WindowsRuntime.Generator.Extensions;
 using WindowsRuntime.Generator.References;
@@ -618,4 +619,4 @@ private static string[] GetAssembliesToProcess(InteropGeneratorArgs args)
 
         return [.. assembliesToProcess];
     }
-}
+}

src/WinRT.Interop.Generator/Generation/InteropGeneratorDiscoveryState.cs

@@ -6,6 +6,7 @@
 using System.Diagnostics.CodeAnalysis;
 using AsmResolver.DotNet;
 using AsmResolver.DotNet.Signatures;
+using WindowsRuntime.Generator;
 using WindowsRuntime.InteropGenerator.Errors;
 using WindowsRuntime.InteropGenerator.Models;
 
@@ -572,4 +573,4 @@ private void ThrowIfReadOnly()
             throw WellKnownInteropExceptions.DiscoveryStateChangeAfterMakeReadOnlyError();
         }
     }
-}
+}

src/WinRT.Interop.Generator/Generation/InteropGeneratorEmitState.cs

@@ -8,6 +8,7 @@
 using AsmResolver.DotNet.Code.Cil;
 using AsmResolver.DotNet.Signatures;
 using AsmResolver.PE.DotNet.Cil;
+using WindowsRuntime.Generator;
 using WindowsRuntime.InteropGenerator.Errors;
 using WindowsRuntime.InteropGenerator.Models;
 
@@ -394,4 +395,4 @@ private void ThrowIfReadOnly()
             throw WellKnownInteropExceptions.EmitStateChangeAfterMakeReadOnlyError();
         }
     }
-}
+}

src/WinRT.Interop.Generator/Helpers/TypeExclusions.cs

@@ -4,6 +4,7 @@
 using System;
 using AsmResolver.DotNet;
 using AsmResolver.DotNet.Signatures;
+using WindowsRuntime.Generator;
 using WindowsRuntime.InteropGenerator.References;
 
 namespace WindowsRuntime.InteropGenerator.Helpers;

src/WinRT.Interop.Generator/Helpers/WindowsRuntimeTypeAnalyzer.cs

@@ -5,6 +5,7 @@
 using System.Diagnostics.CodeAnalysis;
 using AsmResolver.DotNet;
 using AsmResolver.DotNet.Signatures;
+using WindowsRuntime.Generator;
 using WindowsRuntime.InteropGenerator.References;
 
 namespace WindowsRuntime.InteropGenerator.Helpers;

src/WinRT.Interop.Generator/Models/TypeSignatureEquatableSet.Builder.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using AsmResolver.DotNet.Signatures;
+using WindowsRuntime.Generator;
 
 namespace WindowsRuntime.InteropGenerator.Models;
 
@@ -122,4 +123,4 @@ public TypeSignatureEquatableSet MoveToEquatableSet()
             return new(set);
         }
     }
-}
+}

src/WinRT.Interop.Generator/Models/TypeSignatureEquatableSet.cs

@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using AsmResolver.DotNet.Signatures;
+using WindowsRuntime.Generator;
 using WindowsRuntime.InteropGenerator.Helpers;
 
 namespace WindowsRuntime.InteropGenerator.Models;
@@ -220,4 +221,4 @@ IEnumerator IEnumerable.GetEnumerator()
     {
         return GetEnumerator();
     }
-}
+}

src/WinRT.Interop.Generator/References/WellKnownInterfaceIIDs.cs

@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using AsmResolver.DotNet;
 using AsmResolver.DotNet.Signatures;
+using WindowsRuntime.Generator;
 using WindowsRuntime.InteropGenerator.Errors;
 using WindowsRuntime.InteropGenerator.Factories;
 

src/WinRT.Interop.Generator/Resolvers/InteropImplTypeResolver.cs

@@ -5,6 +5,7 @@
 using AsmResolver.DotNet;
 using AsmResolver.DotNet.Signatures;
 using AsmResolver.PE.DotNet.Metadata.Tables;
+using WindowsRuntime.Generator;
 using WindowsRuntime.InteropGenerator.Factories;
 using WindowsRuntime.InteropGenerator.Generation;
 using WindowsRuntime.InteropGenerator.References;

src/WinRT.Interop.Generator/Resolvers/InteropInterfaceEntriesResolver.cs

@@ -7,6 +7,7 @@
 using AsmResolver.DotNet;
 using AsmResolver.DotNet.Code.Cil;
 using AsmResolver.DotNet.Signatures;
+using WindowsRuntime.Generator;
 using WindowsRuntime.InteropGenerator.Generation;
 using WindowsRuntime.InteropGenerator.Models;
 using WindowsRuntime.InteropGenerator.References;

src/WinRT.Interop.Generator/Rewriters/InteropMethodRewriter.ManagedParameter.cs

@@ -6,6 +6,7 @@
 using AsmResolver.DotNet.Collections;
 using AsmResolver.DotNet.Signatures;
 using AsmResolver.PE.DotNet.Cil;
+using WindowsRuntime.Generator;
 using WindowsRuntime.InteropGenerator.Errors;
 using WindowsRuntime.InteropGenerator.Generation;
 using WindowsRuntime.InteropGenerator.References;
@@ -116,4 +117,4 @@ public static void RewriteMethod(
             }
         }
     }
-}
+}

src/WinRT.Interop.Generator/Rewriters/InteropMethodRewriter.ManagedValue.cs

@@ -5,6 +5,7 @@
 using AsmResolver.DotNet.Code.Cil;
 using AsmResolver.DotNet.Signatures;
 using AsmResolver.PE.DotNet.Cil;
+using WindowsRuntime.Generator;
 using WindowsRuntime.InteropGenerator.Errors;
 using WindowsRuntime.InteropGenerator.Generation;
 using WindowsRuntime.InteropGenerator.References;
@@ -99,4 +100,4 @@ public static void RewriteMethod(
             }
         }
     }
-}
+}

src/WinRT.Interop.Generator/Rewriters/InteropMethodRewriter.NativeParameter.cs

@@ -7,6 +7,7 @@
 using AsmResolver.DotNet.Collections;
 using AsmResolver.DotNet.Signatures;
 using AsmResolver.PE.DotNet.Cil;
+using WindowsRuntime.Generator;
 using WindowsRuntime.InteropGenerator.Errors;
 using WindowsRuntime.InteropGenerator.Generation;
 using WindowsRuntime.InteropGenerator.References;
@@ -425,4 +426,4 @@ private static void RewriteBodyForTypeOfType(
             });
         }
     }
-}
+}

src/WinRT.Interop.Generator/Rewriters/InteropMethodRewriter.ReturnValue.cs

@@ -5,6 +5,7 @@
 using AsmResolver.DotNet.Code.Cil;
 using AsmResolver.DotNet.Signatures;
 using AsmResolver.PE.DotNet.Cil;
+using WindowsRuntime.Generator;
 using WindowsRuntime.InteropGenerator.Errors;
 using WindowsRuntime.InteropGenerator.Generation;
 using WindowsRuntime.InteropGenerator.References;
@@ -221,4 +222,4 @@ private static void RewriteBody(
             });
         }
     }
-}
+}