[xbuild] Add net_4.6.xml/net_4.6.1.xml and wire through xbuild

Commented the entries in ToolLocationHelper, they could be misunderstood since the 4.0/4.5/4.6 entries are all the same.

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs
index df09e1c8ec3abf2b7a8d939245646c51555e47ca..5a050e1a4aa8f5d30c680767a3ddee0020b6465a 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs
@@ -48,11 +48,12 @@ namespace Microsoft.Build.Utilities
                Version451,
 #endif
 #if XBUILD_14
-               Version453,
+               Version46,
+               Version461,
 #endif
 
 #if XBUILD_14
-               VersionLatest = Version453
+               VersionLatest = Version461
 #elif XBUILD_12
                VersionLatest = Version451
 #else

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
index 64ed0757a90fd04d1047d4af9ae78bd361c102f2..8806c73e72d08ba7d1f1068ba3e2bbda0a34032d 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
@@ -61,41 +61,44 @@ namespace Microsoft.Build.Utilities
                        runningOnDotNet = !string.IsNullOrEmpty (windowsPath) && lib_mono_dir.StartsWith (windowsPath);
 
                        if (Environment.GetEnvironmentVariable ("TESTING_MONO") != null) {
-                               mono_dir = new string [] {
-                                       Path.Combine (lib_mono_dir, "net_1_0"),
-                                       Path.Combine (lib_mono_dir, "net_2_0"),
-                                       Path.Combine (lib_mono_dir, "net_2_0"),
-                                       Path.Combine (lib_mono_dir, "net_3_5"),
+                               mono_dir = new string [] {                   // TargetDotNetFrameworkVersion:
+                                       Path.Combine (lib_mono_dir, "net_1_0"),  // Version11
+                                       Path.Combine (lib_mono_dir, "net_2_0"),  // Version20
+                                       Path.Combine (lib_mono_dir, "net_2_0"),  // Version30
+                                       Path.Combine (lib_mono_dir, "net_3_5"),  // Version35
                                        // mono's 4.0 is not an actual framework directory with all tools etc
                                        // it's simply reference assemblies. So like .NET we consider 4.5 to
                                        // be a complete replacement for 4.0.
-                                       Path.Combine (lib_mono_dir, "net_4_x"),
-                                       Path.Combine (lib_mono_dir, "net_4_x"),
-                                       Path.Combine (lib_mono_dir, "net_4_x"),
-                                       Path.Combine (lib_mono_dir, "net_4_x")                                  
+                                       Path.Combine (lib_mono_dir, "net_4_x"),  // Version40
+                                       Path.Combine (lib_mono_dir, "net_4_x"),  // Version45
+                                       Path.Combine (lib_mono_dir, "net_4_x"),  // Version451
+                                       Path.Combine (lib_mono_dir, "net_4_x"),  // Version46
+                                       Path.Combine (lib_mono_dir, "net_4_x"),  // Version461
                                };      
                        } else if (runningOnDotNet) {
                                mono_dir = new string [] {
-                                       Path.Combine (lib_mono_dir, "v1.0.3705"),
-                                       Path.Combine (lib_mono_dir, "v2.0.50727"),
-                                       Path.Combine (lib_mono_dir, "v2.0.50727"),
-                                       Path.Combine (lib_mono_dir, "v3.5"),
-                                       Path.Combine (lib_mono_dir, "v4.0.30319"),
-                                       Path.Combine (lib_mono_dir, "v4.0.30319"),
-                                       Path.Combine (lib_mono_dir, "v4.0.30319"),
-                                       Path.Combine (lib_mono_dir, "v4.0.30319")                                       
+                                       Path.Combine (lib_mono_dir, "v1.0.3705"),   // Version11
+                                       Path.Combine (lib_mono_dir, "v2.0.50727"),  // Version20
+                                       Path.Combine (lib_mono_dir, "v2.0.50727"),  // Version30
+                                       Path.Combine (lib_mono_dir, "v3.5"),        // Version35
+                                       Path.Combine (lib_mono_dir, "v4.0.30319"),  // Version40
+                                       Path.Combine (lib_mono_dir, "v4.0.30319"),  // Version45
+                                       Path.Combine (lib_mono_dir, "v4.0.30319"),  // Version451
+                                       Path.Combine (lib_mono_dir, "v4.0.30319"),  // Version46
+                                       Path.Combine (lib_mono_dir, "v4.0.30319"),  // Version461
                                };
                        } else {
                                mono_dir = new string [] {
-                                       Path.Combine (lib_mono_dir, "1.0"),
-                                       Path.Combine (lib_mono_dir, "2.0"),
-                                       Path.Combine (lib_mono_dir, "2.0"),
-                                       Path.Combine (lib_mono_dir, "3.5"),
+                                       Path.Combine (lib_mono_dir, "1.0"),  // Version11
+                                       Path.Combine (lib_mono_dir, "2.0"),  // Version20
+                                       Path.Combine (lib_mono_dir, "2.0"),  // Version30
+                                       Path.Combine (lib_mono_dir, "3.5"),  // Version35
                                        // see comment above regarding 4.0/4.5
-                                       Path.Combine (lib_mono_dir, "4.5"),
-                                       Path.Combine (lib_mono_dir, "4.5"),
-                                       Path.Combine (lib_mono_dir, "4.5"),
-                                       Path.Combine (lib_mono_dir, "4.5")
+                                       Path.Combine (lib_mono_dir, "4.5"),  // Version40
+                                       Path.Combine (lib_mono_dir, "4.5"),  // Version45
+                                       Path.Combine (lib_mono_dir, "4.5"),  // Version451
+                                       Path.Combine (lib_mono_dir, "4.5"),  // Version46
+                                       Path.Combine (lib_mono_dir, "4.5"),  // Version461
                                };
                        }
 

diff --git a/mcs/tools/xbuild/Makefile b/mcs/tools/xbuild/Makefile
index 5575d4461fccba102de1a5c1cb171674be112b65..383d2f53057a1026fa4623b8614934a2fe79bd24 100644 (file)
--- a/mcs/tools/xbuild/Makefile
+++ b/mcs/tools/xbuild/Makefile
@@ -55,6 +55,10 @@ install-frameworks:
        $(INSTALL_DATA) frameworks/net_4.5.1.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.5.1/RedistList/FrameworkList.xml
        $(MKINSTALLDIRS) $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.5.2/RedistList
        $(INSTALL_DATA) frameworks/net_4.5.2.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.5.2/RedistList/FrameworkList.xml
+       $(MKINSTALLDIRS) $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.6/RedistList
+       $(INSTALL_DATA) frameworks/net_4.6.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.6/RedistList/FrameworkList.xml
+       $(MKINSTALLDIRS) $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.6.1/RedistList
+       $(INSTALL_DATA) frameworks/net_4.6.1.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.6.1/RedistList/FrameworkList.xml
 
 install-pcl-targets:
        $(MKINSTALLDIRS) $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.0
@@ -110,6 +114,8 @@ EXTRA_DISTFILES = \
        frameworks/net_4.5.xml \
        frameworks/net_4.5.1.xml \
        frameworks/net_4.5.2.xml \
+       frameworks/net_4.6.xml \
+       frameworks/net_4.6.1.xml \
        targets/Microsoft.Portable.CSharp_4.0.targets \
        targets/Microsoft.Portable.CSharp_4.5.targets \
        targets/Microsoft.Portable.VisualBasic_4.0.targets \

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

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