Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLluis Sanchez <llsan@microsoft.com>2017-04-05 11:59:06 +0300
committerGitHub <noreply@github.com>2017-04-05 11:59:06 +0300
commitcd1b560640f94595db9bfc6f8fdf5f57daa1b597 (patch)
tree7d56f34970c7b29da2ead25edb2a0f1990fa4410
parentfdbe368093680d3494786cabae2b4b3c004e9f7a (diff)
parent3c3fafddc6a506ace2a41ca9f36881cdaded0766 (diff)
Merge pull request #2117 from mono/fix-builder-nremonodevelop-7.0.0.2715
[Core] Fix NRE in project builder
-rw-r--r--main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.v4.0.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.v4.0.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.v4.0.cs
index 24a7ac02f5..a627c08c44 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.v4.0.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.v4.0.cs
@@ -156,7 +156,9 @@ namespace MonoDevelop.Projects.MSBuild
project = p;
}
- Environment.CurrentDirectory = Path.GetDirectoryName (file);
+ var projectDir = Path.GetDirectoryName (file);
+ if (!string.IsNullOrEmpty (projectDir))
+ Environment.CurrentDirectory = projectDir;
return project;
}