diff options
author | Viktor Hofer <viktor.hofer@microsoft.com> | 2017-06-15 02:18:01 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-15 02:18:01 +0300 |
commit | cdfb6ecf11cae3f43d35233852ef422cb12ef3d8 (patch) | |
tree | b16f3bdf904efa201b046943de0bb81ab949a24a /src/System.Runtime.Numerics | |
parent | 7854da41259580c39a5b595dd5c4b6db395434b6 (diff) |
Cross framework serialization finish up (#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
Diffstat (limited to 'src/System.Runtime.Numerics')
-rw-r--r-- | src/System.Runtime.Numerics/src/System/Numerics/BigInteger.cs | 4 | ||||
-rw-r--r-- | src/System.Runtime.Numerics/src/System/Numerics/Complex.cs | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/System.Runtime.Numerics/src/System/Numerics/BigInteger.cs b/src/System.Runtime.Numerics/src/System/Numerics/BigInteger.cs index 32fc0ba0cd..d9249ccfc3 100644 --- a/src/System.Runtime.Numerics/src/System/Numerics/BigInteger.cs +++ b/src/System.Runtime.Numerics/src/System/Numerics/BigInteger.cs @@ -21,8 +21,8 @@ namespace System.Numerics // For values int.MinValue < n <= int.MaxValue, the value is stored in sign // and _bits is null. For all other values, sign is +1 or -1 and the bits are in _bits - internal readonly int _sign; - internal readonly uint[] _bits; + internal readonly int _sign; // Do not rename (binary serialization) + internal readonly uint[] _bits; // Do not rename (binary serialization) // We have to make a choice of how to represent int.MinValue. This is the one // value that fits in an int, but whose negation does not fit in an int. diff --git a/src/System.Runtime.Numerics/src/System/Numerics/Complex.cs b/src/System.Runtime.Numerics/src/System/Numerics/Complex.cs index a087ce77f9..f42f22ba6e 100644 --- a/src/System.Runtime.Numerics/src/System/Numerics/Complex.cs +++ b/src/System.Runtime.Numerics/src/System/Numerics/Complex.cs @@ -13,7 +13,7 @@ namespace System.Numerics /// are real numbers, and i is the imaginary unit, with the property i2= -1. /// </summary> [Serializable] - [System.Runtime.CompilerServices.TypeForwardedFrom("System.Numerics, Version=4.0.0.0, PublicKeyToken=b77a5c561934e089")] + [System.Runtime.CompilerServices.TypeForwardedFrom("System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] public struct Complex : IEquatable<Complex>, IFormattable { public static readonly Complex Zero = new Complex(0.0, 0.0); @@ -32,9 +32,9 @@ namespace System.Numerics private static readonly double s_log2 = Math.Log(2.0); // Do not rename, these fields are needed for binary serialization - private double m_real; - private double m_imaginary; - + private double m_real; // Do not rename (binary serialization) + private double m_imaginary; // Do not rename (binary serialization) + public Complex(double real, double imaginary) { m_real = real; |