Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0

external/binary-reference-assemblies/Makefile

@@ -9,6 +9,7 @@ all:
 	$(MAKE) -C v4.6.1
 	$(MAKE) -C v4.6.2
 	$(MAKE) -C v4.7
+	$(MAKE) -C v4.7.1
 	$(MAKE) -C mono
 
 clean:
@@ -22,6 +23,7 @@ clean:
 	$(MAKE) -C v4.6.1 clean
 	$(MAKE) -C v4.6.2 clean
 	$(MAKE) -C v4.7 clean
+	$(MAKE) -C v4.7.1 clean
 	$(MAKE) -C mono clean
 
 .PHONY: all clean

external/binary-reference-assemblies/README.md

@@ -1,3 +1,28 @@
-Mono binary reference assemblies repository.
+Mono binary reference assemblies
+================================
 
 Built using csc 2.1.0.
+
+Adding a new .NET profile
+-------------------------
+
+Use the following steps (we're using 4.7.1 as example):
+
+1. Copy existing `v4.7/Makefile` and `src/v4.7/*` to new folders and commit
+2. Update `PROFILE` variable in `v4.7.1/Makefile`
+3. Wire up new profile in `Makefile` in repo root
+4. Run the generation script `./generate-refasm-sources.sh v4.7.1 some/path/to/netfx/referenceassemblies`
+5. Revert deletion of `*.extra.cs`
+6. Revert changes that remove `#if / #endif`
+7. Revert suspicious changes to:
+    - `Accessibility.cs` (bug in GenApi)
+    - `Microsoft.VisualBasic.cs` (bug in GenApi and wrong AssemblyCopyright/Product attribute)
+    - `Microsoft.VisualC.cs` (bug in GenApi)
+    - `System.Data.Linq.cs` (bug in GenApi)
+    - `System.Deployment.cs` (we only have stub assemblies)
+    - `System.Runtime.DurableInstancing.cs` (bug in GenApi)
+    - `System.Security.cs` (bug in GenApi)
+    - `System.Web.Mobile.cs` (we only have stub assemblies)
+    - `System.Workflow.*.cs` (we only have stub assemblies)
+8. Add new assemblies/facades to `v4.7.1/Makefile`
+9. Run `make -C v4.7.1` and ensure everything compiles

external/binary-reference-assemblies/build/monodroid/System.Core.dll.REMOVED.git-id

@@ -0,0 +1 @@
+b7d5412e62d6c806925f45ce5333cfc86dd77d86

external/binary-reference-assemblies/build/monodroid/System.dll.REMOVED.git-id

@@ -0,0 +1 @@
+e0ad6056d5db3df5d135a154b1b4008b6e6157b9

external/binary-reference-assemblies/build/monodroid/mscorlib.dll.REMOVED.git-id

@@ -0,0 +1 @@
+aee20813f648653163f86ec38e8c8b07ab1e55bb

external/binary-reference-assemblies/build/monotouch/System.Core.dll.REMOVED.git-id

@@ -0,0 +1 @@
+ccbd12b051399f2f8e07bd15fef473c0e2479e5d

external/binary-reference-assemblies/build/monotouch/System.dll.REMOVED.git-id

@@ -0,0 +1 @@
+fc992f59d8a96ed747a04e484fe6a08cc23b8f2b

external/binary-reference-assemblies/build/monotouch/mscorlib.dll.REMOVED.git-id

@@ -0,0 +1 @@
+68b2f6d06b515d8cb9e48c7470402595924d35cf

external/binary-reference-assemblies/generate-refasm-sources.sh

@@ -0,0 +1,33 @@
+#!/bin/bash -e
+
+REPODIR=$( cd "$(dirname "${BASH_SOURCE[0]}")" && pwd )
+NETFXPROFILE=$1
+NETFXSOURCE=$( cd "$2" && pwd )
+
+if [ "x$NETFXPROFILE" = "x" ]; then echo "No profile specified."; exit 1; fi
+if [ ! -d "$NETFXSOURCE" ]; then echo "Reference assemblies folder doesn't exist."; exit 1; fi
+
+rm -f "$REPODIR/src/$NETFXPROFILE"/*.cs
+rm -f "$REPODIR/src/$NETFXPROFILE/Facades"/*.cs
+
+cd "$NETFXSOURCE"
+for i in *.dll Facades/*.dll; do
+    if [ "$i" = "System.EnterpriseServices.Thunk.dll" ] || [ "$i" = "System.EnterpriseServices.Wrapper.dll" ]; then continue; fi;
+
+    outpath="$REPODIR/src/$NETFXPROFILE"
+    if [[ "$i" = "Facades"* ]]; then outpath="$outpath/Facades"; fi
+
+    echo "Processing $i"
+    mono "$REPODIR/../api-snapshot/tools/genapi/GenAPI.exe" -assembly:"$i" -out:"$outpath" -typeforwardedTo -assemblyVersion -assemblyAttributes -headerFile:"$REPODIR/../api-snapshot/profiles/license-header.txt" -libPath:"$NETFXSOURCE"
+done
+
+cd "$REPODIR/src/$NETFXPROFILE"
+for i in *.cs Facades/*.cs; do sed -i "" 's/AssemblyCompanyAttribute("Microsoft Corporation")/AssemblyCompanyAttribute("Mono development team")/g' "$i"; done
+for i in *.cs Facades/*.cs; do sed -i "" 's/AssemblyCopyrightAttribute("© Microsoft Corporation.  All rights reserved.")/AssemblyCopyrightAttribute("(c) Various Mono authors")/g' "$i"; done
+for i in *.cs Facades/*.cs; do sed -i "" 's/AssemblyProductAttribute("Microsoft® .NET Framework")/AssemblyProductAttribute("Mono Common Language Infrastructure")/g' "$i"; done
+for i in *.cs Facades/*.cs; do sed -i "" '/.*AssemblySignatureKeyAttribute(.*]/d' "$i"; done
+for i in *.cs Facades/*.cs; do sed -i "" '/.*InternalsVisibleToAttribute(.*]/d' "$i"; done
+for i in *.cs Facades/*.cs; do sed -i "" '/.*DependencyAttribute(.*]/d' "$i"; done
+
+# remove assembly that we don't have in Mono
+rm ISymWrapper.cs Microsoft.Activities.Build.cs Microsoft.Build.Conversion.v4.0.cs Microsoft.JScript.cs Microsoft.VisualBasic.Compatibility.cs Microsoft.VisualBasic.Compatibility.Data.cs Microsoft.VisualC.STLCLR.cs PresentationBuildTasks.cs PresentationCore.cs PresentationFramework.Aero.cs PresentationFramework.Aero2.cs PresentationFramework.AeroLite.cs PresentationFramework.Classic.cs PresentationFramework.cs PresentationFramework.Luna.cs PresentationFramework.Royale.cs ReachFramework.cs sysglobl.cs System.Activities.Core.Presentation.cs System.Activities.cs System.Activities.DurableInstancing.cs System.Activities.Presentation.cs System.AddIn.Contract.cs System.AddIn.cs System.ComponentModel.Composition.Registration.cs System.Data.Entity.Design.cs System.Data.Services.Design.cs System.Data.SqlXml.cs System.Device.cs System.DirectoryServices.AccountManagement.cs System.IdentityModel.Services.cs System.IO.Log.cs System.Management.Instrumentation.cs System.Printing.cs System.ServiceModel.Activities.cs System.ServiceModel.Channels.cs System.Speech.cs System.Web.DataVisualization.cs System.Web.DataVisualization.Design.cs System.Web.DynamicData.Design.cs System.Web.Entity.cs System.Web.Entity.Design.cs System.Windows.Controls.Ribbon.cs System.Windows.Forms.DataVisualization.Design.cs System.Windows.Input.Manipulations.cs System.Windows.Presentation.cs System.WorkflowServices.cs UIAutomationClient.cs UIAutomationClientsideProviders.cs UIAutomationProvider.cs UIAutomationTypes.cs WindowsFormsIntegration.cs XamlBuildTask.cs

external/binary-reference-assemblies/mono/Makefile

@@ -1,19 +1,25 @@
 PROFILE := mono
 SOURCEDIR := ../src/$(PROFILE)/
-BCL_PROFILE := ../v4.7/
+BCL_PROFILE := ../v4.6/
 
 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))))