-
Notifications
You must be signed in to change notification settings - Fork 126
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'issue/523' into release/unity-ga
Fixes #523
- Loading branch information
Showing
22 changed files
with
103 additions
and
42 deletions.
There are no files selected for viewing
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified
BIN
+22 Bytes
(100%)
samples/UnityDemo/Assets/Plugins/System.Net.Http.Net35.dll.mdb
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
samples/UnityDemo/Assets/Plugins/System.Threading.Tasks.Net35.dll
Binary file not shown.
Binary file modified
BIN
+216 Bytes
(100%)
samples/UnityDemo/Assets/Plugins/System.Threading.Tasks.Net35.dll.mdb
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule Rackspace
updated
2 files
| +1 −1 | Rackspace.Threading | |
| +1 −3 | System.Net.Http/System.Net.Http/HttpClientHandler.cs |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| // | ||
| // System.InvalidDataException.cs | ||
| // | ||
| // Authors: | ||
| // Christopher James Lahey <[email protected]> | ||
| // Andreas Nahr ([email protected]) | ||
| // | ||
| // Copyright (C) 2004, 2006 Novell, Inc (http://www.novell.com) | ||
| // | ||
|
|
||
| using System.Globalization; | ||
| using System.Runtime.Serialization; | ||
|
|
||
| namespace System.IO.Couchbase | ||
| { | ||
| [Serializable] | ||
| public sealed class InvalidDataException : SystemException | ||
| { | ||
| const int Result = unchecked ((int)0x80131503); | ||
|
|
||
| // Constructors | ||
| public InvalidDataException () | ||
| : base ("Invalid data format.") | ||
| { | ||
| HResult = Result; | ||
| } | ||
|
|
||
| public InvalidDataException (string message) | ||
| : base (message) | ||
| { | ||
| HResult = Result; | ||
| } | ||
|
|
||
| public InvalidDataException (string message, Exception innerException) | ||
| : base (message, innerException) | ||
| { | ||
| HResult = Result; | ||
| } | ||
|
|
||
| private InvalidDataException (SerializationInfo info, StreamingContext context) | ||
| : base (info, context) | ||
| { | ||
| } | ||
| } | ||
| } |
Submodule JSON.NET
updated
7 files