Move Mono-specific assemblies from netfx profiles to mono folder

None of these ship with the .NET Framework, they're a Mono-specific
artifact (either historically or deliberately):

cscompmgd.cs -> seems to have some types from Microsoft.CSharp, probably unused?
Microsoft.Web.Infrastructure.cs -> used for old ASP.NET MVC
SMDiagnostics.cs -> old .NET assembly we could probably remove
System.Json.cs -> JSON APIs from Silverlight
System.Json.Microsoft.cs -> same as above but with MS implementation
System.Net.Http.Formatting.cs -> used for old ASP.NET MVC
System.Numerics.Vectors.cs -> contains new Vector APIs, we added it as an assembly instead of facade
System.Reactive.Core.cs -> old copy of ReactiveX
System.Reactive.Debugger.cs -> old copy of ReactiveX
System.Reactive.Experimental.cs -> old copy of ReactiveX
System.Reactive.Interfaces.cs -> old copy of ReactiveX
System.Reactive.Linq.cs -> old copy of ReactiveX
System.Reactive.Observable.Aliases.cs -> old copy of ReactiveX
System.Reactive.PlatformServices.cs -> old copy of ReactiveX
System.Reactive.Providers.cs -> old copy of ReactiveX
System.Reactive.Runtime.Remoting.cs -> old copy of ReactiveX
System.Reactive.Windows.Forms.cs -> old copy of ReactiveX
System.Reactive.Windows.Threading.cs -> old copy of ReactiveX
System.Threading.Tasks.Dataflow.cs -> TPL Dataflow APIs that were distributed as NuGet only on netfx
System.Web.Http.cs -> used for old ASP.NET MVC
System.Web.Http.SelfHost.cs -> used for old ASP.NET MVC
System.Web.Http.WebHost.cs -> used for old ASP.NET MVC
System.Web.Mvc.cs -> used for old ASP.NET MVC
System.Web.Razor.cs -> used for old ASP.NET MVC
System.Web.WebPages.cs -> used for old ASP.NET MVC
System.Web.WebPages.Deployment.cs -> used for old ASP.NET MVC
System.Web.WebPages.Razor.cs -> used for old ASP.NET MVC

We can consolidate them into the mono folder.

28 files changed, 69 insertions, 4 deletions

diff --git a/mono/Makefile b/mono/Makefile
index a50759f..ec75da4 100644
--- a/mono/Makefile
+++ b/mono/Makefile
@@ -6,14 +6,20 @@ CSC ?= csc
 CSC_COMMON_ARGS := -nologo -noconfig -optimize -nostdlib -unsafe -deterministic -publicsign -debug- -target:library -nowarn:612 -nowarn:618
 Q_CSC = $(if $(V),,@echo "CSC   [$(PROFILE)] $(1)";)
 
-ASSEMBLIES := Commons.Xml.Relaxng I18N.CJK I18N.MidEast I18N.Other I18N.Rare I18N.West I18N IBM.Data.DB2 ICSharpCode.SharpZipLib	\
-	Mono.C5 Mono.CSharp Mono.Cairo Mono.CodeContracts Mono.CompilerServices.SymbolWriter Mono.Data.Sqlite	\
+ASSEMBLIES := cscompmgd Commons.Xml.Relaxng I18N.CJK I18N.MidEast I18N.Other I18N.Rare I18N.West I18N IBM.Data.DB2 ICSharpCode.SharpZipLib	\
+	Microsoft.Web.Infrastructure Mono.C5 Mono.CSharp Mono.Cairo Mono.CodeContracts Mono.CompilerServices.SymbolWriter Mono.Data.Sqlite	\
 	Mono.Data.Tds Mono.Debugger.Soft Mono.Http Mono.Management Mono.Messaging.RabbitMQ Mono.Messaging	\
 	Mono.Options Mono.Parallel Mono.Posix Mono.Security.Win32 Mono.Security Mono.Simd Mono.Tasklets Mono.WebBrowser	\
-	Novell.Directory.Ldap PEAPI RabbitMQ.Client WebMatrix.Data bare/Mono.Cecil
+	Novell.Directory.Ldap PEAPI RabbitMQ.Client WebMatrix.Data bare/Mono.Cecil	\
+	SMDiagnostics System.Json.Microsoft System.Json System.Net.Http.Formatting System.Numerics.Vectors	\
+	System.Reactive.Core System.Reactive.Debugger System.Reactive.Experimental System.Reactive.Interfaces System.Reactive.Linq System.Reactive.Observable.Aliases	\
+	System.Reactive.PlatformServices System.Reactive.Providers System.Reactive.Runtime.Remoting System.Reactive.Windows.Forms System.Reactive.Windows.Threading	\
+	System.Threading.Tasks.Dataflow System.Web.Http.SelfHost System.Web.Http.WebHost System.Web.Http System.Web.Mvc System.Web.Razor \
+	System.Web.WebPages.Deployment System.Web.WebPages.Razor System.Web.WebPages
 
 # generated with (and then slightly tweaked):
 # for i in *.dll; do ikdasm --assemblyref $i | grep Name= | sed 's/.*Name=//g' | sed -e $'s/$/\\\n/g' | sed -e ':a' -e 'N' -e '$!ba' -e 's/\n/ /g' -e "s/^/${i%.*}_REFS := /"; done
+cscompmgd_REFS := mscorlib System
 Commons.Xml.Relaxng_REFS := mscorlib System.Xml System
 I18N.CJK_REFS := mscorlib
 I18N.MidEast_REFS := mscorlib
@@ -23,6 +29,7 @@ I18N.West_REFS := mscorlib
 I18N_REFS := mscorlib
 IBM.Data.DB2_REFS := mscorlib System System.Data
 ICSharpCode.SharpZipLib_REFS := mscorlib System
+Microsoft.Web.Infrastructure_REFS := mscorlib System System.Web
 Mono.C5_REFS := mscorlib
 Mono.CSharp_REFS := mscorlib System System.Core System.Xml
 Mono.Cairo_REFS := mscorlib
@@ -47,6 +54,31 @@ Novell.Directory.Ldap_REFS := mscorlib System
 PEAPI_REFS := mscorlib
 RabbitMQ.Client_REFS := mscorlib System.Xml System
 WebMatrix.Data_REFS := mscorlib System.Data System.Core System System.Configuration
+SMDiagnostics_REFS := mscorlib System.Configuration System System.Xml
+System.Json.Microsoft_REFS := mscorlib System.Runtime.Serialization System System.Xml System.Core
+System.Json_REFS := mscorlib System System.Core
+System.Net.Http.Formatting_REFS := mscorlib System System.Xml System.Xml.Linq System.Runtime.Serialization System.Core System.Data System.Net.Http System.Configuration
+System.Numerics.Vectors_REFS := mscorlib System.Numerics
+System.Reactive.Core_REFS := mscorlib System System.Core
+System.Reactive.Debugger_REFS := mscorlib
+System.Reactive.Experimental_REFS := mscorlib System.Core System
+System.Reactive.Interfaces_REFS := mscorlib System.Core
+System.Reactive.Linq_REFS := mscorlib System.Core System
+System.Reactive.Observable.Aliases_REFS := mscorlib System.Core
+System.Reactive.PlatformServices_REFS := mscorlib System System.Core
+System.Reactive.Providers_REFS := mscorlib System.Core System
+System.Reactive.Runtime.Remoting_REFS := mscorlib System.Core
+System.Reactive.Windows.Forms_REFS := mscorlib System.Windows.Forms
+System.Reactive.Windows.Threading_REFS := mscorlib System WindowsBase
+System.Threading.Tasks.Dataflow_REFS := mscorlib System.Core System
+System.Web.Http.SelfHost_REFS := mscorlib System System.ServiceModel System.Net.Http System.Core System.IdentityModel System.Runtime.Serialization System.Configuration System.Xml
+System.Web.Http.WebHost_REFS := mscorlib System.Web System.Core System System.Net.Http System.Xml
+System.Web.Http_REFS := mscorlib System System.Net.Http System.Core System.ComponentModel.DataAnnotations System.Runtime.Serialization System.Xml System.Data.Linq
+System.Web.Mvc_REFS := mscorlib System.Web System System.Core System.ComponentModel.DataAnnotations System.Web.Extensions System.Runtime.Caching System.Xml System.Data.Linq
+System.Web.Razor_REFS := mscorlib System System.Core
+System.Web.WebPages.Deployment_REFS := mscorlib System.Web System System.Configuration System.Core
+System.Web.WebPages.Razor_REFS := mscorlib System.Web System System.Configuration System.Core
+System.Web.WebPages_REFS := mscorlib System.Web System System.Core System.Xml.Linq System.ComponentModel.DataAnnotations System.Data.Linq Microsoft.CSharp
 
 bare/Mono.Cecil_REFS := mscorlib
 
@@ -57,13 +89,32 @@ I18N.Rare_MONOREFS := I18N
 I18N.West_MONOREFS := I18N
 Mono.Debugger.Soft_MONOREFS := bare/Mono.Cecil
 Mono.Messaging.RabbitMQ_MONOREFS := Mono.Messaging RabbitMQ.Client
+System.Reactive.Core_MONOREFS := System.Reactive.Interfaces
+System.Reactive.Debugger_MONOREFS := System.Reactive.Linq
+System.Reactive.Experimental_MONOREFS := System.Reactive.Linq System.Reactive.Core System.Reactive.Interfaces
+System.Reactive.Linq_MONOREFS :=System.Reactive.Interfaces System.Reactive.Core
+System.Reactive.Observable.Aliases_MONOREFS := System.Reactive.Interfaces System.Reactive.Providers System.Reactive.Linq
+System.Reactive.PlatformServices_MONOREFS := System.Reactive.Core System.Reactive.Interfaces System.Reactive.Linq
+System.Reactive.Providers_MONOREFS := System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq
+System.Reactive.Runtime.Remoting_MONOREFS := System.Reactive.Interfaces System.Reactive.Core
+System.Reactive.Windows.Forms_MONOREFS := System.Reactive.Core System.Reactive.Interfaces
+System.Reactive.Windows.Threading_MONOREFS := System.Reactive.Core System.Reactive.Interfaces
+System.Web.Http.SelfHost_MONOREFS := System.Web.Http System.Net.Http.Formatting
+System.Web.Http.WebHost_MONOREFS := System.Web.Http Microsoft.Web.Infrastructure
+System.Web.Http_MONOREFS := System.Net.Http.Formatting
+System.Web.Mvc_MONOREFS := System.Web.WebPages.Razor System.Web.WebPages System.Web.Razor Microsoft.Web.Infrastructure
+System.Web.WebPages.Deployment_MONOREFS := Microsoft.Web.Infrastructure
+System.Web.WebPages.Razor_MONOREFS := System.Web.Razor System.Web.WebPages
+System.Web.WebPages_MONOREFS := System.Web.Razor Microsoft.Web.Infrastructure System.Web.WebPages.Deployment
 
 MONO_KEY := ../../../mcs/class/mono.pub         # Public Key Token: 0738eb9f132ed756
+ECMA_KEY := ../../../mcs/class/ecma.pub         # Public Key Token: b77a5c561934e089
+WINFX_KEY := ../../../mcs/class/winfx.pub       # Public Key Token: 31bf3856ad364e35
+MSFINAL_KEY := ../../../mcs/class/msfinal.pub   # Public Key Token: b03f5f7f11d50a3a
 
 IBM.Data.DB2_KEYFILE := ../../../mcs/class/IBM.Data.DB2/ibm.pub
 ICSharpCode.SharpZipLib_KEYFILE := ../../../mcs/class/ICSharpCode.SharpZipLib/SharpZipLib.pub
 Mono.C5_KEYFILE := ../../../mcs/class/Mono.C5/c5.pub
-RabbitMQ.Client_KEYFILE := ../../../mcs/class/msfinal.pub
 
 MONO_KEY_ASSEMBLIES := Commons.Xml.Relaxng I18N.CJK I18N.MidEast I18N.Other I18N.Rare I18N.West I18N	\
 	Mono.CSharp Mono.Cairo Mono.CodeContracts Mono.CompilerServices.SymbolWriter Mono.Data.Sqlite	\
@@ -71,6 +122,17 @@ MONO_KEY_ASSEMBLIES := Commons.Xml.Relaxng I18N.CJK I18N.MidEast I18N.Other I18N
 	Mono.Options Mono.Parallel Mono.Posix Mono.Security.Win32 Mono.Security Mono.Simd Mono.Tasklets Mono.WebBrowser	\
 	Novell.Directory.Ldap PEAPI WebMatrix.Data bare/Mono.Cecil
 
+ECMA_KEY_ASSEMBLIES := SMDiagnostics System.Threading.Tasks.Dataflow
+
+WINFX_KEY_ASSEMBLIES := Microsoft.Web.Infrastructure System.Json.Microsoft System.Json System.Net.Http.Formatting	\
+	System.Reactive.Core System.Reactive.Debugger System.Reactive.Experimental	\
+	System.Reactive.Interfaces System.Reactive.Linq System.Reactive.Observable.Aliases System.Reactive.PlatformServices	\
+	System.Reactive.Providers System.Reactive.Runtime.Remoting System.Reactive.Windows.Forms System.Reactive.Windows.Threading	\
+	System.Web.Http.SelfHost System.Web.Http.WebHost System.Web.Http System.Web.Mvc System.Web.Razor 	\
+	System.Web.WebPages.Deployment System.Web.WebPages.Razor System.Web.WebPages
+
+MSFINAL_KEY_ASSEMBLIES := cscompmgd RabbitMQ.Client System.Numerics.Vectors
+
 all: $(addsuffix .dll, $(ASSEMBLIES))
 
 clean:
@@ -88,5 +150,8 @@ $(1).dll: $(addprefix $(SOURCEDIR),$(subst bare/,,$(1)).cs) $(wildcard $(SOURCED
 endef
 
 $(foreach asm, $(MONO_KEY_ASSEMBLIES),    $(eval $(call KEYFILE_TEMPLATE,$(asm), $(MONO_KEY))))
+$(foreach asm, $(ECMA_KEY_ASSEMBLIES),    $(eval $(call KEYFILE_TEMPLATE,$(asm), $(ECMA_KEY))))
+$(foreach asm, $(WINFX_KEY_ASSEMBLIES),   $(eval $(call KEYFILE_TEMPLATE,$(asm), $(WINFX_KEY))))
+$(foreach asm, $(MSFINAL_KEY_ASSEMBLIES), $(eval $(call KEYFILE_TEMPLATE,$(asm), $(MSFINAL_KEY))))
 
 $(foreach asm, $(ASSEMBLIES), $(eval $(call ASSEMBLY_TEMPLATE,$(asm))))
diff --git a/mono/Microsoft.Web.Infrastructure.dll b/mono/Microsoft.Web.Infrastructure.dll
new file mode 100644
index 0000000..35e35d2
--- /dev/null
+++ b/mono/Microsoft.Web.Infrastructure.dll
diff --git a/mono/SMDiagnostics.dll b/mono/SMDiagnostics.dll
new file mode 100644
index 0000000..ebedd96
--- /dev/null
+++ b/mono/SMDiagnostics.dll
diff --git a/mono/System.Json.Microsoft.dll b/mono/System.Json.Microsoft.dll
new file mode 100644
index 0000000..9247091
--- /dev/null
+++ b/mono/System.Json.Microsoft.dll
diff --git a/mono/System.Json.dll b/mono/System.Json.dll
new file mode 100644
index 0000000..20beed7
--- /dev/null
+++ b/mono/System.Json.dll
diff --git a/mono/System.Net.Http.Formatting.dll b/mono/System.Net.Http.Formatting.dll
new file mode 100644
index 0000000..6eb847d
--- /dev/null
+++ b/mono/System.Net.Http.Formatting.dll
diff --git a/mono/System.Numerics.Vectors.dll b/mono/System.Numerics.Vectors.dll
new file mode 100644
index 0000000..5667519
--- /dev/null
+++ b/mono/System.Numerics.Vectors.dll
diff --git a/mono/System.Reactive.Core.dll b/mono/System.Reactive.Core.dll
new file mode 100644
index 0000000..237d5fd
--- /dev/null
+++ b/mono/System.Reactive.Core.dll
diff --git a/mono/System.Reactive.Debugger.dll b/mono/System.Reactive.Debugger.dll
new file mode 100644
index 0000000..690723e
--- /dev/null
+++ b/mono/System.Reactive.Debugger.dll
diff --git a/mono/System.Reactive.Experimental.dll b/mono/System.Reactive.Experimental.dll
new file mode 100644
index 0000000..b992c51
--- /dev/null
+++ b/mono/System.Reactive.Experimental.dll
diff --git a/mono/System.Reactive.Interfaces.dll b/mono/System.Reactive.Interfaces.dll
new file mode 100644
index 0000000..d3ed5cc
--- /dev/null
+++ b/mono/System.Reactive.Interfaces.dll
diff --git a/mono/System.Reactive.Linq.dll b/mono/System.Reactive.Linq.dll
new file mode 100644
index 0000000..cad1ecc
--- /dev/null
+++ b/mono/System.Reactive.Linq.dll
diff --git a/mono/System.Reactive.Observable.Aliases.dll b/mono/System.Reactive.Observable.Aliases.dll
new file mode 100644
index 0000000..9cbf577
--- /dev/null
+++ b/mono/System.Reactive.Observable.Aliases.dll
diff --git a/mono/System.Reactive.PlatformServices.dll b/mono/System.Reactive.PlatformServices.dll
new file mode 100644
index 0000000..f869a70
--- /dev/null
+++ b/mono/System.Reactive.PlatformServices.dll
diff --git a/mono/System.Reactive.Providers.dll b/mono/System.Reactive.Providers.dll
new file mode 100644
index 0000000..60802f3
--- /dev/null
+++ b/mono/System.Reactive.Providers.dll
diff --git a/mono/System.Reactive.Runtime.Remoting.dll b/mono/System.Reactive.Runtime.Remoting.dll
new file mode 100644
index 0000000..7b87308
--- /dev/null
+++ b/mono/System.Reactive.Runtime.Remoting.dll
diff --git a/mono/System.Reactive.Windows.Forms.dll b/mono/System.Reactive.Windows.Forms.dll
new file mode 100644
index 0000000..00dcaee
--- /dev/null
+++ b/mono/System.Reactive.Windows.Forms.dll
diff --git a/mono/System.Reactive.Windows.Threading.dll b/mono/System.Reactive.Windows.Threading.dll
new file mode 100644
index 0000000..749f4ab
--- /dev/null
+++ b/mono/System.Reactive.Windows.Threading.dll
diff --git a/mono/System.Threading.Tasks.Dataflow.dll b/mono/System.Threading.Tasks.Dataflow.dll
new file mode 100644
index 0000000..ca89077
--- /dev/null
+++ b/mono/System.Threading.Tasks.Dataflow.dll
diff --git a/mono/System.Web.Http.SelfHost.dll b/mono/System.Web.Http.SelfHost.dll
new file mode 100644
index 0000000..59a0a5b
--- /dev/null
+++ b/mono/System.Web.Http.SelfHost.dll
diff --git a/mono/System.Web.Http.WebHost.dll b/mono/System.Web.Http.WebHost.dll
new file mode 100644
index 0000000..017abb4
--- /dev/null
+++ b/mono/System.Web.Http.WebHost.dll
diff --git a/mono/System.Web.Http.dll b/mono/System.Web.Http.dll
new file mode 100644
index 0000000..543f45a
--- /dev/null
+++ b/mono/System.Web.Http.dll
diff --git a/mono/System.Web.Mvc.dll b/mono/System.Web.Mvc.dll
new file mode 100644
index 0000000..4dcd718
--- /dev/null
+++ b/mono/System.Web.Mvc.dll
diff --git a/mono/System.Web.Razor.dll b/mono/System.Web.Razor.dll
new file mode 100644
index 0000000..6197916
--- /dev/null
+++ b/mono/System.Web.Razor.dll
diff --git a/mono/System.Web.WebPages.Deployment.dll b/mono/System.Web.WebPages.Deployment.dll
new file mode 100644
index 0000000..274f39f
--- /dev/null
+++ b/mono/System.Web.WebPages.Deployment.dll
diff --git a/mono/System.Web.WebPages.Razor.dll b/mono/System.Web.WebPages.Razor.dll
new file mode 100644
index 0000000..5241a6c
--- /dev/null
+++ b/mono/System.Web.WebPages.Razor.dll
diff --git a/mono/System.Web.WebPages.dll b/mono/System.Web.WebPages.dll
new file mode 100644
index 0000000..5445099
--- /dev/null
+++ b/mono/System.Web.WebPages.dll
diff --git a/mono/cscompmgd.dll b/mono/cscompmgd.dll
new file mode 100644
index 0000000..f87fcde
--- /dev/null
+++ b/mono/cscompmgd.dll