Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Port type moves to UWP 6.2#30886

Merged
zacharycmontoya merged 17 commits intodotnet:release/uwp6.2from
morganbr:uwp62_updatecorelib
Aug 14, 2018
Merged

Port type moves to UWP 6.2#30886
zacharycmontoya merged 17 commits intodotnet:release/uwp6.2from
morganbr:uwp62_updatecorelib

Conversation

@morganbr
Copy link

@morganbr morganbr commented Jul 7, 2018

The .NET Native CoreLib already has the types that moved in master (Hashtable and ConcurrentQueue), so we need CoreFX to include the matching changes. Also includes porting a couple other changes that the ports depended on.

Depends on dotnet/coreclr#18818 so the uap flavor builds too.

Zach Montoya and others added 13 commits July 3, 2018 17:08
Include serialization info table for Hashtable

Remove hashtable & hashprovider src link
…otnet#29307)

* Move Hashtable & friends to shared parition

* Move HashHelper serialization logic into its own file

* Remove unchecked keyword in Hashtable

Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
* Moving ConcurrentQueue to shared folder

Fixes: dotnet#17751

Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
Making IProducerConsumerCollectionDebugView apis public

Fixes: dotnet#17751

Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
* Avoid substring allocations in WebUtility.HtmlDecode

* Update changes to HtmlDecode based on feedback

- Use regular Dictionary instead of LowLevelDictionary
- Use AsSpan overload instead of AsSpan() and Slice
- Avoid shift by variable amount
- Use helper method to generate keys to make the code easier to maintain

* Assert that entity length is <= 8 in ToUInt64Key

- Add assert to ToUInt64Key
- Replace default with 0
@morganbr morganbr added the * NO MERGE * The PR is not ready for merge yet (see discussion for detailed reasons) label Jul 7, 2018
</Compile>
</ItemGroup>
<!-- TODO: Remove these lines when a new uapaot build is ingested into corefx. -->
<ItemGroup Condition="'$(TargetGroup)' == 'uapaot'">
Copy link
Member

Choose a reason for hiding this comment

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

I think we don't need the condition here anymore. This was removed with 246b505#diff-c2575c0f880b096356277e8cc2b31462

Copy link
Author

Choose a reason for hiding this comment

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

I think you reviewed one of the intermediate commits. That shouldn't be in the final version.

Copy link
Member

Choose a reason for hiding this comment

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

Right. You added Jans commit that deletes these lines afterwards. Overlooked it. Thanks.

@zacharycmontoya
Copy link

@morganbr my PR #31663 updates to the latest .NET Native CoreLib and the CI build fails with the Hashtable existing in both places. How do you want to move forward?

Zach Montoya added 2 commits August 10, 2018 10:08
@zacharycmontoya
Copy link

I appended my dependency updates from #31663 to the tip of this PR, and the resulting CI should be green.

@zacharycmontoya
Copy link

@dotnet-bot test NETFX x86 Release Build

@zacharycmontoya
Copy link

@dotnet-bot test Linux x64 Release Build

@zacharycmontoya
Copy link

@MattGal the PR test run shows Fedora.26.Amd64.Open-x64 on fire. Is this new?

@MattGal
Copy link
Member

MattGal commented Aug 10, 2018

@zamont just sent mail again, please see me if you need help. I notified folks that this OS was end-of-life and that this would begin happening yesterday last Thursday.

@zacharycmontoya
Copy link

@morganbr this change looks ready to merge and we'll need this change to make progress, since the types only line up with both the updated .NET Native dependency and your moving of types

cc: @tommcdon

@zacharycmontoya
Copy link

@MichalStrehovsky when can we move forward with this set of changes? I believe Morgan is also out this week

@MichalStrehovsky
Copy link
Member

@MichalStrehovsky when can we move forward with this set of changes?

Since these changes are required to unblock the ingestion at the .NET Native side, I would say ASAP? What help do you need from me on this?

@zacharycmontoya
Copy link

Ok. I will go ahead and merge this then.

@zacharycmontoya zacharycmontoya merged commit eaef362 into dotnet:release/uwp6.2 Aug 14, 2018
@morganbr
Copy link
Author

@zamont, the reason I hadn't merged this is that we didn't have a build of CoreCLR that matched it. If you have that now, merging was fine. Thanks for taking care of it.

@zacharycmontoya
Copy link

Yup, we've got our uwp6.2 builds up and running so we were able to produce a new CoreCLR build with matching CoreLib. Awesome :)

@karelz karelz added this to the UWP6.2 milestone May 22, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-Meta * NO MERGE * The PR is not ready for merge yet (see discussion for detailed reasons)

Projects

None yet

Development

Successfully merging this pull request may close these issues.