Cross framework serialization finish up (dotnet#20870)

* wip: add stubs for custom isEqual * Updated blobs, small code refactoring, disabled CookieContainer test * Fixed netfx471 detection * add custom equals for graph with cycles * fix few more comparers * Merge * fix few more test cases * fix few more types, fix GetExtensionMethod to work with parameters with same type name but different generic params * finish tests (2 comparisons are commented out: search for TODO) * Adding TypeForward for DictionaryNode * Updating blobs * Update Cookie hashes, adding TypeForwards, removing unnecessary equality checks for CookieCollection * Reenabling SortedDictionary test * Update blobs * make cookie.Timestamp to roundtrip correctly * regenerate netfx and corefx blobs to account for Cookie.Timestamp change * make regex fix the blob for ObjectWithArray * fix ObjectWithArray netfx test failure * Replacing Dictionary with Hashtable for desktop serialization support * Update blobs * Fixing a lot of TypeForwards, adding another hashtable test, other fixes * Adding a few more TypeForwardedFrom attributes * Updating the coreclr version, disabling CookieContainer test * Update blobs * Disabling CompareInfo test --> waiting for coreclr * generate test cases * update blobs, comment out not working cases * fix null equality checks for new test cases and reenable them * PR feedback addressed * Fixed a typo... * Updating used coreclr version, enabling compareinfo test again
dotnet-bot · Jun 14, 2017 · cdfb6ec · cdfb6ec
1 parent 7854da4
commit cdfb6ec
Show file tree

Hide file tree

Showing 55 changed files with 1,511 additions and 582 deletions.
diff --git a/dependencies.props b/dependencies.props
@@ -10,7 +10,7 @@
   -->
   <PropertyGroup>
     <CoreFxCurrentRef>a96e149ce150f6a15546032ca3966bf238c373fb</CoreFxCurrentRef>
-    <CoreClrCurrentRef>a96e149ce150f6a15546032ca3966bf238c373fb</CoreClrCurrentRef>
+    <CoreClrCurrentRef>ee8120953ace63e9775c84e98a6ca70d4e277657</CoreClrCurrentRef>
     <CoreSetupCurrentRef>156d7c16cff74e50054ed195286aa53b887501e2</CoreSetupCurrentRef>
     <ExternalCurrentRef>5a0606fccb09fce4b47545ae9896139acca547f5</ExternalCurrentRef>
     <ProjectNTfsCurrentRef>b1943f0630fb979a7e9ead2b86a6933d6c9409e9</ProjectNTfsCurrentRef>
@@ -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>

diff --git a/src/Common/tests/System/PlatformDetection.cs b/src/Common/tests/System/PlatformDetection.cs
@@ -66,7 +66,7 @@ public static bool IsNetfx470OrNewer()
             return runningVersion != null && runningVersion >= net470;
         }
 
-        public static bool IsNetfxBelow471()
+        public static bool IsNetfx471OrNewer()
         {
             if (!IsFullFramework)
             {
@@ -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()

diff --git a/src/System.Collections.NonGeneric/src/System/Collections/Queue.cs b/src/System.Collections.NonGeneric/src/System/Collections/Queue.cs
@@ -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;