diff options
author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-01-28 17:16:46 +0300 |
---|---|---|
committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-01-28 17:18:18 +0300 |
commit | 88b287f06584a6284face60accb94d000b1c6ce7 (patch) | |
tree | 2afabf6b7876688c8a929bcf0ae980f46572472a | |
parent | 81d2d4cfe878ee1b7534e36398a45dd9911e8595 (diff) |
[xbuild] Use -api folder for 2.0/3.5/4.0 profiles as well
Similar to e2a79ed88800493cb0444445a176d9c7febbfabe. Those profiles are only contract/reference assemblies since Mono 4.0.
-rw-r--r-- | mcs/class/reference-assemblies/Makefile | 12 | ||||
-rw-r--r-- | mcs/tools/xbuild/frameworks/net_2.0.xml | 2 | ||||
-rw-r--r-- | mcs/tools/xbuild/frameworks/net_3.0.xml | 2 | ||||
-rw-r--r-- | mcs/tools/xbuild/frameworks/net_3.5.xml | 2 | ||||
-rw-r--r-- | mcs/tools/xbuild/frameworks/net_4.0.xml | 2 | ||||
-rw-r--r-- | mcs/tools/xbuild/frameworks/net_4.0_client.xml | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/mcs/class/reference-assemblies/Makefile b/mcs/class/reference-assemblies/Makefile index dc8c9988fc9..20ff20005ca 100644 --- a/mcs/class/reference-assemblies/Makefile +++ b/mcs/class/reference-assemblies/Makefile @@ -7,13 +7,13 @@ all-local: PROFILE_DIR=$(DESTDIR)$(mono_libdir)/mono install-local: - $(MKINSTALLDIRS) $(PROFILE_DIR)/2.0 - $(MKINSTALLDIRS) $(PROFILE_DIR)/3.5 - $(MKINSTALLDIRS) $(PROFILE_DIR)/4.0 + $(MKINSTALLDIRS) $(PROFILE_DIR)/2.0-api + $(MKINSTALLDIRS) $(PROFILE_DIR)/3.5-api + $(MKINSTALLDIRS) $(PROFILE_DIR)/4.0-api $(MKINSTALLDIRS) $(PROFILE_DIR)/4.5-api - $(INSTALL_LIB) ../../../external/binary-reference-assemblies/v2.0/* $(PROFILE_DIR)/2.0 - $(INSTALL_LIB) ../../../external/binary-reference-assemblies/v3.5/* $(PROFILE_DIR)/3.5 - $(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.0/* $(PROFILE_DIR)/4.0 + $(INSTALL_LIB) ../../../external/binary-reference-assemblies/v2.0/* $(PROFILE_DIR)/2.0-api + $(INSTALL_LIB) ../../../external/binary-reference-assemblies/v3.5/* $(PROFILE_DIR)/3.5-api + $(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.0/* $(PROFILE_DIR)/4.0-api $(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.5/* $(PROFILE_DIR)/4.5-api DISTFILES = $(wildcard ../../../external/binary-reference-assemblies/v4.5/*) $(wildcard ../../../external/binary-reference-assemblies/v4.0/*) $(wildcard ../../../external/binary-reference-assemblies/v3.5/*) $(wildcard ../../../external/binary-reference-assemblies/v2.0/*) Makefile diff --git a/mcs/tools/xbuild/frameworks/net_2.0.xml b/mcs/tools/xbuild/frameworks/net_2.0.xml index 2b8bd9b1dff..4265fcc50ee 100644 --- a/mcs/tools/xbuild/frameworks/net_2.0.xml +++ b/mcs/tools/xbuild/frameworks/net_2.0.xml @@ -1,3 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<FileList Name=".NET Framework 2.0" TargetFrameworkDirectory="..\..\..\..\2.0"> +<FileList Name=".NET Framework 2.0" TargetFrameworkDirectory="..\..\..\..\2.0-api"> </FileList> diff --git a/mcs/tools/xbuild/frameworks/net_3.0.xml b/mcs/tools/xbuild/frameworks/net_3.0.xml index ae06c8818c1..1a56750d51b 100644 --- a/mcs/tools/xbuild/frameworks/net_3.0.xml +++ b/mcs/tools/xbuild/frameworks/net_3.0.xml @@ -1,3 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<FileList Name=".NET Framework 3.0" TargetFrameworkDirectory="..\..\..\..\2.0"> +<FileList Name=".NET Framework 3.0" TargetFrameworkDirectory="..\..\..\..\2.0-api"> </FileList> diff --git a/mcs/tools/xbuild/frameworks/net_3.5.xml b/mcs/tools/xbuild/frameworks/net_3.5.xml index 122584299a1..3e711014768 100644 --- a/mcs/tools/xbuild/frameworks/net_3.5.xml +++ b/mcs/tools/xbuild/frameworks/net_3.5.xml @@ -1,3 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<FileList Name=".NET Framework 3.5" TargetFrameworkDirectory="..\..\..\..\3.5" IncludeFramework="v3.0"> +<FileList Name=".NET Framework 3.5" TargetFrameworkDirectory="..\..\..\..\3.5-api" IncludeFramework="v3.0"> </FileList> diff --git a/mcs/tools/xbuild/frameworks/net_4.0.xml b/mcs/tools/xbuild/frameworks/net_4.0.xml index 701279497fd..841cc536e62 100644 --- a/mcs/tools/xbuild/frameworks/net_4.0.xml +++ b/mcs/tools/xbuild/frameworks/net_4.0.xml @@ -1,3 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<FileList Name=".NET Framework 4" TargetFrameworkDirectory="..\..\..\..\4.0"> +<FileList Name=".NET Framework 4" TargetFrameworkDirectory="..\..\..\..\4.0-api"> </FileList> diff --git a/mcs/tools/xbuild/frameworks/net_4.0_client.xml b/mcs/tools/xbuild/frameworks/net_4.0_client.xml index 951933a2f9a..d3fd85ccc0b 100644 --- a/mcs/tools/xbuild/frameworks/net_4.0_client.xml +++ b/mcs/tools/xbuild/frameworks/net_4.0_client.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<FileList Name=".NET Framework 4 Client Profile" TargetFrameworkDirectory="..\..\..\..\..\..\4.0"> +<FileList Name=".NET Framework 4 Client Profile" TargetFrameworkDirectory="..\..\..\..\..\..\4.0-api"> <File AssemblyName="System" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" /> <File AssemblyName="System.Activities" Version="4.0.0.0" PublicKeyToken="31bf3856ad364e35" /> <File AssemblyName="System.Dynamic" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" /> |