Skip to content
This repository was archived by the owner on Nov 1, 2020. It is now read-only.

Merge nmirror to master#3429

Merged
MichalStrehovsky merged 6 commits intomasterfrom
nmirror
Apr 25, 2017
Merged

Merge nmirror to master#3429
MichalStrehovsky merged 6 commits intomasterfrom
nmirror

Conversation

@MichalStrehovsky
Copy link
Member

No description provided.

shrah and others added 4 commits April 25, 2017 11:01
With my recent change to unify delegate marshalling infrastructure between ProjectN and CoreRT, I have made GetPInvokeDelegateForStub in CoreCLR to be a nop. Tijoy pointed out that the part that doesn't need thunk support should work in CoreCLR as it used to be. This trivial change just brought that part for CoreCLR.

[tfs-changeset: 1655953]
The ANSI helper methods are moved from McgMarshal in S.P.Interop to PInvokeMarshal in S.P.CoreLib so that they can be reused from CoreRT. I have also moved MarshalDirectiveException to CoreRT.

[tfs-changeset: 1655965]
@shrah
Copy link
Contributor

shrah commented Apr 25, 2017

I am taking a look at the Unix failure.

@MichalStrehovsky MichalStrehovsky merged commit 5a36b86 into master Apr 25, 2017
dotnet-bot pushed a commit to dotnet/coreclr that referenced this pull request Apr 25, 2017
Merge nmirror to master

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
jkotas pushed a commit to dotnet/coreclr that referenced this pull request Apr 26, 2017
Merge nmirror to master

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
dotnet-bot pushed a commit to dotnet/corefx that referenced this pull request Jan 13, 2018
Merge nmirror to master

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
dotnet-bot pushed a commit to dotnet/corefx that referenced this pull request Jan 13, 2018
Merge nmirror to master

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
safern pushed a commit to dotnet/corefx that referenced this pull request Jan 16, 2018
Merge nmirror to master

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
safern pushed a commit to dotnet/corefx that referenced this pull request Jan 16, 2018
Merge nmirror to master

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants