Skip to content

Commit 3403d56

Browse files
committed
Centralize build output and update WiX GUIDs
1 parent 940e753 commit 3403d56

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

src/SecondaryClick.Installer/C_SecondaryClickComponents.wxs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
</Fragment>
66
<Fragment>
77
<ComponentGroup Id="SecondaryClickComponents">
8-
<Component Id="cmpD19802B06115E097B82E6F79408558EF" Directory="INSTALLFOLDER" Guid="47BDE558-3271-4744-B666-39A0A7B73E60">
8+
<Component Id="cmpD19802B06115E097B82E6F79408558EF" Directory="INSTALLFOLDER" Guid="D8122321-D7CA-4CF9-BC93-57412A21806F">
99
<File Id="fil978DECC154F6EDA86754D7F9EA76EAB4" KeyPath="yes" Source="$(var.PackageDir)\ClearRegistry.bat" />
1010
</Component>
11-
<Component Id="cmpFD4AAFCE6CF156B546A89AAB6C625E9E" Directory="INSTALLFOLDER" Guid="500C4481-D4F4-4C33-A9D4-FA1933D33C4B">
11+
<Component Id="cmpFD4AAFCE6CF156B546A89AAB6C625E9E" Directory="INSTALLFOLDER" Guid="F2D2C98F-8200-4249-B1D0-964BAE772367">
1212
<File Id="fil5C0FC61BF17FC93AA827C79BE98103F9" KeyPath="yes" Source="$(var.PackageDir)\ExitProgram.bat" />
1313
</Component>
14-
<Component Id="cmpA33705521F2F2AEF738C77A6F1ECF3F2" Directory="INSTALLFOLDER" Guid="9A5B235D-CAEC-48E2-B781-ABD96716BB17">
14+
<Component Id="cmpA33705521F2F2AEF738C77A6F1ECF3F2" Directory="INSTALLFOLDER" Guid="F9851A96-50EC-4738-B933-F2648DD9D765">
1515
<File Id="fil56DAD60E70E0A9998E514FC7477738DF" KeyPath="yes" Source="$(var.PackageDir)\RestoreTrayIcon.bat" />
1616
</Component>
17-
<Component Id="cmpEE7B57D3B03BA030B5B9FEF1EF3B0EE8" Directory="INSTALLFOLDER" Guid="BBCCC138-A74D-4F6F-AFA8-6C822D5DC4DE">
17+
<Component Id="cmpEE7B57D3B03BA030B5B9FEF1EF3B0EE8" Directory="INSTALLFOLDER" Guid="78879A99-32EF-4321-B554-A4D58AD6825B">
1818
<File Id="fil1F73E7948DC0DAC391A5407778FA4FC5" KeyPath="yes" Source="$(var.PackageDir)\SecondaryClick.exe" />
1919
</Component>
20-
<Component Id="cmpC3307578820D1E602DBB8632C1B03CF2" Directory="INSTALLFOLDER" Guid="98D38F4E-774D-46C7-9058-37DF4CE56DE0">
20+
<Component Id="cmpC3307578820D1E602DBB8632C1B03CF2" Directory="INSTALLFOLDER" Guid="449AEBD0-E56D-4BA4-88B6-42B63B76F5E7">
2121
<File Id="fil4D52B2CFB8EEFC2EC0FB781DD03C7A79" KeyPath="yes" Source="$(var.PackageDir)\SecondaryClick.exe.config" />
2222
</Component>
2323
</ComponentGroup>

src/SecondaryClick.Installer/SecondaryClick.Installer.wixproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<OutputPath>..\..\build\</OutputPath>
1212
<LangVersion>latest</LangVersion>
1313
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
14-
<PackageDir>$(MSBuildThisFileDirectory)..\SecondaryClick\bin\$(Configuration)\net48</PackageDir>
14+
<PackageDir>$(MSBuildThisFileDirectory)..\..\build\$(Configuration)</PackageDir>
1515
</PropertyGroup>
1616
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
1717
<DefineConstants>Debug;PackageDir=$(PackageDir)</DefineConstants>

src/SecondaryClick/SecondaryClick.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<ApplicationIcon>logo.ico</ApplicationIcon>
1414
<ApplicationManifest>app.manifest</ApplicationManifest>
1515
<DebugType>embedded</DebugType>
16+
<BaseOutputPath>..\..\build</BaseOutputPath>
17+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1618
</PropertyGroup>
1719

1820
<ItemGroup>

0 commit comments

Comments
 (0)