Skip to content

Conversation

@jkoritzinsky
Copy link
Member

Reverts #50138

We'll combine this with #50882 so all of the fixes go in at once.

…ynamically marshalling the type if it doesn't match the static type in the signature. (#50138)"

This reverts commit 718c0ed.
@ghost ghost added the area-Interop-coreclr label Apr 7, 2021
@jkoritzinsky
Copy link
Member Author

cc: @Anipik @jeffschwMSFT

@jkoritzinsky jkoritzinsky added the Servicing-consider Issue for next servicing release review label Apr 7, 2021
Copy link
Member

@jeffschwMSFT jeffschwMSFT left a comment

Choose a reason for hiding this comment

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

Approved. We will take for consideration for 5.0.6

@jeffschwMSFT jeffschwMSFT added this to the 5.0.6 milestone Apr 7, 2021
@jeffschwMSFT
Copy link
Member

@Anipik @leecow we have found an issue with our interop servicing change. We would like to revert and come back next round with a high confidence fix. If we take this for consideration tomorrow during tactics, is there time in the schedule to revert for 5.0.6?

@Anipik
Copy link
Contributor

Anipik commented Apr 8, 2021

@Anipik @leecow we have found an issue with our interop servicing change. We would like to revert and come back next round with a high confidence fix. If we take this for consideration tomorrow during tactics, is there time in the schedule to revert for 5.0.6?

yes we have time to revert this change for 5.0.6

@leecow leecow added Servicing-approved Approved for servicing release and removed Servicing-consider Issue for next servicing release review labels Apr 8, 2021
@jeffschwMSFT
Copy link
Member

@jkoritzinsky can you double check the ci and then @Anipik we should be ready to merge.

@jkoritzinsky
Copy link
Member Author

CI is failing due to #50746, which at its root is an ongoing Azure ICM.

@Anipik
Copy link
Contributor

Anipik commented Apr 9, 2021

Merging this one as all the failures were infra related

@Anipik Anipik merged commit b71bb59 into release/5.0 Apr 9, 2021
@jkoritzinsky jkoritzinsky deleted the revert-50138-derived-layouttype-marshalling-5.0 branch April 9, 2021 18:25
jkoritzinsky added a commit that referenced this pull request Apr 9, 2021
…ack to dynamically marshalling the type if it doesn't match the static type in the signature. (#50138)" (#50883)"

This reverts commit b71bb59.
jkoritzinsky added a commit that referenced this pull request Apr 9, 2021
…ynamically marshalling the type if it doesn't match the static type in the signature. (#50138)" (#50883) (#51021)

This reverts commit b71bb59.
Anipik pushed a commit that referenced this pull request May 5, 2021
* [release/5.0] Use adjusted parent layout size to handle a non-zero-sized class inheriting from a zero-sized class that inherits from another zero-sized class.

Fixes handling of zero-sized parent types that have zero-sized parent types.

* Revert "[release/5.0] When marshalling a layout class, fall-back to dynamically marshalling the type if it doesn't match the static type in the signature. (#50138)" (#50883) (#51021)

This reverts commit b71bb59.
@ghost ghost locked as resolved and limited conversation to collaborators May 9, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-Interop-coreclr Servicing-approved Approved for servicing release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants