diff options
author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-11-09 16:28:22 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-09 16:28:22 +0300 |
commit | 4b80cb686137fd2433487378977363a169a47784 (patch) | |
tree | 48efd0e1f94b10c4108665363e01479a8b996456 /mcs | |
parent | e45d72f4a8f3ab5f4e322045bbd2e4907e5a4535 (diff) |
[bcl] Add .NET 4.7.1 reference assemblies (#5974)
Diffstat (limited to 'mcs')
-rw-r--r-- | mcs/class/reference-assemblies/Makefile | 9 | ||||
-rw-r--r-- | mcs/mcs/ikvm.cs | 1 | ||||
-rw-r--r-- | mcs/tools/xbuild/Makefile | 3 | ||||
-rw-r--r-- | mcs/tools/xbuild/frameworks/net_4.7.1.xml | 3 |
4 files changed, 16 insertions, 0 deletions
diff --git a/mcs/class/reference-assemblies/Makefile b/mcs/class/reference-assemblies/Makefile index 405235b8d6f..d8f99734d2f 100644 --- a/mcs/class/reference-assemblies/Makefile +++ b/mcs/class/reference-assemblies/Makefile @@ -27,6 +27,7 @@ install-local: $(MKINSTALLDIRS) $(PROFILE_DIR)/4.6.1-api/Facades $(MKINSTALLDIRS) $(PROFILE_DIR)/4.6.2-api/Facades $(MKINSTALLDIRS) $(PROFILE_DIR)/4.7-api/Facades + $(MKINSTALLDIRS) $(PROFILE_DIR)/4.7.1-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 @@ -38,6 +39,7 @@ install-local: $(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.7.1/*.dll $(PROFILE_DIR)/4.7.1-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 @@ -46,6 +48,7 @@ install-local: $(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 + $(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.7.1/Facades/*.dll $(PROFILE_DIR)/4.7.1-api/Facades $(INSTALL_LIB) ../../../external/binary-reference-assemblies/mono/*.dll $(PROFILE_DIR)/2.0-api $(INSTALL_LIB) ../../../external/binary-reference-assemblies/mono/*.dll $(PROFILE_DIR)/4.0-api @@ -56,6 +59,7 @@ install-local: $(INSTALL_LIB) ../../../external/binary-reference-assemblies/mono/*.dll $(PROFILE_DIR)/4.6.1-api $(INSTALL_LIB) ../../../external/binary-reference-assemblies/mono/*.dll $(PROFILE_DIR)/4.6.2-api $(INSTALL_LIB) ../../../external/binary-reference-assemblies/mono/*.dll $(PROFILE_DIR)/4.7-api + $(INSTALL_LIB) ../../../external/binary-reference-assemblies/mono/*.dll $(PROFILE_DIR)/4.7.1-api # 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. @@ -65,6 +69,7 @@ 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.1/Facades/*.dll) \ $(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) \ @@ -72,6 +77,7 @@ DISTFILES = \ $(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.1/*.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) \ @@ -83,6 +89,7 @@ DISTFILES = \ $(wildcard ../../../external/binary-reference-assemblies/v3.5/*.dll) \ $(wildcard ../../../external/binary-reference-assemblies/v2.0/*.dll) \ $(wildcard ../../../external/binary-reference-assemblies/mono/*.dll) \ + $(wildcard ../../../external/binary-reference-assemblies/src/v4.7.1/Facades/*.cs) \ $(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) \ @@ -90,6 +97,7 @@ DISTFILES = \ $(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.1/*.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) \ @@ -101,6 +109,7 @@ DISTFILES = \ $(wildcard ../../../external/binary-reference-assemblies/src/v3.5/*.cs) \ $(wildcard ../../../external/binary-reference-assemblies/src/v2.0/*.cs) \ $(wildcard ../../../external/binary-reference-assemblies/src/mono/*.cs) \ + ../../../external/binary-reference-assemblies/v4.7.1/Makefile \ ../../../external/binary-reference-assemblies/v4.7/Makefile \ ../../../external/binary-reference-assemblies/v4.6.2/Makefile \ ../../../external/binary-reference-assemblies/v4.6.1/Makefile \ diff --git a/mcs/mcs/ikvm.cs b/mcs/mcs/ikvm.cs index a2e49f07f70..410104dfecd 100644 --- a/mcs/mcs/ikvm.cs +++ b/mcs/mcs/ikvm.cs @@ -255,6 +255,7 @@ namespace Mono.CSharp 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.7.1", new string [] { "4.7.1-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 20268929bff..61564fd61eb 100644 --- a/mcs/tools/xbuild/Makefile +++ b/mcs/tools/xbuild/Makefile @@ -78,6 +78,8 @@ install-frameworks: $(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 + $(MKINSTALLDIRS) $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.7.1/RedistList + $(INSTALL_DATA) frameworks/net_4.7.1.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.7.1/RedistList/FrameworkList.xml install-pcl-targets: $(MKINSTALLDIRS) $(DESTDIR)$(PORTABLE_TARGETS_DIR) @@ -182,6 +184,7 @@ EXTRA_DISTFILES = \ frameworks/net_4.6.1.xml \ frameworks/net_4.6.2.xml \ frameworks/net_4.7.xml \ + frameworks/net_4.7.1.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.1.xml b/mcs/tools/xbuild/frameworks/net_4.7.1.xml new file mode 100644 index 00000000000..7f708775b09 --- /dev/null +++ b/mcs/tools/xbuild/frameworks/net_4.7.1.xml @@ -0,0 +1,3 @@ +<?xml version="1.0" encoding="utf-8"?> +<FileList Name=".NET Framework 4.7.1" TargetFrameworkDirectory="..\..\..\..\4.7.1-api"> +</FileList> |