mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.8.0.22

Browse Source 
Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mcs/class/System.Json/Assembly/AssemblyInfo.cs
View File

@@ -51,7 +51,6 @@ using System.Runtime.InteropServices;
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: AssemblyDelaySign (true)]
[assembly: AssemblyKeyFile ("../winfx.pub")]
[assembly: ComVisible (false)]

1
mcs/class/System.Json/Makefile
View File

@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.Json.dll
LIB_REFS = System System.Xml System.Core
KEYFILE = ../winfx.pub
LIB_MCS_FLAGS =
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)

3
mcs/class/System.Json/System.Json/JsonArray.cs
View File

@@ -45,9 +45,6 @@ namespace System.Json
public void Add (JsonValue item)
{
if (item == null)
throw new ArgumentNullException ("item");
list.Add (item);
}

3
mcs/class/System.Json/Test/System.Json/JsonValueTest.cs
View File

@@ -44,6 +44,9 @@ namespace MonoTests.System
Assert.AreEqual (JsonType.Array, j.JsonType, "type");
var str = j.ToString ();
Assert.AreEqual (str, "[1, 2, 3, null]");
((JsonArray) j).Add (null);
str = j.ToString ();
Assert.AreEqual (str, "[1, 2, 3, null, null]");
}
// Test that we correctly serialize JsonObject with null elements.