From: Mikayla Hutchinson <m.j.hutchinson@gmail.com>
Date: Mon, 18 Jul 2016 18:47:59 +0000 (-0400)
Subject: [xbuild] Framework path should have trailing slash
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=58231fec643a22fa4f350452fc17d528315da20f;p=mono.git

[xbuild] Framework path should have trailing slash
---

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetReferenceAssemblyPaths.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetReferenceAssemblyPaths.cs
index b74e26ab43e..40f04ad996a 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetReferenceAssemblyPaths.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/GetReferenceAssemblyPaths.cs
@@ -142,7 +142,9 @@ namespace Microsoft.Build.Tasks
 					framework_dir = Path.Combine (redistlist_dir, framework_dir);
 
 				var directories = new List<string> ();
-				directories.Add (MSBuildUtils.FromMSBuildPath (framework_dir));
+
+				//MSBuild has a trailing slash on this value
+				directories.Add (MSBuildUtils.FromMSBuildPath (framework_dir) + Path.DirectorySeparatorChar);
 
 				string include = xr.GetAttribute ("IncludeFramework");
 				if (!String.IsNullOrEmpty (include)) {