From d7be7eb74899293143cd59b77ca5cc59172ad182 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Sat, 4 Feb 2017 16:48:56 +0100
Subject: [PATCH] [xbuild] Add .NET 4.6.2 entries and frameworklist.xml (#4326)

---
 .../Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs | 3 ++-
 .../Microsoft.Build.Utilities/ToolLocationHelper.cs           | 3 +++
 mcs/tools/xbuild/Makefile                                     | 3 +++
 mcs/tools/xbuild/data/14.0/Microsoft.Common.targets           | 4 ++--
 mcs/tools/xbuild/frameworks/net_4.6.2.xml                     | 3 +++
 5 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 mcs/tools/xbuild/frameworks/net_4.6.2.xml

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 5a050e1a4aa..26a8216ad12 100644
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs
@@ -50,10 +50,11 @@ namespace Microsoft.Build.Utilities
 #if XBUILD_14
 		Version46,
 		Version461,
+		Version462,
 #endif
 
 #if XBUILD_14
-		VersionLatest = Version461
+		VersionLatest = Version462
 #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 37cf0d5fa88..42b7da6f231 100644
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
@@ -74,6 +74,7 @@ namespace Microsoft.Build.Utilities
 					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
+					Path.Combine (lib_mono_dir, "net_4_x"),  // Version462
 				};	
 			} else if (runningOnDotNet) {
 				mono_dir = new string [] {
@@ -86,6 +87,7 @@ namespace Microsoft.Build.Utilities
 					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
+					Path.Combine (lib_mono_dir, "v4.0.30319"),  // Version462
 				};
 			} else {
 				mono_dir = new string [] {
@@ -99,6 +101,7 @@ namespace Microsoft.Build.Utilities
 					Path.Combine (lib_mono_dir, "4.5"),  // Version451
 					Path.Combine (lib_mono_dir, "4.5"),  // Version46
 					Path.Combine (lib_mono_dir, "4.5"),  // Version461
+					Path.Combine (lib_mono_dir, "4.5"),  // Version462
 				};
 			}
 
diff --git a/mcs/tools/xbuild/Makefile b/mcs/tools/xbuild/Makefile
index ca06717b19b..841528dc934 100644
--- a/mcs/tools/xbuild/Makefile
+++ b/mcs/tools/xbuild/Makefile
@@ -77,6 +77,8 @@ install-frameworks:
 	$(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
+	$(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
 
 install-pcl-targets:
 	$(MKINSTALLDIRS) $(DESTDIR)$(PORTABLE_TARGETS_DIR)
@@ -162,6 +164,7 @@ EXTRA_DISTFILES = \
 	frameworks/net_4.5.2.xml \
 	frameworks/net_4.6.xml \
 	frameworks/net_4.6.1.xml \
+	frameworks/net_4.6.2.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/data/14.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets
index 89afe6502c7..43e416188ec 100644
--- a/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets
@@ -151,7 +151,7 @@
 		Condition="'$(TargetFrameworkIdentifier)' == '' or '$(TargetFrameworkIdentifier)' == '.NETFramework'"
 		DependsOnTargets="$(GetFrameworkPathsDependsOn)">
 		<GetFrameworkPath>
-			<Output Condition="'$(TargetFrameworkVersion)' == 'v4.5' or '$(TargetFrameworkVersion)' == 'v4.5.1' or '$(TargetFrameworkVersion)' == 'v4.5.2' or '$(TargetFrameworkVersion)' == 'v4.6' or '$(TargetFrameworkVersion)' == 'v4.6.1'"
+			<Output Condition="'$(TargetFrameworkVersion)' == 'v4.5' or '$(TargetFrameworkVersion)' == 'v4.5.1' or '$(TargetFrameworkVersion)' == 'v4.5.2' or '$(TargetFrameworkVersion)' == 'v4.6' or '$(TargetFrameworkVersion)' == 'v4.6.1' or '$(TargetFrameworkVersion)' == 'v4.6.2'"
 				TaskParameter="FrameworkVersion45Path"
 				ItemName="_CombinedTargetFrameworkDirectoriesItem"/>
 			<Output Condition="'$(TargetFrameworkVersion)' == 'v4.0'"
@@ -172,7 +172,7 @@
 		</CreateProperty>
 
 		<Warning Text="TargetFrameworkVersion '$(TargetFrameworkVersion)' not supported by this toolset (ToolsVersion: $(MSBuildToolsVersion))."
-			Condition="'$(TargetFrameworkVersion)' != 'v4.6.1' and '$(TargetFrameworkVersion)' != 'v4.6' and '$(TargetFrameworkVersion)' != 'v4.5.2' and '$(TargetFrameworkVersion)' != 'v4.5.1' and '$(TargetFrameworkVersion)' != 'v4.5' and '$(TargetFrameworkVersion)' != 'v4.0' and '$(TargetFrameworkVersion)' != 'v3.5' and '$(TargetFrameworkVersion)' != 'v3.0' and '$(TargetFrameworkVersion)' != 'v2.0'"/>
+			Condition="'$(TargetFrameworkVersion)' != 'v4.6.2' and '$(TargetFrameworkVersion)' != 'v4.6.1' and '$(TargetFrameworkVersion)' != 'v4.6' and '$(TargetFrameworkVersion)' != 'v4.5.2' and '$(TargetFrameworkVersion)' != 'v4.5.1' and '$(TargetFrameworkVersion)' != 'v4.5' and '$(TargetFrameworkVersion)' != 'v4.0' and '$(TargetFrameworkVersion)' != 'v3.5' and '$(TargetFrameworkVersion)' != 'v3.0' and '$(TargetFrameworkVersion)' != 'v2.0'"/>
 	</Target>
 
 	<PropertyGroup>
diff --git a/mcs/tools/xbuild/frameworks/net_4.6.2.xml b/mcs/tools/xbuild/frameworks/net_4.6.2.xml
new file mode 100644
index 00000000000..2865ecb622b
--- /dev/null
+++ b/mcs/tools/xbuild/frameworks/net_4.6.2.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FileList  Name=".NET Framework 4.6.2" TargetFrameworkDirectory="..\..\..\..\4.5">
+</FileList>
-- 
2.25.1