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.Private.Uri | |
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.Private.Uri')
-rw-r--r-- | src/System.Private.Uri/src/System/Uri.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/System.Private.Uri/src/System/Uri.cs b/src/System.Private.Uri/src/System/Uri.cs index 69934bc546..d4044424d6 100644 --- a/src/System.Private.Uri/src/System/Uri.cs +++ b/src/System.Private.Uri/src/System/Uri.cs @@ -405,7 +405,7 @@ namespace System // protected Uri(SerializationInfo serializationInfo, StreamingContext streamingContext) { - string uriString = serializationInfo.GetString("AbsoluteUri"); + string uriString = serializationInfo.GetString("AbsoluteUri"); // Do not rename (binary serialization) if (uriString.Length != 0) { @@ -413,7 +413,7 @@ namespace System return; } - uriString = serializationInfo.GetString("RelativeUri"); + uriString = serializationInfo.GetString("RelativeUri"); // Do not rename (binary serialization) if ((object)uriString == null) throw new ArgumentNullException("uriString"); @@ -438,11 +438,11 @@ namespace System { if (IsAbsoluteUri) - serializationInfo.AddValue("AbsoluteUri", GetParts(UriComponents.SerializationInfoString, UriFormat.UriEscaped)); + serializationInfo.AddValue("AbsoluteUri", GetParts(UriComponents.SerializationInfoString, UriFormat.UriEscaped)); // Do not rename (binary serialization) else { - serializationInfo.AddValue("AbsoluteUri", string.Empty); - serializationInfo.AddValue("RelativeUri", GetParts(UriComponents.SerializationInfoString, UriFormat.UriEscaped)); + serializationInfo.AddValue("AbsoluteUri", string.Empty); // Do not rename (binary serialization) + serializationInfo.AddValue("RelativeUri", GetParts(UriComponents.SerializationInfoString, UriFormat.UriEscaped)); // Do not rename (binary serialization) } } |