From 15aec1d6a9bc58461fd4f7937effe951345a1164 Mon Sep 17 00:00:00 2001
From: Jason Naylor <jason_naylor@sil.org>
Date: Tue, 14 May 2024 15:41:00 -0700
Subject: [PATCH] Minor refactor and fixup in BuildProductBaseMsi target

---
 Build/Installer.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Build/Installer.targets b/Build/Installer.targets
index f9fe04fe3e..86730f9b88 100644
--- a/Build/Installer.targets
+++ b/Build/Installer.targets
@@ -439,12 +439,12 @@
 		</MSBuild.ExtensionPack.Framework.Guid>
 		<Message Text="Generated GUID '$(ProductIdGuid)'"/>
 		<PropertyGroup>
-			<MsiFile>$(SafeApplicationName)_$(Revision).msi</MsiFile>
+			<MsiFile>$(SafeApplicationName)_$(PatchVersionSegment).msi</MsiFile>
 			<BaseBuildDir>$(InstallerDir)/BaseInstallerBuild</BaseBuildDir>
 			<BaseBuildArgs>"$(ApplicationName)" $(SafeApplicationName) $(BuildVersion) $(ProductIdGuid) $(UpgradeCodeGuid) "$(AppBuildDir)/$(BinDirSuffix)" "$(AppBuildDir)/$(DataDirSuffix)" $(CopyrightYear) "$(Manufacturer)" $(SafeManufacturer) $(Arch)</BaseBuildArgs>
 		</PropertyGroup>
 		<!-- Suppress ICE30 because we and Encoding Converters MM both install Geckofx, resulting in an ICE warning for double ref counting -->
-		<Exec WorkingDirectory="$(BaseBuildDir)" Command="(set SuppressICE=-sice:ICE30) &amp; buildBaseInstaller.bat $(BaseBuildArgs)" />
+		<Exec WorkingDirectory="$(BaseBuildDir)" Command="buildBaseInstaller.bat $(BaseBuildArgs)" EnvironmentVariables="SuppressICE=-sice:ICE30" />
 		<ItemGroup>
 			<InstallerFiles Include="$(BaseBuildDir)/**/$(SafeApplicationName)_*.exe"/>
 			<InstallerFiles Include="$(BaseBuildDir)/**/$(SafeApplicationName)_*.msi"/>