Moving StandardOleMarshalObject type down to corelib#38072
Merged
Anipik merged 4 commits intodotnet:masterfrom Jun 18, 2020
Anipik:coMarshal
Merged
Moving StandardOleMarshalObject type down to corelib#38072Anipik merged 4 commits intodotnet:masterfrom Anipik:coMarshal
Anipik merged 4 commits intodotnet:masterfrom
Anipik:coMarshal
Conversation
AaronRobinsonMSFT
approved these changes
Jun 18, 2020
stephentoub
reviewed
Jun 18, 2020
...s/System.Private.CoreLib/src/System/Runtime/InteropServices/StandardOleMarshalObject.Unix.cs
Outdated
Show resolved
Hide resolved
safern
approved these changes
Jun 18, 2020
jkotas
reviewed
Jun 19, 2020
| { | ||
| } | ||
|
|
||
| int IMarshal.GetUnmarshalClass(ref Guid riid, IntPtr pv, int dwDestContext, IntPtr pvDestContext, int mshlflags, out Guid pCid) |
Member
There was a problem hiding this comment.
None of these implementation methods are needed. IMarshal is internal interface used just for COM; and COM is not supported on Unix.
This should be just a dummy type with just a constructor.
jkotas
reviewed
Jun 19, 2020
| <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\ICustomMarshaler.cs" /> | ||
| <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\ICustomQueryInterface.cs" /> | ||
| <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\IDynamicInterfaceCastable.cs" /> | ||
| <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\IMarshal.cs" /> |
Member
There was a problem hiding this comment.
This should be in the Windows-specific block.
jkotas
reviewed
Jun 19, 2020
| <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\ICustomMarshaler.cs" /> | ||
| <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\ICustomQueryInterface.cs" /> | ||
| <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\IDynamicInterfaceCastable.cs" /> | ||
| <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\IMarshal.cs" /> |
Member
There was a problem hiding this comment.
You also need to move the linker directives in src\libraries\System.Runtime.InteropServices\src\ILLinkTrim.xml . Otherwise, this will be broken.
We do not seem to have any tests for this, so the fact that it is broken will be noticed only the change hits WinForms/WPF repos that depend on this type. Could you please get this fixed asap?
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.
Fixes #37782