Imported Upstream version 6.6.0.89

Former-commit-id: b39a328747c2f3414dc52e009fb6f0aa80ca2492
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-09-24 08:53:40 +00:00
parent cf815e07e0
commit 95fdb59ea6
2556 changed files with 138145 additions and 47453 deletions

View File

@@ -15,20 +15,20 @@ SIGN_FLAGS = /delaysign /nowarn:1616,1699,618
LIB_REFS = System System.Xml System.Xml.Linq System.Core System.Numerics System.Net.Http \
System.IO.Compression System.ComponentModel.Composition System.IO.Compression.FileSystem
LIB_MCS_FLAGS = $(SIGN_FLAGS) $(EXTRA_LIB_MCS_FLAGS)
LIB_MCS_FLAGS = $(SIGN_FLAGS)
ifneq ($(PROFILE),build)
ifeq ($(PROFILE),build)
# for the build profile we include stubs for these types directly in netstandard.dll
LIB_MCS_FLAGS += -d:SYSTEM_WEB_IMPLEMENTATION
else ifeq ($(PROFILE),wasm)
LIB_MCS_FLAGS += -d:SYSTEM_WEB_IMPLEMENTATION -unsafe
LIB_REFS += System.Transactions System.Runtime.Serialization System.Data
ifeq ($(PROFILE),xammac_net_4_5)
LIB_REFS += System.Web.Services
else ifeq ($(PROFILE),xammac_net_4_5)
LIB_REFS += System.Web.Services System.Transactions System.Runtime.Serialization System.Data
else ifeq (2.1, $(FRAMEWORK_VERSION))
LIB_REFS += System.Web.Services
LIB_REFS += System.Web.Services System.Transactions System.Runtime.Serialization System.Data
else
LIB_REFS += System.Web
endif
LIB_REFS += System.Web System.Transactions System.Runtime.Serialization System.Data
endif
ifneq (,$(filter build net_4_x, $(PROFILE)))

View File

@@ -1 +1 @@
8342a6a8454aecca51da2612b8d0ab24295206bd
319613988894e958c40cdcd218190a7ad2d6b27d

View File

@@ -0,0 +1,4 @@
#include netstandard.dll.sources
../../../../external/corefx/src/System.Web.HttpUtility/src/System/Web/HttpUtility.cs
../../../../external/corefx/src/System.Web.HttpUtility/src/System/Web/Util/*.cs

View File

@@ -69,6 +69,9 @@ monotouch_tv_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
winaot_SUBDIRS = $(common_DEPS_SUBDIRS) System.Drawing.Common
winaot_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
testing_winaot_interp_SUBDIRS = $(common_DEPS_SUBDIRS) System.Drawing.Common
testing_winaot_interp_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
orbis_SUBDIRS = $(common_DEPS_SUBDIRS) System.Drawing.Common
orbis_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
@@ -76,7 +79,7 @@ unreal_SUBDIRS = $(common_DEPS_SUBDIRS) System.Drawing.Common
unreal_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
wasm_SUBDIRS = $(common_DEPS_SUBDIRS) System.Drawing.Common
wasm_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
wasm_PARALLEL_SUBDIRS = $(filter-out System.ServiceModel.%, $(common_SUBDIRS)) $(mobile_only_SUBDIRS)
testing_aot_full_SUBDIRS = $(common_DEPS_SUBDIRS) System.Drawing.Common
testing_aot_full_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)