From 5955967d808d1d88ef927235276d3ca82b5d9363 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 6 Dec 2018 09:56:21 -0800 Subject: Port CustomMarshalers.dll to C# and .NET Core (#21343) * Import CustomMarshalers from corefx PR. * Add tests for marshalling IEnumerator and IEnumerable using the System.Runtime.InteropServices.CustomMarshalers. * Verify that the marshaller is used in the managed -> native direction in the tests. * Remove #if's * PR Feedback. * Move ComHelpers.h into interop common headers. * Add some template machinery to ensure that we don't accidentally pass in an incorrect type into DoQueryInterface. * Add VariantClear * Make marshalers internal and root them in ILLinkTrim.xml * Revert enable-if machinery. * Add tests for the pass-through unwrapping done by the EnumeratorToEnumVariantMarshaler. * Remove some of my helper code. * Added todo about exposing EnumerableToDispatchMarshaler. * PR Feedback. * Removed the last placement new. * Use the runtime hooks to enable us to not have to publically expose the custom marshalers. * Remove out of date comments. --- src/vm/mlinfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/vm/mlinfo.cpp') diff --git a/src/vm/mlinfo.cpp b/src/vm/mlinfo.cpp index f9439e7396..24af47c708 100644 --- a/src/vm/mlinfo.cpp +++ b/src/vm/mlinfo.cpp @@ -40,7 +40,7 @@ #ifdef FEATURE_COMINTEROP - DEFINE_ASM_QUAL_TYPE_NAME(ENUMERATOR_TO_ENUM_VARIANT_CM_NAME, g_EnumeratorToEnumClassName, "CustomMarshalers", VER_ASSEMBLYVERSION_STR, g_FXKeyToken); + DEFINE_ASM_QUAL_TYPE_NAME(ENUMERATOR_TO_ENUM_VARIANT_CM_NAME, g_EnumeratorToEnumClassName, g_CorelibAsmName, VER_ASSEMBLYVERSION_STR, g_ECMAKeyToken); static const int ENUMERATOR_TO_ENUM_VARIANT_CM_NAME_LEN = lengthof(ENUMERATOR_TO_ENUM_VARIANT_CM_NAME); static const char ENUMERATOR_TO_ENUM_VARIANT_CM_COOKIE[] = {""}; -- cgit v1.2.3