From 32f74e41ef4347284595fdede2e92ab77707bfd2 Mon Sep 17 00:00:00 2001
From: Arjun Balgovind <32061677+arjunbalgovind@users.noreply.github.com>
Date: Wed, 20 May 2020 09:55:17 -0700
Subject: [PATCH] Fix publish on local machines (#3270)

* Moved publishing to publish.cmd script

* Moved publish back to pre-build event
---
 .pipelines/build-installer.cmd                  | 1 +
 installer/PowerToysSetup/PowerToysSetup.wixproj | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.pipelines/build-installer.cmd b/.pipelines/build-installer.cmd
index d771a2a4d7..9c3b9c1972 100644
--- a/.pipelines/build-installer.cmd
+++ b/.pipelines/build-installer.cmd
@@ -1,4 +1,5 @@
 cd /D "%~dp0"
 
 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.18362.0
+SET IsPipeline=1
 call msbuild ../installer/PowerToysSetup.sln /p:Configuration=Release /p:Platform=x64 || exit /b 1
diff --git a/installer/PowerToysSetup/PowerToysSetup.wixproj b/installer/PowerToysSetup/PowerToysSetup.wixproj
index cfceaf70fd..ad8605e771 100644
--- a/installer/PowerToysSetup/PowerToysSetup.wixproj
+++ b/installer/PowerToysSetup/PowerToysSetup.wixproj
@@ -70,7 +70,11 @@
     <Error Condition="!Exists('..\packages\WiX.3.11.2\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WiX.3.11.2\build\wix.props'))" />
   </Target>
   <PropertyGroup>
-    <PreBuildEvent />
+    <PreBuildEvent>IF NOT DEFINED IsPipeline (
+call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.18362.0
+SET PTRoot=..\..\..\..
+call "..\..\publish.cmd"
+)</PreBuildEvent>
   </PropertyGroup>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.