Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -6,17 +6,15 @@ System.Json.Properties.Resources.resources: System.Json/Properties/Resources.res
$(RESGEN) "$<" "$@"
LIBRARY = System.Json.Microsoft.dll
LIB_REFS = System System.Xml System.Core System.Runtime.Serialization
LIB_MCS_FLAGS = /d:ASPNETMVC -keyfile:../winfx.pub -delaysign \
/r:System.dll \
/r:System.Xml.dll \
/r:System.Core.dll \
/r:System.Runtime.Serialization.dll \
/resource:System.Json.Properties.Resources.resources
EXTRA_DISTFILES = System.Json/Properties/Resources.resx
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
LIB_MCS_FLAGS += /r:Microsoft.CSharp.dll -d:FEATURE_DYNAMIC
LIB_REFS += Microsoft.CSharp
LIB_MCS_FLAGS += -d:FEATURE_DYNAMIC
endif
ifeq (monodroid, $(PROFILE))