From fd5606bcfaf7b6f0cf53bb6808beec8513b4c7bd Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Thu, 13 Mar 2025 16:50:40 -0500
Subject: [PATCH] [build] fix the bindir (#547)

Co-authored-by: Mike Griese <zadjii@gmail.com>
---
 installer/PowerToysSetup/CmdPal.wxs                     | 4 ----
 src/modules/cmdpal/Microsoft.CmdPal.UI/CmdPal.pre.props | 5 +----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/installer/PowerToysSetup/CmdPal.wxs b/installer/PowerToysSetup/CmdPal.wxs
index 890f2b2ae5..45b53a75cf 100644
--- a/installer/PowerToysSetup/CmdPal.wxs
+++ b/installer/PowerToysSetup/CmdPal.wxs
@@ -4,11 +4,7 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-<?ifdef env.IsPipeline?>
   <?define CmdPalBuildDir="$(var.BinDir)\WinUI3Apps\CmdPal\"?>
-<?else?>
-  <?define CmdPalBuildDir="$(var.BinDir)\WinUI3Apps\CmdPalDev\"?>
-<?endif?>
 
   <Fragment>
     <DirectoryRef Id="WinUI3AppsInstallFolder">
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/CmdPal.pre.props b/src/modules/cmdpal/Microsoft.CmdPal.UI/CmdPal.pre.props
index 24151b5632..c732a29374 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/CmdPal.pre.props
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/CmdPal.pre.props
@@ -7,10 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <OutputPath Condition="'$(CommandPaletteBranding)'=='Release'">$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal</OutputPath>
-    <OutputPath Condition="'$(CommandPaletteBranding)'=='Preview'">$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPalPreview</OutputPath>
-    <OutputPath Condition="'$(CommandPaletteBranding)'=='Canary'">$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPalCanary</OutputPath>
-    <OutputPath Condition="'$(CommandPaletteBranding)'=='' or '$(CommandPaletteBranding)'=='Dev'">$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPalDev</OutputPath>
+    <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal</OutputPath>
   </PropertyGroup>
 
 </Project>