[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.

diff --git a/mcs/class/reference-assemblies/Makefile b/mcs/class/reference-assemblies/Makefile
index dc8c9988fc9806af9758442e2c97f7212a8fc195..20ff20005ca26dfb4f401507a668576c6e272ddb 100644 (file)
--- 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 2b8bd9b1dffab9fa267d62d902b1528f0c9e8bad..4265fcc50eec30722cc89c188fbc3a385fb36c63 100644 (file)
--- 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 ae06c8818c18311bfa4c78574226f76dd999ddc3..1a56750d51be7397e750d64a1742ff50f864f84b 100644 (file)
--- 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 122584299a150f0c8f117e8ab623e6c3e77b38d0..3e711014768de26feee0d35d693acc69d6476069 100644 (file)
--- 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 701279497fd190e4ab0bb1badcb61156d3635106..841cc536e62f4f70dfed6e982d1afab1ed61e991 100644 (file)
--- 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 951933a2f9a8a0bb6f11832be45904b6725cb5c8..d3fd85ccc0b005988a1f8d402d37bf3c47ab8d6b 100644 (file)
--- 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" />