From 85d86b06235936b2c81ffe65f133f932707d6e58 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebastien.ros@microsoft.com>
Date: Fri, 16 Aug 2013 11:28:26 -0700
Subject: [PATCH] #19745:  usage of Environment.CurrentDirectory

Work Item: 19745
---
 src/Tools/Orchard/HostContext/CommandHostContextProvider.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Tools/Orchard/HostContext/CommandHostContextProvider.cs b/src/Tools/Orchard/HostContext/CommandHostContextProvider.cs
index 12505b9db..12f900409 100644
--- a/src/Tools/Orchard/HostContext/CommandHostContextProvider.cs
+++ b/src/Tools/Orchard/HostContext/CommandHostContextProvider.cs
@@ -65,7 +65,8 @@ namespace Orchard.HostContext {
             LogInfo(context, "Virtual path: \"{0}\"", context.Arguments.VirtualPath);
 
             if (string.IsNullOrEmpty(context.Arguments.WorkingDirectory))
-                context.Arguments.WorkingDirectory = Environment.CurrentDirectory;
+                context.Arguments.WorkingDirectory = Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location);
+
             LogInfo(context, "Working directory: \"{0}\"", context.Arguments.WorkingDirectory);
 
             LogInfo(context, "Detecting orchard installation root directory...");