[bcl] Add .NET 4.7 reference assemblies (#4791)

diff --git a/external/binary-reference-assemblies b/external/binary-reference-assemblies
index febc100f0313f0dc9d75dd1bcea45e87134b5b55..142cbeb62ffabf1dd9c1414d8dd76f93bcbed0c2 160000 (submodule)
--- a/external/binary-reference-assemblies
+++ b/external/binary-reference-assemblies
@@ -1 +1 @@
-Subproject commit febc100f0313f0dc9d75dd1bcea45e87134b5b55
+Subproject commit 142cbeb62ffabf1dd9c1414d8dd76f93bcbed0c2

diff --git a/mcs/class/reference-assemblies/Makefile b/mcs/class/reference-assemblies/Makefile
index 425a983215473970ab5484bc9602437ff53b41fb..9871a3a8ad785d4ac9c359cf1fa99fc93c3c728f 100644 (file)
--- a/mcs/class/reference-assemblies/Makefile
+++ b/mcs/class/reference-assemblies/Makefile
@@ -19,12 +19,14 @@ install-local:
        $(MKINSTALLDIRS) $(PROFILE_DIR)/4.6-api
        $(MKINSTALLDIRS) $(PROFILE_DIR)/4.6.1-api
        $(MKINSTALLDIRS) $(PROFILE_DIR)/4.6.2-api
+       $(MKINSTALLDIRS) $(PROFILE_DIR)/4.7-api
        $(MKINSTALLDIRS) $(PROFILE_DIR)/4.5-api/Facades
        $(MKINSTALLDIRS) $(PROFILE_DIR)/4.5.1-api/Facades
        $(MKINSTALLDIRS) $(PROFILE_DIR)/4.5.2-api/Facades
        $(MKINSTALLDIRS) $(PROFILE_DIR)/4.6-api/Facades
        $(MKINSTALLDIRS) $(PROFILE_DIR)/4.6.1-api/Facades
        $(MKINSTALLDIRS) $(PROFILE_DIR)/4.6.2-api/Facades
+       $(MKINSTALLDIRS) $(PROFILE_DIR)/4.7-api/Facades
 
        $(INSTALL_LIB) ../../../external/binary-reference-assemblies/v2.0/*.dll $(PROFILE_DIR)/2.0-api
        $(INSTALL_LIB) ../../../external/binary-reference-assemblies/v3.5/*.dll $(PROFILE_DIR)/3.5-api
@@ -35,12 +37,14 @@ install-local:
        $(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.6/*.dll $(PROFILE_DIR)/4.6-api
        $(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.6.1/*.dll $(PROFILE_DIR)/4.6.1-api
        $(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.6.2/*.dll $(PROFILE_DIR)/4.6.2-api
+       $(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.7/*.dll $(PROFILE_DIR)/4.7-api
        $(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.5/Facades/*.dll $(PROFILE_DIR)/4.5-api/Facades
        $(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.5.1/Facades/*.dll $(PROFILE_DIR)/4.5.1-api/Facades
        $(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.5.2/Facades/*.dll $(PROFILE_DIR)/4.5.2-api/Facades
        $(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.6/Facades/*.dll $(PROFILE_DIR)/4.6-api/Facades
        $(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.6.1/Facades/*.dll $(PROFILE_DIR)/4.6.1-api/Facades
        $(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.6.2/Facades/*.dll $(PROFILE_DIR)/4.6.2-api/Facades
+       $(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.7/Facades/*.dll $(PROFILE_DIR)/4.7-api/Facades
 
        # Unfortunately, a few programs (most notably NUnit and FSharp) have hardcoded checks for <prefix>/lib/mono/4.0/mscorlib.dll or Mono.Posix.dll,
        # so we need to place something there or those tools break. We decided to symlink to the reference assembly for now.
@@ -50,12 +54,14 @@ install-local:
        ln -sf ../4.0-api/Mono.Posix.dll $(PROFILE_DIR)/4.0/Mono.Posix.dll
 
 DISTFILES =    \
+       $(wildcard ../../../external/binary-reference-assemblies/v4.7/Facades/*.dll)    \
        $(wildcard ../../../external/binary-reference-assemblies/v4.6.2/Facades/*.dll)  \
        $(wildcard ../../../external/binary-reference-assemblies/v4.6.1/Facades/*.dll)  \
        $(wildcard ../../../external/binary-reference-assemblies/v4.6/Facades/*.dll)    \
        $(wildcard ../../../external/binary-reference-assemblies/v4.5.2/Facades/*.dll)  \
        $(wildcard ../../../external/binary-reference-assemblies/v4.5.1/Facades/*.dll)  \
        $(wildcard ../../../external/binary-reference-assemblies/v4.5/Facades/*.dll)    \
+       $(wildcard ../../../external/binary-reference-assemblies/v4.7/*.dll)    \
        $(wildcard ../../../external/binary-reference-assemblies/v4.6.2/*.dll)  \
        $(wildcard ../../../external/binary-reference-assemblies/v4.6.1/*.dll)  \
        $(wildcard ../../../external/binary-reference-assemblies/v4.6/*.dll)    \
@@ -65,12 +71,14 @@ DISTFILES = \
        $(wildcard ../../../external/binary-reference-assemblies/v4.0/*.dll)    \
        $(wildcard ../../../external/binary-reference-assemblies/v3.5/*.dll)    \
        $(wildcard ../../../external/binary-reference-assemblies/v2.0/*.dll)    \
+       $(wildcard ../../../external/binary-reference-assemblies/src/v4.7/Facades/*.cs) \
        $(wildcard ../../../external/binary-reference-assemblies/src/v4.6.2/Facades/*.cs)       \
        $(wildcard ../../../external/binary-reference-assemblies/src/v4.6.1/Facades/*.cs)       \
        $(wildcard ../../../external/binary-reference-assemblies/src/v4.6/Facades/*.cs) \
        $(wildcard ../../../external/binary-reference-assemblies/src/v4.5.2/Facades/*.cs)       \
        $(wildcard ../../../external/binary-reference-assemblies/src/v4.5.1/Facades/*.cs)       \
        $(wildcard ../../../external/binary-reference-assemblies/src/v4.5/Facades/*.cs) \
+       $(wildcard ../../../external/binary-reference-assemblies/src/v4.7/*.cs) \
        $(wildcard ../../../external/binary-reference-assemblies/src/v4.6.2/*.cs)       \
        $(wildcard ../../../external/binary-reference-assemblies/src/v4.6.1/*.cs)       \
        $(wildcard ../../../external/binary-reference-assemblies/src/v4.6/*.cs) \
@@ -80,6 +88,7 @@ DISTFILES =   \
        $(wildcard ../../../external/binary-reference-assemblies/src/v4.0/*.cs) \
        $(wildcard ../../../external/binary-reference-assemblies/src/v3.5/*.cs) \
        $(wildcard ../../../external/binary-reference-assemblies/src/v2.0/*.cs) \
+       ../../../external/binary-reference-assemblies/v4.7/Makefile     \
        ../../../external/binary-reference-assemblies/v4.6.2/Makefile   \
        ../../../external/binary-reference-assemblies/v4.6.1/Makefile   \
        ../../../external/binary-reference-assemblies/v4.6/Makefile     \

diff --git a/mcs/mcs/ikvm.cs b/mcs/mcs/ikvm.cs
index 1243712f160dac5db9e9b50b7c6057cf385d6f11..62f671e1d101720421a10270a7dbcc929e0752c1 100644 (file)
--- a/mcs/mcs/ikvm.cs
+++ b/mcs/mcs/ikvm.cs
@@ -254,6 +254,7 @@ namespace Mono.CSharp
                        sdk_directory.Add ("4.6", new string[] { "4.6-api", "v4.0.30319" });
                        sdk_directory.Add ("4.6.1", new string[] { "4.6.1-api", "v4.0.30319" });
                        sdk_directory.Add ("4.6.2", new string [] { "4.6.2-api", "v4.0.30319" });
+                       sdk_directory.Add ("4.7", new string [] { "4.7-api", "v4.0.30319" });
                        sdk_directory.Add ("4.x", new string [] { "4.5", "net_4_x", "v4.0.30319" });
                }
 

diff --git a/mcs/tools/xbuild/Makefile b/mcs/tools/xbuild/Makefile
index e02eaf6cc7fc28d39f4a4744f033aa234fc5151d..16f94f2fd610736c885e5dd74c6dd8d383748fe9 100644 (file)
--- a/mcs/tools/xbuild/Makefile
+++ b/mcs/tools/xbuild/Makefile
@@ -79,6 +79,8 @@ install-frameworks:
        $(INSTALL_DATA) frameworks/net_4.6.1.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.6.1/RedistList/FrameworkList.xml
        $(MKINSTALLDIRS) $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.6.2/RedistList
        $(INSTALL_DATA) frameworks/net_4.6.2.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.6.2/RedistList/FrameworkList.xml
+       $(MKINSTALLDIRS) $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.7/RedistList
+       $(INSTALL_DATA) frameworks/net_4.7.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.7/RedistList/FrameworkList.xml
 
 install-pcl-targets:
        $(MKINSTALLDIRS) $(DESTDIR)$(PORTABLE_TARGETS_DIR)
@@ -183,6 +185,7 @@ EXTRA_DISTFILES = \
        frameworks/net_4.6.xml \
        frameworks/net_4.6.1.xml \
        frameworks/net_4.6.2.xml \
+       frameworks/net_4.7.xml \
        targets/Microsoft.WebApplication.targets        \
        $(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportBefore.props       \
        $(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportAfter.targets      \

diff --git a/mcs/tools/xbuild/frameworks/net_4.7.xml b/mcs/tools/xbuild/frameworks/net_4.7.xml
new file mode 100644 (file)
index 0000000..6ea6b72
--- /dev/null
+++ b/mcs/tools/xbuild/frameworks/net_4.7.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FileList  Name=".NET Framework 4.7" TargetFrameworkDirectory="..\..\..\..\4.7-api">
+</FileList>