From ba892240cb104c84a37e70ede2ebaa91f624a6f5 Mon Sep 17 00:00:00 2001
From: deepend <deepend@tilde.club>
Date: Sat, 14 Feb 2026 17:56:27 -0700
Subject: [PATCH] Fixed the Windows installer pre-build PowerShell invocation
 by replacing the bare powershell command with a configurable
 $(PowerShellPath) call in installer.vcxproj, and added stable flags
 (-NoProfile -ExecutionPolicy Bypass) to reduce environment-specific failures.
 This addresses the MSB3073/9009 command-not-found class of error you
 reported. Added a PowerShellPath resolution chain in zoitechat.props so
 builds can use:

    POWERSHELL_EXE override,

    %WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe when present,

    fallback powershell.exe from PATH.
---
 win32/installer/installer.vcxproj | 3 +--
 win32/zoitechat.props             | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/win32/installer/installer.vcxproj b/win32/installer/installer.vcxproj
index 42397ccb..9dd90d2c 100644
--- a/win32/installer/installer.vcxproj
+++ b/win32/installer/installer.vcxproj
@@ -37,8 +37,7 @@
       <Command>
       <![CDATA[
 SET SOLUTIONDIR=$(SolutionDir)..\
-powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\win32\installer\zoitechat.iss.tt" "$(ZoiteChatBin)zoitechat.iss"
-"$(IsccPath)" /dPROJECTDIR="$(ProjectDir)" /dAPPARCH="$(Platform)" "$(ZoiteChatBin)zoitechat.iss"
+"$(PowerShellPath)" -NoProfile -ExecutionPolicy Bypass -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\win32\installer\zoitechat.iss.tt" "$(ZoiteChatBin)zoitechat.iss"
       ]]>
       </Command>
     </PreBuildEvent>
diff --git a/win32/zoitechat.props b/win32/zoitechat.props
index 919c6e08..1d2868f9 100644
--- a/win32/zoitechat.props
+++ b/win32/zoitechat.props
@@ -91,6 +91,9 @@
 		<ZoiteChatPdb>$(ZoiteChatBuild)\$(PlatformName)\pdb\</ZoiteChatPdb>
 		<ZoiteChatRel>$(ZoiteChatBuild)\$(PlatformName)\rel\</ZoiteChatRel>
 		<IsccPath Condition="'$(IsccPath)'=='' and '$(ISCC_EXE)'!=''">$(ISCC_EXE)</IsccPath>
+		<PowerShellPath Condition="'$(PowerShellPath)'=='' and '$(POWERSHELL_EXE)'!=''">$(POWERSHELL_EXE)</PowerShellPath>
+		<PowerShellPath Condition="'$(PowerShellPath)'=='' and '$(WINDIR)'!='' and Exists('$(WINDIR)\System32\WindowsPowerShell\v1.0\powershell.exe')">$(WINDIR)\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellPath>
+		<PowerShellPath Condition="'$(PowerShellPath)'==''">powershell.exe</PowerShellPath>
 		<IsccPath Condition="'$(IsccPath)'=='' and '$(ProgramFiles(x86))'!='' and Exists('$(ProgramFiles(x86))\Inno Setup 5\iscc.exe')">$(ProgramFiles(x86))\Inno Setup 5\iscc.exe</IsccPath>
 		<IsccPath Condition="'$(IsccPath)'=='' and '$(ProgramFiles(x86))'!='' and Exists('$(ProgramFiles(x86))\Inno Setup 6\iscc.exe')">$(ProgramFiles(x86))\Inno Setup 6\iscc.exe</IsccPath>
 		<IsccPath Condition="'$(IsccPath)'=='' and '$(ProgramFiles)'!='' and Exists('$(ProgramFiles)\Inno Setup 5\iscc.exe')">$(ProgramFiles)\Inno Setup 5\iscc.exe</IsccPath>