From 3cb7409b78e98ffea58fc7e9d3b05eb0d72f13e7 Mon Sep 17 00:00:00 2001
From: Sarah Marshall <sarah.marshall@microsoft.com>
Date: Thu, 18 Jun 2020 18:27:31 -0700
Subject: [PATCH] Use quotes around variables in shell commands

---
 .../Props/QSharp.targets                      | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/Quantum.Development.Kit/Props/QSharp.targets b/src/Quantum.Development.Kit/Props/QSharp.targets
index f3a638fc586..8168e7919a1 100644
--- a/src/Quantum.Development.Kit/Props/QSharp.targets
+++ b/src/Quantum.Development.Kit/Props/QSharp.targets
@@ -7,25 +7,25 @@
   -->
   <Target Name="QsharpCompile"
       Inputs="@(QsharpFiles)"
-      Outputs="$(QsharpOutDir)\$(QsharpTree).bson"
+      Outputs="$(QsharpOutDir)/$(QsharpTree).bson"
       DependsOnTargets="QsharpPrepare"
       BeforeTargets="CheckForDuplicateItems;CoreCompile"
       Condition="$(RunQsc)">
     <PropertyGroup>
-      <QscCommand>$(QscExe) $(QsharpDocsGen) --qst $(QsharpTree) --input &quot;@(QsharpFiles,'&quot; &quot;')&quot; --references &quot;@(QsReferences,'&quot; &quot;')&quot; --output $(QsharpOutDir)</QscCommand>
+      <QscCommand>$(QscExe) $(QsharpDocsGen) --qst "$(QsharpTree)" --input "@(QsharpFiles,'" "')" --references "@(QsReferences,'" "')" --output "$(QsharpOutDir)"</QscCommand>
     </PropertyGroup>
     <MakeDir Directories="$(QsharpSrcOutDir)" />
     <MakeDir Condition="$(RunQDocGen)" Directories="$(QsharpDocsOutDir)" />
     <WriteLinesToFile File="$(QsharpOutDir)qsc-command.txt" Lines=":: files ::;@(QsharpFiles);:: qsim ::;$(QSimDll);;:: references ::;@(QsReferences);:: command ::;$(QscCommand)" Overwrite="true"/>
     <!-- Remove all existing codegen files first: -->
     <ItemGroup>
-      <QsharpCodegenFiles Include="$(QsharpSrcOutDir)**\*.*" />
+      <QsharpCodegenFiles Include="$(QsharpSrcOutDir)**/*.*" />
     </ItemGroup>
     <Delete Files="@(QsharpCodegenFiles)" />
     <Exec Command="$(QscCommand)" />
     <ItemGroup>
-      <EmbeddedResource Include="$(QsharpOutDir)\$(QsharpTree).bson" LogicalName="__qsharp_data__.bson" Visible="false" />
-      <Compile Include="$(QsharpSrcOutDir)**\*.g.cs" Visible="false" AutoGen="true" />
+      <EmbeddedResource Include="$(QsharpOutDir)/$(QsharpTree).bson" LogicalName="__qsharp_data__.bson" Visible="false" />
+      <Compile Include="$(QsharpSrcOutDir)**/*.g.cs" Visible="false" AutoGen="true" />
     </ItemGroup>
   </Target>
 
@@ -36,7 +36,7 @@
       DependsOnTargets="QsharpPrepare" 
       BeforeTargets="Clean">
     <ItemGroup>
-      <QsharpBuiltFiles Include="$(QsharpOutDir)**\*.*" />
+      <QsharpBuiltFiles Include="$(QsharpOutDir)**/*.*" />
     </ItemGroup>
     <Delete Files="@(QsharpBuiltFiles)" />
   </Target>
@@ -52,21 +52,23 @@
       <QsharpFiles Include="@(QsharpCompile)">
         <Visible>false</Visible>
       </QsharpFiles>
-      <SkippedQsharpFiles Include="**\*.qs" Exclude="@(QsharpFiles);@(QsharpIgnore)">
+      <SkippedQsharpFiles Include="**/*.qs" Exclude="@(QsharpFiles);@(QsharpIgnore)">
         <Visible>false</Visible>
       </SkippedQsharpFiles>
     </ItemGroup>
     <PropertyGroup>
       <QsharpOutDir Condition="'$(QsharpOutDir)' == ''">$(BaseIntermediateOutputPath)qsharp</QsharpOutDir>
-      <QsharpOutDir Condition="!HasTrailingSlash('$(QsharpOutDir)')">$(QsharpOutDir)\</QsharpOutDir>
-      <QsharpSrcOutDir Condition="'$(QsharpSrcOutDir)' == ''">$(QsharpOutDir)src\</QsharpSrcOutDir>
+      <QsharpOutDir>$([MSBuild]::Unescape('$(QsharpOutDir)').Replace('\', '/'))</QsharpOutDir>
+      <QsharpOutDir Condition="!HasTrailingSlash('$(QsharpOutDir)')">$(QsharpOutDir)/</QsharpOutDir>
+      <QsharpSrcOutDir Condition="'$(QsharpSrcOutDir)' == ''">$(QsharpOutDir)src/</QsharpSrcOutDir>
       <QsharpFormatBackupDir Condition="'$(QsharpFormatBackupDir)' == ''">$(QsharpOutDir).backup.$([System.DateTime]::Now.ToString(`yyyyMMddhhmmss`))</QsharpFormatBackupDir>
-      <QsharpDocsOutDir Condition="'$(QsharpDocsOutDir)' == ''">$(QsharpOutDir)docs\</QsharpDocsOutDir>
-      <QsharpDocsGen Condition="$(RunQDocGen)">--doc $(QsharpDocsOutDir)</QsharpDocsGen>
+      <QsharpDocsOutDir Condition="'$(QsharpDocsOutDir)' == ''">$(QsharpOutDir)docs/</QsharpDocsOutDir>
+      <QsharpDocsOutDir>$([MSBuild]::Unescape('$(QsharpDocsOutDir)').Replace('\', '/'))</QsharpDocsOutDir>
+      <QsharpDocsGen Condition="$(RunQDocGen)">--doc "$(QsharpDocsOutDir)"</QsharpDocsGen>
       <QsharpTree Condition="'$(QsharpTree)' == ''">$([System.String]::Copy('$(AssemblyName)').Replace(' ',''))</QsharpTree>
     </PropertyGroup>
     <Warning
         Condition="'@(SkippedQbFiles)' != ''"
         Text="Some .qs files in your project will be skipped during build: @(SkippedQsharpFiles)" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>