Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Mirror changes from dotnet/coreclr #33446

Merged
merged 2 commits into from
Nov 13, 2018

Conversation

dotnet-maestro-bot
Copy link

@dotnet-maestro-bot dotnet-maestro-bot commented Nov 12, 2018

This PR contains mirrored changes from dotnet/coreclr

Please REBASE this PR when merging

cc @tannergooding

* Moving the Utf8Formatter and Utf8Parser into S.P.Corelib

* Doing some minimal cleanup to lineup types and get the Utf8Parser/Utf8Formatter building

* Updating the Utf8 Float Parser to have different buffers for Single vs Double

* Fixing the Utf8Parser to track trailing zero digits and to properly mark the end of the buffer

* Fixing a couple of issues in Utf8Parser.Number

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
@danmoseley
Copy link
Member

@tannergooding looks like some fixups are needed on corefx side.

@tannergooding
Copy link
Member

tannergooding commented Nov 13, 2018

@danmosemsft, yes it requires this #33447, as well as the CoreCLR side changes since the code has moved to S.P.Corelib.

As per dotnet/coreclr#20934, we are going to do the CoreCLR package update and this together.

  • If this ends up blocking anything, feel free to tag me and I will fallback to using #ifdef, which will work but cause some noisy churn and an additional couple PRs after everything goes through.

@danmoseley
Copy link
Member

sounds good

@tannergooding
Copy link
Member

There was a bug: dotnet/coreclr#20967

@tannergooding tannergooding force-pushed the mirror-merge-9923028 branch 3 times, most recently from a1bd900 to 4e5e5c4 Compare November 13, 2018 15:17
@tannergooding
Copy link
Member

Updated to use the latest commit from #33450

@stephentoub
Copy link
Member

@tannergooding, some more failures (in the UWP NETNative build):

D:\j\workspace\windows-TGrou---c60886e1\src\shims\ApiCompat.proj(82,5): error : TypesMustExist : Type 'System.Buffers.StandardFormat' does not exist in the implementation but it does exist in the contract.
D:\j\workspace\windows-TGrou---c60886e1\src\shims\ApiCompat.proj(82,5): error : TypesMustExist : Type 'System.Buffers.Text.Utf8Formatter' does not exist in the implementation but it does exist in the contract.
D:\j\workspace\windows-TGrou---c60886e1\src\shims\ApiCompat.proj(82,5): error : TypesMustExist : Type 'System.Buffers.Text.Utf8Parser' does not exist in the implementation but it does exist in the contract.
D:\j\workspace\windows-TGrou---c60886e1\src\shims\ApiCompat.proj(90,5): error : ApiCompat failed comparing netstandard to uapaot

@tannergooding
Copy link
Member

some more failures (in the UWP NETNative build)

Just finishing validating the fix locally (adding these to the compat baseline and telling netcoreappaot to ignore missing types until their baseline can be updated).

@tannergooding
Copy link
Member

test this please

@tannergooding
Copy link
Member

tannergooding commented Nov 13, 2018

hmmm... full set of jobs still aren't triggering.

Edit: there we go, commenting fixed it.

@danmoseley
Copy link
Member

D:\j\workspace\windows-TGrou---c60886e1\src\shims\ApiCompat.proj(82,5): error : TypesMustExist : Type 'System.Buffers.StandardFormat' does not exist in the implementation but it does exist in the contract.
D:\j\workspace\windows-TGrou---c60886e1\src\shims\ApiCompat.proj(82,5): error : TypesMustExist : Type 'System.Buffers.Text.Utf8Formatter' does not exist in the implementation but it does exist in the contract.
D:\j\workspace\windows-TGrou---c60886e1\src\shims\ApiCompat.proj(82,5): error : TypesMustExist : Type 'System.Buffers.Text.Utf8Parser' does not exist in the implementation but it does exist in the contract.
D:\j\workspace\windows-TGrou---c60886e1\src\shims\ApiCompat.proj(90,5): error : ApiCompat failed comparing netstandard to uapaot

Maybe GenFacadesIgnoreMissingTypes doesn't work and you need an ApiCompatBaseline.uapaot.txt

@tannergooding
Copy link
Member

Maybe GenFacadesIgnoreMissingTypes doesn't work and you need an ApiCompatBaseline.uapaot.txt

I need both. I hit the case where /p:BaselineAllAPICompatError=true does nothing if you don't specify /t:Rebuild

@tannergooding
Copy link
Member

@joperezr assisted me, I needed to also update the ApiCompat baseline under src\shims.

@tannergooding
Copy link
Member

I also logged https://github.com/dotnet/corefx/issues/33464, to ensure that these steps are properly documented and easy to find when the failures occur

…s, ProjectNTfsTestILC to preview-27113-05, preview.18563.1, master-20181113-0044, preview-27112-04, beta-27113-00, beta-27113-00, respectively (master)

* Update CoreClr, CoreFx, CoreFxOptimizationData, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to preview-27113-05, preview.18563.1, master-20181113-0044, preview-27112-04, beta-27113-00, beta-27113-00, respectively (master)

* Fixing the Math/MathF Min and Max tests

* Removing the Utf8Parser and Utf8Formatter from System.Memory, now that it is in S.P.Corelib
@tannergooding
Copy link
Member

Everything passed except for the NetFX test run (which failed because the Math test changes weren't properly conditioned). Everything is expected to pass this time. (sorry for the delay)

@tannergooding tannergooding merged commit 838a5c2 into dotnet:master Nov 13, 2018
@stephentoub stephentoub deleted the mirror-merge-9923028 branch November 13, 2018 21:34
@karelz karelz added this to the 3.0 milestone Nov 15, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants