diff options
| author | Jeremy Koritzinsky <jkoritzinsky@gmail.com> | 2018-12-06 09:56:21 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-06 09:56:21 -0800 |
| commit | 5955967d808d1d88ef927235276d3ca82b5d9363 (patch) | |
| tree | 01eac29f273a440508969afecae331410aa6f63f /src/vm/mlinfo.cpp | |
| parent | 045f470f71cfcedf3eb7ff248f25bf29619d9a88 (diff) | |
| download | coreclr-5955967d808d1d88ef927235276d3ca82b5d9363.tar.gz coreclr-5955967d808d1d88ef927235276d3ca82b5d9363.tar.bz2 coreclr-5955967d808d1d88ef927235276d3ca82b5d9363.zip | |
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.
Diffstat (limited to 'src/vm/mlinfo.cpp')
| -rw-r--r-- | src/vm/mlinfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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[] = {""}; |