-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Fixing SizeF, CookieContainer, CookieCollection serialization between Core <--> Desktop and adding full binary mode tests #21224
Conversation
ce20af1
to
b2a21e2
Compare
b2a21e2
to
4539cb9
Compare
89c6492
to
53d11d0
Compare
… Core <--> Desktop and adding full binary mode tests (dotnet#21223) * Adding TypeForward to PathListComparer, CookieCollection member, full-mode tests, SizeF publickeytoken fix * Making FormatterAssemblyStyle explicit * Update blobs after CompareInfo culture field added to serialization payload * Added blob integrity check * Remove unnecessary operation which has no impact on netfx serialization * Putting pragma around the unused field... * Setting m_version value to include it in the serialization payload. Remove static versions for blob comparison * Update compare logic * update blobs * disable checking if blob has changed
53d11d0
to
3375d53
Compare
Updated to match the master change. |
@@ -1048,6 +1048,7 @@ public IEnumerator GetEnumerator() | |||
public object SyncRoot => m_list.SyncRoot; | |||
|
|||
[Serializable] | |||
[System.Runtime.CompilerServices.TypeForwardedFrom("System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be b03f5f7f11d50a3a or the other one match this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
b77 is correct
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM assuming pointed in the comment PublicKeyToken is correct
Approved by shiproom. After new coreclr version is in release/2.0.0 branch I will take a look @krwq. Thanks! |
@ViktorHofer could you take a look at the PublicKeyToken comment in src/System.Net.Primitives/src/System/Net/CookieContainer.cs, you got more context on this |
@morganbr thanks for confirming! @danmosemsft this is good to go assuming this is approved |
The thing is, the coreclr change isn't yet in. Without comparing blobs we have green CI but in fact it shouldn't be green... Waiting just to make sure |
@ViktorHofer what scenarios are broken without coreclr changes? |
Serialization with full mode of types which depend on CompareInfo which itself depends on the introduced culture field. Should at least be a couple of types. Because we already updated the blobs and don't have a equals test for this field CI is green although it shouldn't be till the corevlr bits are in |
We have a new CLR. |
@dotnet-bot test this please (spell please right) |
@ViktorHofer good to merge? |
#21223
Requires dotnet/coreclr#12367
cc @danmosemsft