From ebefc88405fe288ffa727705b05cbd665a7d88fa Mon Sep 17 00:00:00 2001
From: Bettina Heim <beheim@microsoft.com>
Date: Sat, 1 Feb 2020 17:24:37 -0800
Subject: [PATCH 1/2] separate build target for adding the generated C# files
 to Compile

---
 src/QuantumSdk/Sdk/Sdk.targets | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/QuantumSdk/Sdk/Sdk.targets b/src/QuantumSdk/Sdk/Sdk.targets
index 8ef88a3cd5..bbdb1a8d8a 100644
--- a/src/QuantumSdk/Sdk/Sdk.targets
+++ b/src/QuantumSdk/Sdk/Sdk.targets
@@ -44,7 +44,7 @@
   <Target Name="QsharpCompile" 
           Condition="'$(DesignTimeBuild)' != 'true'"
           DependsOnTargets="ResolveAssemblyReferences;ResolveQscReferences;BeforeQsharpCompile;_CopyFilesMarkedCopyLocal" 
-          BeforeTargets="BeforeCsharpCompile;BeforeBuild">
+          BeforeTargets="PrepareCsharpCompileAfterCsharpGeneration">
     <MakeDir Directories="$(GeneratedFilesOutputPath)" />
     <MakeDir Directories="$(QscBuildConfigOutputPath)" />
     <MakeDir Condition="$(QsharpDocsGeneration)" Directories="$(QsharpDocsOutputPath)" />
@@ -80,7 +80,10 @@
     </PropertyGroup>
     <WriteLinesToFile File="$(_QscCommandArgsFile)" Lines="$(_QscCommandArgs)" Overwrite="true"/> <!-- we use a response file to avoid issues when the command gets long -->
     <Exec Command="$(QscCommand)" IgnoreExitCode="false" /> 
-    <!-- configure the dll built by the C# compiler -->
+  </Target>   
+
+  <!-- Configures the dll built by the C# compiler. This target needs to execute during the C# design time build to get accurate intellisense information for (non-generate) C# source files. -->
+  <Target Name="PrepareCsharpCompileAfterCsharpGeneration" AfterTargets="QsharpCompile" BeforeTargets="BeforeCsharpCompile;BeforeBuild">
     <ItemGroup>
       <EmbeddedResource Include="$(GeneratedFilesOutputPath)$(PathCompatibleAssemblyName).bson" LogicalName="__qsharp_data__.bson" Visible="false" />
       <Compile Condition="$(CsharpGeneration)" Include="$(GeneratedFilesOutputPath)**/*.g.cs" Exclude="@(Compile)" AutoGen="true" />

From 2886fd6792696959f8f9a39189abaddcf8e8346b Mon Sep 17 00:00:00 2001
From: Bettina Heim <beheim@microsoft.com>
Date: Sat, 1 Feb 2020 17:38:32 -0800
Subject: [PATCH 2/2] adding a DependsOn QsharpCompile to the
 PrepareCsharpCompileAfterCsharpGeneration target

---
 src/QuantumSdk/Sdk/Sdk.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/QuantumSdk/Sdk/Sdk.targets b/src/QuantumSdk/Sdk/Sdk.targets
index bbdb1a8d8a..fc5c004529 100644
--- a/src/QuantumSdk/Sdk/Sdk.targets
+++ b/src/QuantumSdk/Sdk/Sdk.targets
@@ -83,7 +83,7 @@
   </Target>   
 
   <!-- Configures the dll built by the C# compiler. This target needs to execute during the C# design time build to get accurate intellisense information for (non-generate) C# source files. -->
-  <Target Name="PrepareCsharpCompileAfterCsharpGeneration" AfterTargets="QsharpCompile" BeforeTargets="BeforeCsharpCompile;BeforeBuild">
+  <Target Name="PrepareCsharpCompileAfterCsharpGeneration" DependsOnTargets="QsharpCompile" AfterTargets="QsharpCompile" BeforeTargets="BeforeCsharpCompile;BeforeBuild">
     <ItemGroup>
       <EmbeddedResource Include="$(GeneratedFilesOutputPath)$(PathCompatibleAssemblyName).bson" LogicalName="__qsharp_data__.bson" Visible="false" />
       <Compile Condition="$(CsharpGeneration)" Include="$(GeneratedFilesOutputPath)**/*.g.cs" Exclude="@(Compile)" AutoGen="true" />