[xBuild] Fix Import elements with the combination of wildcards and ab…

…solute paths Used in the .targets files shipped with VS2013
mono · Sep 29, 2013 · f7a787b · f7a787b
1 parent 29bb48c
commit f7a787b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs
@@ -96,14 +96,17 @@ public void Scan ()
 					return;
 
 				int offset = 0;
+				string full_path;
 				if (Path.IsPathRooted (name)) {
+					full_path = name;
 					baseDirectory = new DirectoryInfo (Path.GetPathRoot (name));
 					if (IsRunningOnWindows)
 						// skip the "drive:"
 						offset = 1;
+				} else {
+					full_path = Path.GetFullPath (Path.Combine (Environment.CurrentDirectory, name));
 				}
 
-				string full_path = Path.GetFullPath (Path.Combine (Environment.CurrentDirectory, include_item.ItemSpec));
 				fileInfo = ParseIncludeExclude (separatedPath, offset, baseDirectory);
 
 				int wildcard_offset = full_path.IndexOf ("**");