Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@@ -2,14 +2,11 @@ thisdir = class/System.Json.Microsoft
SUBDIRS =
include ../../build/rules.make
System.Json.Properties.Resources.resources: System.Json/Properties/Resources.resx
$(RESGEN) "$<" "$@"
RESOURCE_DEFS = System.Json.Properties.Resources,System.Json/Properties/Resources.resx
LIBRARY = System.Json.Microsoft.dll
LIB_REFS = System System.Xml System.Core System.Runtime.Serialization
LIB_MCS_FLAGS = /d:ASPNETMVC -keyfile:../winfx.pub -delaysign \
/resource:System.Json.Properties.Resources.resources
LIB_MCS_FLAGS = /d:ASPNETMVC -keyfile:../winfx.pub -delaysign
EXTRA_DISTFILES = System.Json/Properties/Resources.resx
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
@@ -24,5 +21,3 @@ endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
include ../../build/library.make
$(the_lib): System.Json.Properties.Resources.resources