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

Cross framework serialization finish up #20870

Merged
merged 32 commits into from
Jun 14, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
1510c6c
Merge
ViktorHofer Jun 13, 2017
e5314fb
wip: add stubs for custom isEqual
krwq Jun 10, 2017
a4ce02e
Updated blobs, small code refactoring, disabled CookieContainer test
ViktorHofer Jun 10, 2017
0f94ce5
Fixed netfx471 detection
ViktorHofer Jun 10, 2017
f99e023
add custom equals for graph with cycles
krwq Jun 12, 2017
1562e70
fix few more comparers
krwq Jun 12, 2017
fd649bd
fix few more test cases
krwq Jun 12, 2017
1c3cca6
fix few more types, fix GetExtensionMethod to work with parameters wi…
krwq Jun 12, 2017
d57e3f0
finish tests (2 comparisons are commented out: search for TODO)
krwq Jun 12, 2017
347292b
Adding TypeForward for DictionaryNode
ViktorHofer Jun 13, 2017
0cb8502
Updating blobs
ViktorHofer Jun 13, 2017
5463302
Update Cookie hashes, adding TypeForwards, removing unnecessary equal…
ViktorHofer Jun 13, 2017
98ecc80
Reenabling SortedDictionary test
ViktorHofer Jun 13, 2017
1383a86
Update blobs
ViktorHofer Jun 13, 2017
7a75f29
make cookie.Timestamp to roundtrip correctly
krwq Jun 13, 2017
0305930
regenerate netfx and corefx blobs to account for Cookie.Timestamp change
krwq Jun 13, 2017
99eb3a7
make regex fix the blob for ObjectWithArray
krwq Jun 13, 2017
69162a3
fix ObjectWithArray netfx test failure
krwq Jun 13, 2017
ea99ba3
Update blobs
ViktorHofer Jun 14, 2017
5876d56
Replacing Dictionary with Hashtable for desktop serialization support
ViktorHofer Jun 14, 2017
297eb3b
Fixing a lot of TypeForwards, adding another hashtable test, other fixes
ViktorHofer Jun 14, 2017
b163723
Adding a few more TypeForwardedFrom attributes
ViktorHofer Jun 14, 2017
2fae86c
Updating the coreclr version, disabling CookieContainer test
ViktorHofer Jun 14, 2017
7b34d86
Update blobs
ViktorHofer Jun 14, 2017
05d491f
Disabling CompareInfo test --> waiting for coreclr
ViktorHofer Jun 14, 2017
cf5f80a
generate test cases
krwq Jun 14, 2017
29641b0
update blobs, comment out not working cases
krwq Jun 14, 2017
b8d4fbb
fix null equality checks for new test cases and reenable them
krwq Jun 14, 2017
2cf5328
PR feedback addressed
ViktorHofer Jun 14, 2017
18d2494
Merge branch 'SerilalizationFinishUp' of https://github.com/ViktorHof…
ViktorHofer Jun 14, 2017
19bcf06
Fixed a typo...
ViktorHofer Jun 14, 2017
6718144
Updating used coreclr version, enabling compareinfo test again
ViktorHofer Jun 14, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
-->
<PropertyGroup>
<CoreFxCurrentRef>a96e149ce150f6a15546032ca3966bf238c373fb</CoreFxCurrentRef>
<CoreClrCurrentRef>a96e149ce150f6a15546032ca3966bf238c373fb</CoreClrCurrentRef>
<CoreClrCurrentRef>ee8120953ace63e9775c84e98a6ca70d4e277657</CoreClrCurrentRef>
<CoreSetupCurrentRef>156d7c16cff74e50054ed195286aa53b887501e2</CoreSetupCurrentRef>
<ExternalCurrentRef>5a0606fccb09fce4b47545ae9896139acca547f5</ExternalCurrentRef>
<ProjectNTfsCurrentRef>b1943f0630fb979a7e9ead2b86a6933d6c9409e9</ProjectNTfsCurrentRef>
Expand All @@ -23,7 +23,7 @@
<PropertyGroup>
<PlatformPackageVersion>2.1.0-preview1-25324-02</PlatformPackageVersion>
<CoreFxExpectedPrerelease>preview1-25413-02</CoreFxExpectedPrerelease>
<CoreClrPackageVersion>2.1.0-preview1-25413-01</CoreClrPackageVersion>
<CoreClrPackageVersion>2.1.0-preview1-25414-05</CoreClrPackageVersion>
<ExternalExpectedPrerelease>beta-25322-00</ExternalExpectedPrerelease>
<ProjectNTfsExpectedPrerelease>beta-25413-00</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-25413-00</ProjectNTfsTestILCExpectedPrerelease>
Expand Down
4 changes: 2 additions & 2 deletions src/Common/tests/System/PlatformDetection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public static bool IsNetfx470OrNewer()
return runningVersion != null && runningVersion >= net470;
}

public static bool IsNetfxBelow471()
public static bool IsNetfx471OrNewer()
{
if (!IsFullFramework)
{
Expand All @@ -75,7 +75,7 @@ public static bool IsNetfxBelow471()

Version net471 = new Version(4, 7, 1);
Version runningVersion = GetFrameworkVersion();
return runningVersion != null && runningVersion < net471;
return runningVersion != null && runningVersion >= net471;
}

public static Version GetFrameworkVersion()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ namespace System.Collections
[System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
public class Queue : ICollection, ICloneable
{
private Object[] _array;
private int _head; // First valid element in the queue
private int _tail; // Last valid element in the queue
private int _size; // Number of elements.
private int _growFactor; // 100 == 1.0, 130 == 1.3, 200 == 2.0
private int _version;
private Object[] _array; // Do not rename (binary serialization)
private int _head; // First valid element in the queue. Do not rename (binary serialization)
private int _tail; // Last valid element in the queue. Do not rename (binary serialization)
private int _size; // Number of elements. Do not rename (binary serialization)
private int _growFactor; // 100 == 1.0, 130 == 1.3, 200 == 2.0. Do not rename (binary serialization)
private int _version; // Do not rename (binary serialization)
[NonSerialized]
private Object _syncRoot;

Expand Down
Loading