From d0a6cbe95361ee0076a077c2928cda4147eeece5 Mon Sep 17 00:00:00 2001
From: Albert Li <wentaoli@microsoft.com>
Date: Mon, 24 Apr 2023 16:57:07 +0800
Subject: [PATCH 1/2] fix. github bug #56: align makePQX with msbuild, and set
 OutputPath to $(MSBuildProjectDirectory)\bin other than
 $(MSBuildProjectDirectory)\bin\$(CurrentProjectPlatform)\$(CurrentProjectConfiguration)

---
 src/features/PowerQueryTaskProvider.ts | 5 ++++-
 templates/settings.json                | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/features/PowerQueryTaskProvider.ts b/src/features/PowerQueryTaskProvider.ts
index 369c3a40..3a3b69c8 100644
--- a/src/features/PowerQueryTaskProvider.ts
+++ b/src/features/PowerQueryTaskProvider.ts
@@ -81,7 +81,10 @@ const makePQXCompileTaskDefinition: PowerQueryTaskDefinition = {
     type: ExtensionConstants.PowerQueryTaskType,
     operation: "compile",
     label: extensionI18n["PQSdk.taskProvider.makePQx.compile.label"],
-    additionalArgs: [],
+    additionalArgs: vscode.workspace.workspaceFolders?.[0]
+        ? // make sure PQXCompile use currentDirectly\bin as the output folder
+          ["-d", path.join(vscode.workspace.workspaceFolders?.[0].uri.fsPath, "bin")]
+        : [],
 };
 
 interface PendingTaskResolver {
diff --git a/templates/settings.json b/templates/settings.json
index 8c199fdc..0ac90b5e 100644
--- a/templates/settings.json
+++ b/templates/settings.json
@@ -1,4 +1,4 @@
 {
   "powerquery.sdk.defaultQueryFile": "${workspaceFolder}\\${workspaceFolderBasename}.query.pq",
-  "powerquery.sdk.defaultExtension": "${workspaceFolder}\\bin\\AnyCPU\\Debug\\${workspaceFolderBasename}.mez"
+  "powerquery.sdk.defaultExtension": "${workspaceFolder}\\bin\\${workspaceFolderBasename}.mez"
 }

From 8794ee710cea8f8bd376a55f69bd5854f06eabff Mon Sep 17 00:00:00 2001
From: Albert Li <wentaoli@microsoft.com>
Date: Mon, 24 Apr 2023 17:10:21 +0800
Subject: [PATCH 2/2] fix. github bug #59: align makePQX with msbuild, and set
 template OutputPath property to $(MSBuildProjectDirectory)\bin\AnyCPU\Debug
 as MakePQX

---
 src/features/PowerQueryTaskProvider.ts | 5 +----
 templates/PQConn.proj                  | 2 +-
 templates/settings.json                | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/features/PowerQueryTaskProvider.ts b/src/features/PowerQueryTaskProvider.ts
index 3a3b69c8..369c3a40 100644
--- a/src/features/PowerQueryTaskProvider.ts
+++ b/src/features/PowerQueryTaskProvider.ts
@@ -81,10 +81,7 @@ const makePQXCompileTaskDefinition: PowerQueryTaskDefinition = {
     type: ExtensionConstants.PowerQueryTaskType,
     operation: "compile",
     label: extensionI18n["PQSdk.taskProvider.makePQx.compile.label"],
-    additionalArgs: vscode.workspace.workspaceFolders?.[0]
-        ? // make sure PQXCompile use currentDirectly\bin as the output folder
-          ["-d", path.join(vscode.workspace.workspaceFolders?.[0].uri.fsPath, "bin")]
-        : [],
+    additionalArgs: [],
 };
 
 interface PendingTaskResolver {
diff --git a/templates/PQConn.proj b/templates/PQConn.proj
index 12644c2e..7cec0093 100644
--- a/templates/PQConn.proj
+++ b/templates/PQConn.proj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="BuildMez">
   <PropertyGroup>
-    <OutputPath Condition="'$(OutputPath)' == ''">$(MSBuildProjectDirectory)\bin\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)' == ''">$(MSBuildProjectDirectory)\bin\AnyCPU\Debug\</OutputPath>
     <IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(MSBuildProjectDirectory)\obj\</IntermediateOutputPath>
     <MezIntermediatePath>$(IntermediateOutputPath)MEZ\</MezIntermediatePath>
     <MezOutputPath>$(OutputPath)$(MsBuildProjectName).mez</MezOutputPath>
diff --git a/templates/settings.json b/templates/settings.json
index 0ac90b5e..8c199fdc 100644
--- a/templates/settings.json
+++ b/templates/settings.json
@@ -1,4 +1,4 @@
 {
   "powerquery.sdk.defaultQueryFile": "${workspaceFolder}\\${workspaceFolderBasename}.query.pq",
-  "powerquery.sdk.defaultExtension": "${workspaceFolder}\\bin\\${workspaceFolderBasename}.mez"
+  "powerquery.sdk.defaultExtension": "${workspaceFolder}\\bin\\AnyCPU\\Debug\\${workspaceFolderBasename}.mez"
 }