Skip to content

Commit d7cc4fe

Browse files
jasonleenaylorjasonleenaylor
committed
Update file paths for the Installer build
1 parent 19fffab commit d7cc4fe

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

‎src/Installer/Installer.wxs‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -83,43 +83,43 @@ are trying to support, you're better off using non-advertised shortcuts. "-->
8383
<Directory Id="INSTALLDIR" Name="FLEx Bridge">
8484
<!-- Main bridge assemblies -->
8585
<Component Id="FLExBridge.exe" Guid="3D9BF2DF-4A25-11DF-9879-0800200C9A66">
86-
<File Id="FLExBridge.exe" Name="FLExBridge.exe" Source="..\..\output\Release\FLExBridge.exe"/>
86+
<File Id="FLExBridge.exe" Name="FLExBridge.exe" Source="..\..\output\Release\net462\FLExBridge.exe"/>
8787
</Component>
8888
<Component Id="FLExBridge.pdb" Guid="C1EDBBD2-E382-11DE-8A39-0800200C9A66">
89-
<File Id="FLExBridge.pdb" Name="FLExBridge.pdb" KeyPath="yes" Source="..\..\output\Release\FLExBridge.pdb"/>
89+
<File Id="FLExBridge.pdb" Name="FLExBridge.pdb" KeyPath="yes" Source="..\..\output\Release\net462\FLExBridge.pdb"/>
9090
</Component>
9191
<Component Id="app.config" Guid="C1EE581C-E382-11DE-8A39-0800200C9A66">
92-
<File Id="app.config" Name="app.config" Source="..\..\output\Release\app.config"/>
92+
<File Id="app.config" Name="app.config" Source="..\..\output\Release\net462\app.config"/>
9393
</Component>
9494
<Component Id="FLExChorusPlugin.dll" Guid="C1ED6DB1-E382-11DE-8A39-0800200C9A66">
95-
<File Id="FLExChorusPlugin.dll" Name="FLEx-ChorusPlugin.dll" KeyPath="yes" Source="..\..\output\Release\FLEx-ChorusPlugin.dll"/>
95+
<File Id="FLExChorusPlugin.dll" Name="FLEx-ChorusPlugin.dll" KeyPath="yes" Source="..\..\output\Release\net462\FLEx-ChorusPlugin.dll"/>
9696
</Component>
9797
<Component Id="FLExChorusPlugin.pdb" Guid="C1EDBBD3-E382-11DE-8A39-0800200C9A66">
98-
<File Id="FLExChorusPlugin.pdb" Name="FLEx-ChorusPlugin.pdb" KeyPath="yes" Source="..\..\output\Release\FLEx-ChorusPlugin.pdb"/>
98+
<File Id="FLExChorusPlugin.pdb" Name="FLEx-ChorusPlugin.pdb" KeyPath="yes" Source="..\..\output\Release\net462\FLEx-ChorusPlugin.pdb"/>
9999
</Component>
100100
<Component Id="LibFLExBridgeChorusPlugin.dll" Guid="5A362239-BD5F-44A2-9CEC-C18422785D20">
101-
<File Id="LibFLExBridgeChorusPlugin.dll" Name="LibFLExBridge-ChorusPlugin.dll" KeyPath="yes" Source="..\..\output\Release\LibFLExBridge-ChorusPlugin.dll"/>
101+
<File Id="LibFLExBridgeChorusPlugin.dll" Name="LibFLExBridge-ChorusPlugin.dll" KeyPath="yes" Source="..\..\output\Release\net462\LibFLExBridge-ChorusPlugin.dll"/>
102102
</Component>
103103
<Component Id="LibFLExBridgeChorusPlugin.pdb" Guid="CE3E02A1-8534-4DB5-BF93-DF484B8EA09F">
104-
<File Id="LibFLExBridgeChorusPlugin.pdb" Name="LibFLExBridge-ChorusPlugin.pdb" KeyPath="yes" Source="..\..\output\Release\LibFLExBridge-ChorusPlugin.pdb"/>
104+
<File Id="LibFLExBridgeChorusPlugin.pdb" Name="LibFLExBridge-ChorusPlugin.pdb" KeyPath="yes" Source="..\..\output\Release\net462\LibFLExBridge-ChorusPlugin.pdb"/>
105105
</Component>
106106
<Component Id="LiftBridgeChorusPlugin.dll" Guid="C1EDE2FA-E382-11DE-8A39-0800200C9A66">
107-
<File Id="LiftBridgeChorusPlugin.dll" Name="LiftBridge-ChorusPlugin.dll" KeyPath="yes" Source="..\..\output\Release\LiftBridge-ChorusPlugin.dll"/>
107+
<File Id="LiftBridgeChorusPlugin.dll" Name="LiftBridge-ChorusPlugin.dll" KeyPath="yes" Source="..\..\output\Release\net462\LiftBridge-ChorusPlugin.dll"/>
108108
</Component>
109109
<Component Id="LiftBridgeChorusPlugin.pdb" Guid="C1EDE2FB-E382-11DE-8A39-0800200C9A66">
110-
<File Id="LiftBridgeChorusPlugin.pdb" Name="LiftBridge-ChorusPlugin.pdb" KeyPath="yes" Source="..\..\output\Release\LiftBridge-ChorusPlugin.pdb"/>
110+
<File Id="LiftBridgeChorusPlugin.pdb" Name="LiftBridge-ChorusPlugin.pdb" KeyPath="yes" Source="..\..\output\Release\net462\LiftBridge-ChorusPlugin.pdb"/>
111111
</Component>
112112
<Component Id="LibTriboroughBridgeChorusPlugin.dll" Guid="631D0647-1441-4D69-9CC4-5557006BE8C2">
113-
<File Id="LibTriboroughBridgeChorusPlugin.dll" Name="LibTriboroughBridge-ChorusPlugin.dll" KeyPath="yes" Source="..\..\output\Release\LibTriboroughBridge-ChorusPlugin.dll"/>
113+
<File Id="LibTriboroughBridgeChorusPlugin.dll" Name="LibTriboroughBridge-ChorusPlugin.dll" KeyPath="yes" Source="..\..\output\Release\net462\LibTriboroughBridge-ChorusPlugin.dll"/>
114114
</Component>
115115
<Component Id="LibTriboroughBridgeChorusPlugin.pdb" Guid="91548EC8-AA95-4E10-8C35-6B02DD638A80">
116-
<File Id="LibTriboroughBridgeChorusPlugin.pdb" Name="LibTriboroughBridge-ChorusPlugin.pdb" KeyPath="yes" Source="..\..\output\Release\LibTriboroughBridge-ChorusPlugin.pdb"/>
116+
<File Id="LibTriboroughBridgeChorusPlugin.pdb" Name="LibTriboroughBridge-ChorusPlugin.pdb" KeyPath="yes" Source="..\..\output\Release\net462\LibTriboroughBridge-ChorusPlugin.pdb"/>
117117
</Component>
118118
<Component Id="TriboroughBridgeChorusPlugin.dll" Guid="C1EE09F0-E382-11DE-8A39-0800200C9A66">
119-
<File Id="TriboroughBridgeChorusPlugin.dll" Name="TriboroughBridge-ChorusPlugin.dll" KeyPath="yes" Source="..\..\output\Release\TriboroughBridge-ChorusPlugin.dll"/>
119+
<File Id="TriboroughBridgeChorusPlugin.dll" Name="TriboroughBridge-ChorusPlugin.dll" KeyPath="yes" Source="..\..\output\Release\net462\TriboroughBridge-ChorusPlugin.dll"/>
120120
</Component>
121121
<Component Id="TriboroughBridgeChorusPlugin.pdb" Guid="C1EE09F1-E382-11DE-8A39-0800200C9A66">
122-
<File Id="TriboroughBridgeChorusPlugin.pdb" Name="TriboroughBridge-ChorusPlugin.pdb" KeyPath="yes" Source="..\..\output\Release\TriboroughBridge-ChorusPlugin.pdb"/>
122+
<File Id="TriboroughBridgeChorusPlugin.pdb" Name="TriboroughBridge-ChorusPlugin.pdb" KeyPath="yes" Source="..\..\output\Release\net462\TriboroughBridge-ChorusPlugin.pdb"/>
123123
</Component>
124124
<Component Id="RegInstallationDir" Guid="C1EDBBD7-E382-11DE-8A39-0800200C9A66">
125125
<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. "-->
129129

130130
<!-- Desired Chorus pdb files not in the Chorus merge module. -->
131131
<Component Id="Chorus.pdb" Guid="C1EDBBD4-E382-11DE-8A39-0800200C9A66">
132-
<File Id="Chorus.pdb" Name="Chorus.pdb" KeyPath="yes" Source="..\..\output\Release\Chorus.pdb"/>
132+
<File Id="Chorus.pdb" Name="Chorus.pdb" KeyPath="yes" Source="..\..\output\Release\net462\Chorus.pdb"/>
133133
</Component>
134134
<Component Id="ChorusMerge.pdb" Guid="C1EDBBD5-E382-11DE-8A39-0800200C9A66">
135-
<File Id="ChorusMerge.pdb" Name="ChorusMerge.pdb" KeyPath="yes" Source="..\..\output\Release\ChorusMerge.pdb"/>
135+
<File Id="ChorusMerge.pdb" Name="ChorusMerge.pdb" KeyPath="yes" Source="..\..\output\Release\net462\ChorusMerge.pdb"/>
136136
</Component>
137137
<Component Id="LibChorus.pdb" Guid="C1EDBBD6-E382-11DE-8A39-0800200C9A66">
138-
<File Id="LibChorus.pdb" Name="LibChorus.pdb" KeyPath="yes" Source="..\..\output\Release\LibChorus.pdb"/>
138+
<File Id="LibChorus.pdb" Name="LibChorus.pdb" KeyPath="yes" Source="..\..\output\Release\net462\LibChorus.pdb"/>
139139
</Component>
140140

141141
<!-- Desired SIL pdb files not in the Chorus merge module. -->
142142
<Component Id="SIL.Windows.Forms.pdb" Guid="0FBA86CD-E104-4117-A3DB-135C1FF22FEC">
143-
<File Id="SIL.Windows.Forms.pdb" Name="SIL.Windows.Forms.pdb" KeyPath="yes" Source="..\..\output\Release\SIL.Windows.Forms.pdb"/>
143+
<File Id="SIL.Windows.Forms.pdb" Name="SIL.Windows.Forms.pdb" KeyPath="yes" Source="..\..\output\Release\net462\SIL.Windows.Forms.pdb"/>
144144
</Component>
145145
<Component Id="SIL.Core.pdb" Guid="1C51C23E-DE70-4200-8D45-6795B95A706F">
146-
<File Id="SIL.Core.pdb" Name="SIL.Core.pdb" KeyPath="yes" Source="..\..\output\Release\SIL.Core.pdb"/>
146+
<File Id="SIL.Core.pdb" Name="SIL.Core.pdb" KeyPath="yes" Source="..\..\output\Release\net462\SIL.Core.pdb"/>
147147
</Component>
148148
<Component Id="SIL.Lift.pdb" Guid="6850EBC7-50B6-4B09-85D7-5DC7EEC39E76">
149-
<File Id="SIL.Lift.pdb" Name="SIL.Lift.pdb" KeyPath="yes" Source="..\..\output\Release\SIL.Lift.pdb"/>
149+
<File Id="SIL.Lift.pdb" Name="SIL.Lift.pdb" KeyPath="yes" Source="..\..\output\Release\net462\SIL.Lift.pdb"/>
150150
</Component>
151151

152152

153153
<Component Id="NetSparkle.Net40.dll" Guid="C1EE311B-E382-11DE-8A39-0800200C9A66">
154-
<File Id="NetSparkle.Net40.dll" Name="NetSparkle.Net40.dll" KeyPath="yes" Source="..\..\output\Release\NetSparkle.Net40.dll"/>
154+
<File Id="NetSparkle.Net40.dll" Name="NetSparkle.Net40.dll" KeyPath="yes" Source="..\..\output\Release\net462\NetSparkle.Net40.dll"/>
155155
</Component>
156156

157157
<Component Id="L10NSharp.dll" Guid="C1EE581A-E382-11DE-8A39-0800200C9A66">
158-
<File Id="L10NSharp.dll" Name="L10NSharp.dll" KeyPath="yes" Source="..\..\output\Release\L10NSharp.dll"/>
158+
<File Id="L10NSharp.dll" Name="L10NSharp.dll" KeyPath="yes" Source="..\..\output\Release\net462\L10NSharp.dll"/>
159159
</Component>
160160

161161
<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. "-->
227227
<ComponentGroupRef Id="DistFiles"/>
228228
</Feature>
229229

230-
<Icon Id="FLExBridge.ico" SourceFile="..\..\output\Release\FLExBridge.exe"/>
230+
<Icon Id="FLExBridge.ico" SourceFile="..\..\output\Release\net462\FLExBridge.exe"/>
231231
<!-- what you see in add/remove programs control panel -->
232232
<Property Id="ARPPRODUCTICON" Value="FLExBridge.ico"/>
233233
</Product>

0 commit comments

Comments
 (0)