Skip to content

React to runtime/594 Encoder.Convert change #17747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 15, 2020

Conversation

Tratcher
Copy link
Member

@Tratcher Tratcher commented Dec 10, 2019

dotnet/runtime#594 is reverting a 3.1 fix to encoders for compat reasons. That might have side-effects for our use of encoders so we're pre-emptively updating AspNetCore as well.

This change works because we know WriteMultiSegmentEncoded is always called with a complete string, there's no tearing, so we can always flush the encoder.

@Pilchie
Copy link
Member

Pilchie commented Dec 10, 2019

👀

@Tratcher Tratcher force-pushed the tratcher/3.1/convert branch from 0a963e0 to 0681695 Compare December 10, 2019 20:53
@Tratcher Tratcher marked this pull request as ready for review December 10, 2019 20:53
@Tratcher Tratcher requested a review from jkotalik as a code owner December 10, 2019 20:53
@Tratcher Tratcher requested a review from a team December 10, 2019 20:53
@Tratcher Tratcher added this to the 3.1.1 milestone Dec 10, 2019
@Pilchie Pilchie added the Servicing-consider Shiproom approval is required for the issue label Dec 10, 2019
@Pilchie
Copy link
Member

Pilchie commented Dec 10, 2019

@aspnet/build we've done away with patchconfig stuff, right?

@Pilchie
Copy link
Member

Pilchie commented Dec 10, 2019

@GrabYourPitchforks I thought you had detailed two affected locations?

@Tratcher
Copy link
Member Author

@GrabYourPitchforks I thought you had detailed two affected locations?

@Pilchie we reviewed the other two uses of this API and determined that they were not affected by the change.

@GrabYourPitchforks
Copy link
Member

@Pilchie I believe this is the only location that would be affected by the 3.1.1 change. I had called out another location that has a buggy call site, but that second call site is buggy regardless of which runtime it's running against. The 3.1.1 change won't affect it.

@wtgodbe
Copy link
Member

wtgodbe commented Dec 10, 2019

@aspnet/build we've done away with patchconfig stuff, right?

We've done so in 3.0, but haven't merged that forward to 3.1 yet: https://github.com/aspnet/AspNetCore/blob/9a4ab80f7e068e30da5ea3c819b546b511b64302/Directory.Build.targets#L61-L64

We intend to merge it forward with the rest of #17311 (CC @dougbu @JunTaoLuo)

@Pilchie
Copy link
Member

Pilchie commented Dec 10, 2019

@mmitche Any reason not to merge this? @GrabYourPitchforks are the other changes ready/merged?

@mmitche
Copy link
Member

mmitche commented Dec 11, 2019

@mmitche Any reason not to merge this? @GrabYourPitchforks are the other changes ready/merged?

They aren't ready yet. I think we should hold those changes for 3.1.2.

@analogrelay analogrelay modified the milestones: 3.1.1, 3.1.x Dec 11, 2019
@analogrelay
Copy link
Contributor

@Pilchie is this approved? It still has servicing-consider, so I've put it in 3.1.x since we generally don't put things in a specific patch milestone until they're approved.

@mmitche
Copy link
Member

mmitche commented Dec 11, 2019

Not approved for 3.1.1

@Pilchie
Copy link
Member

Pilchie commented Dec 11, 2019

It's been conceptually approved at Tactics, but that was before the PR was actually created. However, as @mmitche says, we'll hold it from 3.1.1 at this point as the base changes aren't going to make 3.1.1.

@analogrelay
Copy link
Contributor

It's been conceptually approved at Tactics, but that was before the PR was actually created. However, as @mmitche says, we'll hold it from 3.1.1 at this point as the base changes aren't going to make 3.1.1.

I guess my question is this: Does tactics need to further review this change? If no, we can mark servicing-approved and move to 3.1.2 to resolve the confusion (it's clear that it needs no further approval from Tactics, but does need to wait until the branch is open for 3.1.2-approved changes). If yes, we leave it as-is (servicing-consider and 3.1.x) :).

@Pilchie
Copy link
Member

Pilchie commented Dec 11, 2019

I'm going to bring up the slip to 3.1.2 in Tactics tomorrow to make sure everyone is aware. Once that happens, we'll move to servicing-approved and 3.1.2.

@jamshedd jamshedd modified the milestones: 3.1.x, 3.1.2 Dec 12, 2019
@jamshedd jamshedd added Servicing-approved Shiproom has approved the issue and removed Servicing-consider Shiproom approval is required for the issue labels Dec 12, 2019
@analogrelay analogrelay added the * NO MERGE * Do not merge this PR as long as this label is present. label Dec 12, 2019
@analogrelay
Copy link
Contributor

Putting * NO MERGE* (not that it does much) just to make clear that the branch is not open for 3.1.2 changes yet.

@jamshedd
Copy link
Member

Approved for 3.1.2

@analogrelay analogrelay assigned analogrelay and unassigned Tratcher Jan 8, 2020
@vivmishra vivmishra modified the milestones: 3.1.2, 3.1.3 Jan 9, 2020
@vivmishra
Copy link

Moved to Mar as per Tactics. Will need to be explicitly approved for Feb, if required.

@jkotalik
Copy link
Contributor

@anurse I believe this got bumped back to feb now. Please confirm when you have the chance 😄

@analogrelay
Copy link
Contributor

Correct, but @Tratcher I believe this is reacting to a change that hasn't actually happened in runtime's 3.1.x branch. Can you check on that?

@Tratcher
Copy link
Member Author

@GrabYourPitchforks?

@analogrelay
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 2 pipeline(s).

@analogrelay analogrelay merged commit ad8ecf9 into release/3.1 Jan 15, 2020
@analogrelay analogrelay deleted the tratcher/3.1/convert branch January 15, 2020 19:07
@vivmishra vivmishra modified the milestones: 3.1.3, 3.1.2 Jan 15, 2020
dougbu added a commit that referenced this pull request Jan 16, 2020
@amcasey amcasey added area-networking Includes servers, yarp, json patch, bedrock, websockets, http client factory, and http abstractions and removed area-runtime labels Aug 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-networking Includes servers, yarp, json patch, bedrock, websockets, http client factory, and http abstractions Servicing-approved Shiproom has approved the issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.