[wasm] Remove assemblies we don't want to distribute

4 files changed, 21 insertions, 10 deletions

diff --git a/mcs/class/Facades/netstandard/Makefile b/mcs/class/Facades/netstandard/Makefile
index 2ae3d033e57..5cd4c43ddd5 100644
--- a/mcs/class/Facades/netstandard/Makefile
+++ b/mcs/class/Facades/netstandard/Makefile
@@ -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)))
diff --git a/mcs/class/Facades/netstandard/TypeForwarders.cs b/mcs/class/Facades/netstandard/TypeForwarders.cs
index 8342a6a8454..31961398889 100644
--- a/mcs/class/Facades/netstandard/TypeForwarders.cs
+++ b/mcs/class/Facades/netstandard/TypeForwarders.cs
@@ -2100,8 +2100,15 @@
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Transactions.TransactionScopeOption))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Transactions.TransactionStartedEventHandler))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Transactions.TransactionStatus))]
+#endif
+
+#if SYSTEM_WEB_IMPLEMENTATION
+// Implementation is included in .sources
+#else
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Web.HttpUtility))]
 #endif
+
+
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Windows.Input.ICommand))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.ConformanceLevel))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.DtdProcessing))]
diff --git a/mcs/class/Facades/netstandard/wasm_netstandard.dll.sources b/mcs/class/Facades/netstandard/wasm_netstandard.dll.sources
new file mode 100644
index 00000000000..c6bedd1cd12
--- /dev/null
+++ b/mcs/class/Facades/netstandard/wasm_netstandard.dll.sources
@@ -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
\ No newline at end of file
diff --git a/mcs/class/Facades/subdirs.make b/mcs/class/Facades/subdirs.make
index 35fed8f61b1..45c3dd1d9c7 100644
--- a/mcs/class/Facades/subdirs.make
+++ b/mcs/class/Facades/subdirs.make
@@ -79,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)