From d7cc4fe68d4569d390a8a133f3bb50928b5b9d77 Mon Sep 17 00:00:00 2001
From: Jason Naylor <jason_naylor@sil.org>
Date: Mon, 2 Dec 2024 10:51:55 -0800
Subject: [PATCH] Update file paths for the Installer build

---
 src/Installer/Installer.wxs | 44 ++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/Installer/Installer.wxs b/src/Installer/Installer.wxs
index abfd8cd5c..a1c9d8cdc 100644
--- a/src/Installer/Installer.wxs
+++ b/src/Installer/Installer.wxs
@@ -83,43 +83,43 @@ are trying to support, you're better off using non-advertised shortcuts. "-->
 		  <Directory Id="INSTALLDIR" Name="FLEx Bridge">
 			<!-- Main bridge assemblies -->
 			<Component Id="FLExBridge.exe" Guid="3D9BF2DF-4A25-11DF-9879-0800200C9A66">
-			  <File Id="FLExBridge.exe" Name="FLExBridge.exe" Source="..\..\output\Release\FLExBridge.exe"/>
+			  <File Id="FLExBridge.exe" Name="FLExBridge.exe" Source="..\..\output\Release\net462\FLExBridge.exe"/>
 			</Component>
 			<Component Id="FLExBridge.pdb" Guid="C1EDBBD2-E382-11DE-8A39-0800200C9A66">
-			  <File Id="FLExBridge.pdb" Name="FLExBridge.pdb" KeyPath="yes" Source="..\..\output\Release\FLExBridge.pdb"/>
+			  <File Id="FLExBridge.pdb" Name="FLExBridge.pdb" KeyPath="yes" Source="..\..\output\Release\net462\FLExBridge.pdb"/>
 			</Component>
 			<Component Id="app.config" Guid="C1EE581C-E382-11DE-8A39-0800200C9A66">
-			  <File Id="app.config" Name="app.config" Source="..\..\output\Release\app.config"/>
+			  <File Id="app.config" Name="app.config" Source="..\..\output\Release\net462\app.config"/>
 			</Component>
 			<Component Id="FLExChorusPlugin.dll" Guid="C1ED6DB1-E382-11DE-8A39-0800200C9A66">
-			  <File Id="FLExChorusPlugin.dll" Name="FLEx-ChorusPlugin.dll" KeyPath="yes" Source="..\..\output\Release\FLEx-ChorusPlugin.dll"/>
+			  <File Id="FLExChorusPlugin.dll" Name="FLEx-ChorusPlugin.dll" KeyPath="yes" Source="..\..\output\Release\net462\FLEx-ChorusPlugin.dll"/>
 			</Component>
 			<Component Id="FLExChorusPlugin.pdb" Guid="C1EDBBD3-E382-11DE-8A39-0800200C9A66">
-			  <File Id="FLExChorusPlugin.pdb" Name="FLEx-ChorusPlugin.pdb" KeyPath="yes" Source="..\..\output\Release\FLEx-ChorusPlugin.pdb"/>
+			  <File Id="FLExChorusPlugin.pdb" Name="FLEx-ChorusPlugin.pdb" KeyPath="yes" Source="..\..\output\Release\net462\FLEx-ChorusPlugin.pdb"/>
 			</Component>
 			<Component Id="LibFLExBridgeChorusPlugin.dll" Guid="5A362239-BD5F-44A2-9CEC-C18422785D20">
-			  <File Id="LibFLExBridgeChorusPlugin.dll" Name="LibFLExBridge-ChorusPlugin.dll" KeyPath="yes" Source="..\..\output\Release\LibFLExBridge-ChorusPlugin.dll"/>
+			  <File Id="LibFLExBridgeChorusPlugin.dll" Name="LibFLExBridge-ChorusPlugin.dll" KeyPath="yes" Source="..\..\output\Release\net462\LibFLExBridge-ChorusPlugin.dll"/>
 			</Component>
 			<Component Id="LibFLExBridgeChorusPlugin.pdb" Guid="CE3E02A1-8534-4DB5-BF93-DF484B8EA09F">
-			  <File Id="LibFLExBridgeChorusPlugin.pdb" Name="LibFLExBridge-ChorusPlugin.pdb" KeyPath="yes" Source="..\..\output\Release\LibFLExBridge-ChorusPlugin.pdb"/>
+			  <File Id="LibFLExBridgeChorusPlugin.pdb" Name="LibFLExBridge-ChorusPlugin.pdb" KeyPath="yes" Source="..\..\output\Release\net462\LibFLExBridge-ChorusPlugin.pdb"/>
 			</Component>
 			<Component Id="LiftBridgeChorusPlugin.dll" Guid="C1EDE2FA-E382-11DE-8A39-0800200C9A66">
-			  <File Id="LiftBridgeChorusPlugin.dll" Name="LiftBridge-ChorusPlugin.dll" KeyPath="yes" Source="..\..\output\Release\LiftBridge-ChorusPlugin.dll"/>
+			  <File Id="LiftBridgeChorusPlugin.dll" Name="LiftBridge-ChorusPlugin.dll" KeyPath="yes" Source="..\..\output\Release\net462\LiftBridge-ChorusPlugin.dll"/>
 			</Component>
 			<Component Id="LiftBridgeChorusPlugin.pdb" Guid="C1EDE2FB-E382-11DE-8A39-0800200C9A66">
-			  <File Id="LiftBridgeChorusPlugin.pdb" Name="LiftBridge-ChorusPlugin.pdb" KeyPath="yes" Source="..\..\output\Release\LiftBridge-ChorusPlugin.pdb"/>
+			  <File Id="LiftBridgeChorusPlugin.pdb" Name="LiftBridge-ChorusPlugin.pdb" KeyPath="yes" Source="..\..\output\Release\net462\LiftBridge-ChorusPlugin.pdb"/>
 			</Component>
 			<Component Id="LibTriboroughBridgeChorusPlugin.dll" Guid="631D0647-1441-4D69-9CC4-5557006BE8C2">
-			  <File Id="LibTriboroughBridgeChorusPlugin.dll" Name="LibTriboroughBridge-ChorusPlugin.dll" KeyPath="yes" Source="..\..\output\Release\LibTriboroughBridge-ChorusPlugin.dll"/>
+			  <File Id="LibTriboroughBridgeChorusPlugin.dll" Name="LibTriboroughBridge-ChorusPlugin.dll" KeyPath="yes" Source="..\..\output\Release\net462\LibTriboroughBridge-ChorusPlugin.dll"/>
 			</Component>
 			<Component Id="LibTriboroughBridgeChorusPlugin.pdb" Guid="91548EC8-AA95-4E10-8C35-6B02DD638A80">
-			  <File Id="LibTriboroughBridgeChorusPlugin.pdb" Name="LibTriboroughBridge-ChorusPlugin.pdb" KeyPath="yes" Source="..\..\output\Release\LibTriboroughBridge-ChorusPlugin.pdb"/>
+			  <File Id="LibTriboroughBridgeChorusPlugin.pdb" Name="LibTriboroughBridge-ChorusPlugin.pdb" KeyPath="yes" Source="..\..\output\Release\net462\LibTriboroughBridge-ChorusPlugin.pdb"/>
 			</Component>
 			<Component Id="TriboroughBridgeChorusPlugin.dll" Guid="C1EE09F0-E382-11DE-8A39-0800200C9A66">
-			  <File Id="TriboroughBridgeChorusPlugin.dll" Name="TriboroughBridge-ChorusPlugin.dll" KeyPath="yes" Source="..\..\output\Release\TriboroughBridge-ChorusPlugin.dll"/>
+			  <File Id="TriboroughBridgeChorusPlugin.dll" Name="TriboroughBridge-ChorusPlugin.dll" KeyPath="yes" Source="..\..\output\Release\net462\TriboroughBridge-ChorusPlugin.dll"/>
 			</Component>
 			<Component Id="TriboroughBridgeChorusPlugin.pdb" Guid="C1EE09F1-E382-11DE-8A39-0800200C9A66">
-			  <File Id="TriboroughBridgeChorusPlugin.pdb" Name="TriboroughBridge-ChorusPlugin.pdb" KeyPath="yes" Source="..\..\output\Release\TriboroughBridge-ChorusPlugin.pdb"/>
+			  <File Id="TriboroughBridgeChorusPlugin.pdb" Name="TriboroughBridge-ChorusPlugin.pdb" KeyPath="yes" Source="..\..\output\Release\net462\TriboroughBridge-ChorusPlugin.pdb"/>
 			</Component>
 			<Component Id="RegInstallationDir" Guid="C1EDBBD7-E382-11DE-8A39-0800200C9A66">
 			  <RegistryKey Id="keyFLExBridge.exe" Action="createAndRemoveOnUninstall" Root="HKLM" Key="SOFTWARE\[MANUFACTURERREGKEY]\FLEX Bridge\9">
@@ -129,33 +129,33 @@ are trying to support, you're better off using non-advertised shortcuts. "-->
 
 			<!-- Desired Chorus pdb files not in the Chorus merge module. -->
 			<Component Id="Chorus.pdb" Guid="C1EDBBD4-E382-11DE-8A39-0800200C9A66">
-			  <File Id="Chorus.pdb" Name="Chorus.pdb" KeyPath="yes" Source="..\..\output\Release\Chorus.pdb"/>
+			  <File Id="Chorus.pdb" Name="Chorus.pdb" KeyPath="yes" Source="..\..\output\Release\net462\Chorus.pdb"/>
 			</Component>
 			<Component Id="ChorusMerge.pdb" Guid="C1EDBBD5-E382-11DE-8A39-0800200C9A66">
-			  <File Id="ChorusMerge.pdb" Name="ChorusMerge.pdb" KeyPath="yes" Source="..\..\output\Release\ChorusMerge.pdb"/>
+			  <File Id="ChorusMerge.pdb" Name="ChorusMerge.pdb" KeyPath="yes" Source="..\..\output\Release\net462\ChorusMerge.pdb"/>
 			</Component>
 			<Component Id="LibChorus.pdb" Guid="C1EDBBD6-E382-11DE-8A39-0800200C9A66">
-			  <File Id="LibChorus.pdb" Name="LibChorus.pdb" KeyPath="yes" Source="..\..\output\Release\LibChorus.pdb"/>
+			  <File Id="LibChorus.pdb" Name="LibChorus.pdb" KeyPath="yes" Source="..\..\output\Release\net462\LibChorus.pdb"/>
 			</Component>
 
 			<!-- Desired SIL pdb files not in the Chorus merge module. -->
 			<Component Id="SIL.Windows.Forms.pdb" Guid="0FBA86CD-E104-4117-A3DB-135C1FF22FEC">
-			 <File Id="SIL.Windows.Forms.pdb" Name="SIL.Windows.Forms.pdb" KeyPath="yes" Source="..\..\output\Release\SIL.Windows.Forms.pdb"/>
+			 <File Id="SIL.Windows.Forms.pdb" Name="SIL.Windows.Forms.pdb" KeyPath="yes" Source="..\..\output\Release\net462\SIL.Windows.Forms.pdb"/>
 			</Component>
 			<Component Id="SIL.Core.pdb" Guid="1C51C23E-DE70-4200-8D45-6795B95A706F">
-			 <File Id="SIL.Core.pdb" Name="SIL.Core.pdb" KeyPath="yes" Source="..\..\output\Release\SIL.Core.pdb"/>
+			 <File Id="SIL.Core.pdb" Name="SIL.Core.pdb" KeyPath="yes" Source="..\..\output\Release\net462\SIL.Core.pdb"/>
 			</Component>
 			<Component Id="SIL.Lift.pdb" Guid="6850EBC7-50B6-4B09-85D7-5DC7EEC39E76">
-			 <File Id="SIL.Lift.pdb" Name="SIL.Lift.pdb" KeyPath="yes" Source="..\..\output\Release\SIL.Lift.pdb"/>
+			 <File Id="SIL.Lift.pdb" Name="SIL.Lift.pdb" KeyPath="yes" Source="..\..\output\Release\net462\SIL.Lift.pdb"/>
 			</Component>
 
 
 			<Component Id="NetSparkle.Net40.dll" Guid="C1EE311B-E382-11DE-8A39-0800200C9A66">
-			  <File Id="NetSparkle.Net40.dll" Name="NetSparkle.Net40.dll" KeyPath="yes" Source="..\..\output\Release\NetSparkle.Net40.dll"/>
+			  <File Id="NetSparkle.Net40.dll" Name="NetSparkle.Net40.dll" KeyPath="yes" Source="..\..\output\Release\net462\NetSparkle.Net40.dll"/>
 			</Component>
 
 			<Component Id="L10NSharp.dll" Guid="C1EE581A-E382-11DE-8A39-0800200C9A66">
-			  <File Id="L10NSharp.dll" Name="L10NSharp.dll" KeyPath="yes" Source="..\..\output\Release\L10NSharp.dll"/>
+			  <File Id="L10NSharp.dll" Name="L10NSharp.dll" KeyPath="yes" Source="..\..\output\Release\net462\L10NSharp.dll"/>
 			</Component>
 
 			<Component Id="IPCFramework.dll" Guid="C1EE581D-E382-11DE-8A39-0800200C9A66">
@@ -227,7 +227,7 @@ are trying to support, you're better off using non-advertised shortcuts. "-->
 	  <ComponentGroupRef Id="DistFiles"/>
 	</Feature>
 
-	<Icon Id="FLExBridge.ico" SourceFile="..\..\output\Release\FLExBridge.exe"/>
+	<Icon Id="FLExBridge.ico" SourceFile="..\..\output\Release\net462\FLExBridge.exe"/>
 	<!-- what you see in add/remove programs control panel -->
 	<Property Id="ARPPRODUCTICON" Value="FLExBridge.ico"/>
   </Product>