Merge pull request #914 from zooba/backport-909

Fix working directory of commands in Microsoft.PythonTools.Django.tar…
microsoft · Oct 19, 2015 · ea5eef8 · ea5eef8
2 parents 9b887a0 + 1490fad
commit ea5eef8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Python/Product/Django/Microsoft.PythonTools.Django.targets b/Python/Product/Django/Microsoft.PythonTools.Django.targets
@@ -64,7 +64,7 @@
     <RunPythonCommand Target="import $(DjangoSettingsModule) as settings; print(settings.STATIC_URL)"
                       TargetType="code"
                       ExecuteIn="none"
-                      WorkingDirectory="$(QualifiedProjectHome)"
+                      WorkingDirectory="$(WorkingDirectory)"
                       ConsoleToMSBuild="true">
       <Output TaskParameter="ConsoleOutput" PropertyName="DjangoStaticUrlSetting" />
     </RunPythonCommand>
@@ -95,7 +95,7 @@
     <RunPythonCommand Target="import $(DjangoSettingsModule) as settings; print(settings.STATIC_ROOT or '')"
                       TargetType="code"
                       ExecuteIn="none"
-                      WorkingDirectory="$(QualifiedProjectHome)"
+                      WorkingDirectory="$(WorkingDirectory)"
                       Environment="DJANGO_SETTINGS_MODULE=$(DjangoSettingsModule)"
                       ConsoleToMSBuild="true"
                       Condition="'$(DjangoStaticRootSetting)' == ''">
@@ -121,7 +121,7 @@
                       TargetType="script"
                       Arguments="collectstatic --noinput"
                       ExecuteIn="none"
-                      WorkingDirectory="$(QualifiedProjectHome)"
+                      WorkingDirectory="$(WorkingDirectory)"
                       Environment="DJANGO_SETTINGS_MODULE=$(DjangoSettingsModule)" />
 
     <ItemGroup>