From 48bfd2a65fca7a29aae25df3a4eed7bb7768416b Mon Sep 17 00:00:00 2001 From: Lluis Sanchez Date: Mon, 7 Sep 2009 15:35:43 +0000 Subject: 2009-09-02 Lluis Sanchez Gual * MonoDevelop.Core.Assemblies/TargetFrameworkBackend.cs: In GetToolPaths, unquote quoted paths. svn path=/branches/monodevelop/main/2.1/; revision=141441 --- main/src/core/MonoDevelop.Core/ChangeLog | 5 +++++ .../MonoDevelop.Core.Assemblies/TargetFrameworkBackend.cs | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/main/src/core/MonoDevelop.Core/ChangeLog b/main/src/core/MonoDevelop.Core/ChangeLog index 4aee156080..eca8f732cf 100644 --- a/main/src/core/MonoDevelop.Core/ChangeLog +++ b/main/src/core/MonoDevelop.Core/ChangeLog @@ -1,3 +1,8 @@ +2009-09-02 Lluis Sanchez Gual + + * MonoDevelop.Core.Assemblies/TargetFrameworkBackend.cs: In + GetToolPaths, unquote quoted paths. + 2009-08-27 Lluis Sanchez Gual * MonoDevelop.Core.Execution/DisposerFormatterSink.cs: The diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/TargetFrameworkBackend.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/TargetFrameworkBackend.cs index 22f3914681..a6a9585606 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/TargetFrameworkBackend.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/TargetFrameworkBackend.cs @@ -83,8 +83,13 @@ namespace MonoDevelop.Core.Assemblies { string paths; if (!runtime.GetToolsEnvironmentVariables (framework).TryGetValue ("PATH", out paths)) - return new string[0]; - return paths.Split (new char[] { Path.PathSeparator }, StringSplitOptions.RemoveEmptyEntries); + yield break; + foreach (string path in paths.Split (new char[] { Path.PathSeparator }, StringSplitOptions.RemoveEmptyEntries)) { + if (path.Length > 0 && path [0] == '"' && path [path.Length - 1] == '"') + yield return path.Substring (1, path.Length-2); + else + yield return path; + } } public virtual IEnumerable GetAssemblyDirectories () -- cgit v1.2.3