Skip to content

Conversation

@dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from master into features/embeddedJson.

git fetch --all
git checkout merges/master-to-features/embeddedJson
git reset --hard upstream/features/embeddedJson
git merge upstream/master
# Fix merge conflicts
git commit
git push merges/master-to-features/embeddedJson --force

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request.

jaredpar and others added 9 commits May 29, 2018 12:21
Move the source based CompileAndVerifyFieldMarshal overloads into the
language specific layer. This is a step closer to removing the
GetCompilationForEmit method.
All of the source based operations are now in the language specific
heplers.
VB: Unify CreateCompilation helpers
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approval

@ghost ghost merged commit 3e75243 into features/embeddedJson May 31, 2018
@ghost ghost deleted the merges/master-to-features/embeddedJson branch May 31, 2018 21:30
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedJson branch May 31, 2018 22:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedJson branch May 31, 2018 22:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedJson branch May 31, 2018 23:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedJson branch May 31, 2018 23:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedJson branch June 1, 2018 00:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedJson branch June 1, 2018 00:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedJson branch June 1, 2018 01:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedJson branch June 1, 2018 01:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedJson branch June 1, 2018 02:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedJson branch June 1, 2018 02:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedJson branch June 1, 2018 03:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedJson branch June 1, 2018 03:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedJson branch June 1, 2018 04:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedJson branch June 1, 2018 04:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedJson branch June 1, 2018 05:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedJson branch June 1, 2018 05:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedJson branch June 1, 2018 06:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedJson branch June 1, 2018 06:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedJson branch June 1, 2018 07:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedJson branch June 1, 2018 07:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedJson branch June 1, 2018 08:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedJson branch June 1, 2018 08:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedJson branch June 1, 2018 09:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedJson branch June 1, 2018 09:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedJson branch June 1, 2018 10:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedJson branch June 1, 2018 10:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedJson branch June 1, 2018 11:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedJson branch June 1, 2018 11:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedJson branch June 1, 2018 12:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedJson branch June 1, 2018 12:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedJson branch June 1, 2018 13:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedJson branch June 1, 2018 13:00
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants