Imported Upstream version 6.0.0.172

Former-commit-id: f3cc9b82f3e5bd8f0fd3ebc098f789556b44e9cd

mcs/class/Makefile

@@ -1,6 +1,6 @@
 thisdir = class
 
-NO_FACADES_PROFILE := $(filter monodroid_tools binary_reference_assemblies xbuild_12 xbuild_14, $(PROFILE))
+NO_FACADES_PROFILE := $(filter monodroid_tools monotouch_tools wasm_tools binary_reference_assemblies xbuild_12 xbuild_14 netcore, $(PROFILE))
 
 ifndef NO_FACADES_PROFILE
 FACADES_FOLDER := Facades
@@ -12,25 +12,6 @@ ifdef MCS_MODE
 MCS_MODE_dirs := Mono.Cecil.Mdb
 endif
 
-# The minimal set of csc dependencies
-basic_SUBDIRS := \
-	Mono.Cecil \
-	$(MCS_MODE_dirs) \
-	../tools/cil-stringreplacer \
-	corlib \
-	Mono.Security \
-	System \
-	System.XML \
-	System.Security \
-	System.Core \
-	System.ComponentModel.Composition.4.5 \
-	System.Numerics \
-	System.Xml.Linq \
-	Mono.CompilerServices.SymbolWriter	\
-	PEAPI \
-	../ilasm \
-	corlib/il
-
 # Tooling dependencies of mscorlib, we build them to /tmp folder for MONO_PATH to work
 # reliably for clean and update builds. All deps are built against stable API to run with
 # range of boostrap versions and .NET at the same time
@@ -38,6 +19,8 @@ build_SUBDIRS = \
 	Mono.Cecil \
 	$(MCS_MODE_dirs) \
 	../tools/cil-stringreplacer \
+	PEAPI \
+	../ilasm \
 	corlib
 
 build_PARALLEL_SUBDIRS = \
@@ -52,12 +35,12 @@ build_PARALLEL_SUBDIRS = \
 	System.Numerics \
 	System.Xml.Linq \
 	System.IO.Compression \
-	System.Drawing			\
-	Mono.CompilerServices.SymbolWriter	\
-	PEAPI
+	System.IO.Compression.FileSystem \
+	System.Net.Http \
+	System.Net.Http.WebRequest \
+	System.Drawing
 
 ifdef MCS_MODE
-basic_PARALLEL_SUBDIRS := ../mcs
 
 build_SUBDIRS += \
 	Mono.Security \
@@ -65,7 +48,8 @@ build_SUBDIRS += \
 	System.XML \
 	System.Security \
 	Mono.Posix \
-	System.Core
+	System.Core \
+	Mono.CompilerServices.SymbolWriter
 
 build_PARALLEL_SUBDIRS += ../mcs
 endif
@@ -113,6 +97,8 @@ testing_aot_full_dirs_parallel := \
 	Mono.Simd \
 	Mono.CSharp
 
+testing_aot_full_interp_dirs_parallel := $(testing_aot_full_dirs_parallel)
+
 testing_aot_hybrid_dirs_parallel := $(testing_aot_full_dirs_parallel)
 
 xammac_dirs_parallel := \
@@ -129,9 +115,14 @@ monodroid_dirs_parallel := \
 
 monodroid_tools_dirs_parallel := \
 	Mono.Cecil	\
+	Mono.CompilerServices.SymbolWriter \
 	ICSharpCode.SharpZipLib	\
 	monodoc
 
+monotouch_tools_dirs_parallel := \
+	Mono.Cecil \
+	Mono.Cecil.Mdb
+
 monotouch_dirs_parallel := \
 	$(mobile_common_dirs_parallel)	\
 	Mono.Simd \
@@ -163,19 +154,19 @@ monotouch_tv_runtime_dirs := \
 
 winaot_dirs_parallel := \
 	$(mobile_common_dirs_parallel)	\
-	System.Drawing
+	Mono.Simd
 
 unreal_dirs_parallel := \
-	$(mobile_common_dirs_parallel)	\
-	System.Drawing
+	$(mobile_common_dirs_parallel)
 
 wasm_dirs_parallel := \
-	$(mobile_common_dirs_parallel)	\
-	System.Drawing
+	$(mobile_common_dirs_parallel)
+
+wasm_tools_dirs_parallel := \
+	Mono.Cecil
 
 orbis_dirs_parallel := \
-	$(filter-out Microsoft.CSharp Mono.Data.Sqlite,$(mobile_common_dirs_parallel))	\
-	System.Drawing
+	$(filter-out Microsoft.CSharp Mono.Data.Sqlite,$(mobile_common_dirs_parallel))
 
 xammac_4_5_dirs_parallel := \
 	Mono.Security \
@@ -392,7 +383,11 @@ monotouch_watch_runtime_SUBDIRS := $(mobile_common_dirs)
 monotouch_watch_runtime_PARALLEL_SUBDIRS := $(monotouch_watch_runtime_dirs_parallel)
 monotouch_tv_runtime_SUBDIRS := $(mobile_common_dirs)
 monotouch_tv_runtime_PARALLEL_SUBDIRS := $(monotouch_tv_runtime_dirs_parallel)
+monotouch_tools_SUBDIRS :=
+monotouch_tools_PARALLEL_SUBDIRS := $(monotouch_tools_dirs_parallel)
 
+testing_aot_full_interp_SUBDIRS := $(mobile_common_dirs)
+testing_aot_full_interp_PARALLEL_SUBDIRS := $(testing_aot_full_interp_dirs_parallel)
 testing_aot_full_SUBDIRS := $(mobile_common_dirs)
 testing_aot_full_PARALLEL_SUBDIRS := $(testing_aot_full_dirs_parallel)
 testing_aot_hybrid_SUBDIRS := $(mobile_common_dirs)
@@ -420,13 +415,18 @@ unreal_PARALLEL_SUBDIRS := $(unreal_dirs_parallel)
 
 wasm_SUBDIRS := $(mobile_common_dirs)
 wasm_PARALLEL_SUBDIRS := $(wasm_dirs_parallel)
+wasm_tools_SUBDIRS :=
+wasm_tools_PARALLEL_SUBDIRS := $(wasm_tools_dirs_parallel)
+
+netcore_SUBDIRS := System.Private.CoreLib
+netcore_PARALLEL_SUBDIRS :=
 
 include ../build/rules.make
 
-DIST_SUBDIRS = $(testing_aot_full_dirs_parallel) $(testing_aot_hybrid_dirs_parallel) $(monotouch_dirs_parallel) \
+DIST_SUBDIRS = $(testing_aot_full_dirs_parallel) $(testing_aot_hybrid_dirs_parallel) $(monotouch_dirs_parallel) $(monotouch_tools_dirs_parallel) \
 $(monodroid_dirs_parallel) $(monodroid_tools_dirs_parallel) $(xammac_dirs_parallel) $(net_4_x_dirs) $(net_4_x_parallel_dirs) \
-$(xammac_4_5_dirs_parallel) $(unreal_dirs_parallel) $(wasm_dirs_parallel) $(xbuild_14_SUBDIRS) \
-dlr aot-compiler reference-assemblies Facades
+$(xammac_4_5_dirs_parallel) $(unreal_dirs_parallel) $(wasm_dirs_parallel) $(wasm_tools_dirs_parallel) $(xbuild_14_SUBDIRS) \
+$(testing_aot_full_interp_dirs_parallel) $(netcore_SUBDIRS) dlr aot-compiler reference-assemblies Facades
 
 # No new makefiles for: System.Messaging, System.Web.Mobile,
 # System.ServiceProcess
@@ -457,6 +457,7 @@ DISTFILES = \
 	test-helpers/RemoteExecutorTestBase.Mono.cs \
 	test-helpers/SocketResponder.cs \
 	test-helpers/TestResourceHelper.cs \
+	test-helpers/PathHelpers.cs \
 	$(foreach HOST_PLATFORM,macos linux win32 unix,lib/$(monolite_dir)/mcs.exe $(monolite_files))
 
 .PHONY: all-local $(STD_TARGETS:=-local)
@@ -478,7 +479,7 @@ build_files := mscorlib.dll System.dll System.Xml.dll Mono.Security.dll System.C
 	Facades/System.IO.dll Facades/System.Runtime.InteropServices.dll Facades/System.Xml.ReaderWriter.dll Facades/System.Linq.Expressions.dll \
 	Facades/System.Runtime.Numerics.dll Facades/System.Xml.XDocument.dll Facades/System.IO.FileSystem.Primitives.dll Facades/System.IO.FileSystem.dll \
 	Facades/System.Diagnostics.FileVersionInfo.dll Facades/System.Security.Cryptography.Primitives.dll Facades/System.Security.Cryptography.Algorithms.dll \
-	Facades/System.ValueTuple.dll Facades/System.Text.Encoding.CodePages.dll \
+	Facades/System.ValueTuple.dll Facades/System.Text.Encoding.CodePages.dll Facades/netstandard.dll \
 	Mono.Cecil.dll
 
 monolite_files = $(build_files:%=lib/$(monolite_dir)/%)