Skip to content

Commit 7b28cbd

Browse files
kornyskornys
committed
NEW: Add installer project
1 parent aa2f357 commit 7b28cbd

File tree

4 files changed

+154
-14
lines changed

4 files changed

+154
-14
lines changed

‎.gitignore

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
Sender/bin/
2-
Sender/obj/
3-
Receiver/bin/
4-
Receiver/obj/
5-
Connector/bin/
1+
Sender/bin/
2+
Sender/obj/
3+
Receiver/bin/
4+
Receiver/obj/
5+
Connector/bin/
66
Connector/obj/
7-
ClientLib/bin/
8-
ClientLib/obj/
9-
ClientUnitTests/bin/
10-
ClientUnitTests/obj/
11-
.vs/
12-
.vscode/
13-
packages/
7+
ClientLib/bin/
8+
ClientLib/obj/
9+
ClientUnitTests/bin/
10+
ClientUnitTests/obj/
11+
CliNetliteInstaller/bin/
12+
CliNetliteInstaller/obj/
13+
.vs/
14+
.vscode/
15+
packages/

‎CliNetliteInstaller/CliNetliteInstaller.wixproj

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6+
<ProductVersion>3.10</ProductVersion>
7+
<ProjectGuid>f13fb7ef-d892-4229-a1eb-8b595d71d64e</ProjectGuid>
8+
<SchemaVersion>2.0</SchemaVersion>
9+
<OutputName>cli-netlite</OutputName>
10+
<OutputType>Package</OutputType>
11+
</PropertyGroup>
12+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
13+
<OutputPath>bin\$(Configuration)\</OutputPath>
14+
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
15+
<DefineConstants>Debug</DefineConstants>
16+
</PropertyGroup>
17+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
18+
<OutputPath>bin\$(Configuration)\</OutputPath>
19+
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
20+
</PropertyGroup>
21+
<ItemGroup>
22+
<Compile Include="Product.wxs" />
23+
</ItemGroup>
24+
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
25+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
26+
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
27+
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
28+
</Target>
29+
<!--
30+
To modify your build process, add your task inside one of the targets below and uncomment it.
31+
Other similar extension points exist, see Wix.targets.
32+
<Target Name="BeforeBuild">
33+
</Target>
34+
<Target Name="AfterBuild">
35+
</Target>
36+
-->
37+
</Project>

‎CliNetliteInstaller/Product.wxs

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3+
<Product Id="712c71fd-c6f1-41a6-a634-b6d0a8769002"
4+
Name="cli-netlite"
5+
Language="1033"
6+
Version="1.0.0.0"
7+
Manufacturer="David Kornel"
8+
UpgradeCode="a580c04f-caec-4e18-9134-c4b8f1c8f1be">
9+
10+
11+
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
12+
<Media Id="1" Cabinet="clinetlite.cab" EmbedCab="yes" />
13+
14+
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
15+
16+
17+
<Feature Id="ProductFeature" Title="cli-netlite" Level="1">
18+
<ComponentGroupRef Id="ProductComponents" />
19+
</Feature>
20+
</Product>
21+
22+
<Fragment>
23+
<Directory Id="TARGETDIR" Name="SourceDir">
24+
<Directory Id="ProgramFilesFolder">
25+
<Directory Id="INSTALLFOLDER" Name="CliNetlite" />
26+
</Directory>
27+
</Directory>
28+
</Fragment>
29+
30+
<Fragment>
31+
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
32+
<Component Id="SenderExe" Guid="36195613-0263-44f0-ac1a-0d3e33a5ed1d">
33+
<File Id="SenderExecutable" Source="..\Sender\bin\Debug\cli-netlite-sender.exe" KeyPath="yes" Vital="yes" System="yes"/>
34+
</Component>
35+
<Component Id="ReceiverExe" Guid="4ec83438-b3a8-4955-ba9b-a003efdd5ee1">
36+
<File Id="ReceiverExecutable" Source="..\Receiver\bin\Debug\cli-netlite-receiver.exe" KeyPath="yes" Vital="yes" System="yes"/>
37+
</Component>
38+
<Component Id="ConnectorExe" Guid="b146d03d-7942-4fd3-bdc4-245c25a95e4b">
39+
<File Id="ConnectorExecutable" Source="..\Connector\bin\Debug\cli-netlite-connector.exe" KeyPath="yes" Vital="yes" System="yes"/>
40+
</Component>
41+
<Component Id="ClientLib.dll">
42+
<File Id="ClientLib.dll" Source="..\ClientLib\bin\Debug\ClientLib.dll" KeyPath="yes" Checksum="yes"/>
43+
</Component>
44+
<Component Id="Amqp.Net.dll">
45+
<File Id="Amqp.Net.dll" Source="..\ClientLib\bin\Debug\Amqp.Net.dll" KeyPath="yes" Checksum="yes"/>
46+
</Component>
47+
<Component Id="NDesk.Options.dll">
48+
<File Id="NDesk.Options.dll" Source="..\ClientLib\bin\Debug\NDesk.Options.dll" KeyPath="yes" Checksum="yes"/>
49+
</Component>
50+
</ComponentGroup>
51+
</Fragment>
52+
53+
54+
<Fragment>
55+
<Feature Id="MainApplication" Title="Main Application" Level="1">
56+
<ComponentRef Id="ClientLib.dll" />
57+
<ComponentRef Id="Amqp.Net.dll" />
58+
<ComponentRef Id="NDesk.Options.dll" />
59+
<ComponentRef Id="SenderExe" />
60+
<ComponentRef Id="ReceiverExe" />
61+
<ComponentRef Id="ConnectorExe"/>
62+
</Feature>
63+
</Fragment>
64+
</Wix>

‎cli-netlite.sln

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Express 14 for Windows Desktop
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26403.7
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClientLib", "ClientLib\ClientLib.csproj", "{6DC6D0F4-85F4-4380-9C49-FF26BC83D000}"
77
EndProject
@@ -20,32 +20,69 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2020
README.md = README.md
2121
EndProjectSection
2222
EndProject
23+
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "CliNetliteInstaller", "CliNetliteInstaller\CliNetliteInstaller.wixproj", "{F13FB7EF-D892-4229-A1EB-8B595D71D64E}"
24+
ProjectSection(ProjectDependencies) = postProject
25+
{1BC98F0E-A5AC-4357-8E5A-DE29F3F1D6DD} = {1BC98F0E-A5AC-4357-8E5A-DE29F3F1D6DD}
26+
{DCCA0C42-BECD-4445-9062-570C6ABC402C} = {DCCA0C42-BECD-4445-9062-570C6ABC402C}
27+
{949EBADD-2826-40F2-AF8F-462AC1AB6BF3} = {949EBADD-2826-40F2-AF8F-462AC1AB6BF3}
28+
{6DC6D0F4-85F4-4380-9C49-FF26BC83D000} = {6DC6D0F4-85F4-4380-9C49-FF26BC83D000}
29+
EndProjectSection
30+
EndProject
2331
Global
2432
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2533
Debug|Any CPU = Debug|Any CPU
34+
Debug|x86 = Debug|x86
2635
Release|Any CPU = Release|Any CPU
36+
Release|x86 = Release|x86
2737
EndGlobalSection
2838
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2939
{6DC6D0F4-85F4-4380-9C49-FF26BC83D000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3040
{6DC6D0F4-85F4-4380-9C49-FF26BC83D000}.Debug|Any CPU.Build.0 = Debug|Any CPU
41+
{6DC6D0F4-85F4-4380-9C49-FF26BC83D000}.Debug|x86.ActiveCfg = Debug|Any CPU
42+
{6DC6D0F4-85F4-4380-9C49-FF26BC83D000}.Debug|x86.Build.0 = Debug|Any CPU
3143
{6DC6D0F4-85F4-4380-9C49-FF26BC83D000}.Release|Any CPU.ActiveCfg = Release|Any CPU
3244
{6DC6D0F4-85F4-4380-9C49-FF26BC83D000}.Release|Any CPU.Build.0 = Release|Any CPU
45+
{6DC6D0F4-85F4-4380-9C49-FF26BC83D000}.Release|x86.ActiveCfg = Release|Any CPU
46+
{6DC6D0F4-85F4-4380-9C49-FF26BC83D000}.Release|x86.Build.0 = Release|Any CPU
3347
{DCCA0C42-BECD-4445-9062-570C6ABC402C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3448
{DCCA0C42-BECD-4445-9062-570C6ABC402C}.Debug|Any CPU.Build.0 = Debug|Any CPU
49+
{DCCA0C42-BECD-4445-9062-570C6ABC402C}.Debug|x86.ActiveCfg = Debug|Any CPU
50+
{DCCA0C42-BECD-4445-9062-570C6ABC402C}.Debug|x86.Build.0 = Debug|Any CPU
3551
{DCCA0C42-BECD-4445-9062-570C6ABC402C}.Release|Any CPU.ActiveCfg = Release|Any CPU
3652
{DCCA0C42-BECD-4445-9062-570C6ABC402C}.Release|Any CPU.Build.0 = Release|Any CPU
53+
{DCCA0C42-BECD-4445-9062-570C6ABC402C}.Release|x86.ActiveCfg = Release|Any CPU
54+
{DCCA0C42-BECD-4445-9062-570C6ABC402C}.Release|x86.Build.0 = Release|Any CPU
3755
{949EBADD-2826-40F2-AF8F-462AC1AB6BF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3856
{949EBADD-2826-40F2-AF8F-462AC1AB6BF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
57+
{949EBADD-2826-40F2-AF8F-462AC1AB6BF3}.Debug|x86.ActiveCfg = Debug|Any CPU
58+
{949EBADD-2826-40F2-AF8F-462AC1AB6BF3}.Debug|x86.Build.0 = Debug|Any CPU
3959
{949EBADD-2826-40F2-AF8F-462AC1AB6BF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
4060
{949EBADD-2826-40F2-AF8F-462AC1AB6BF3}.Release|Any CPU.Build.0 = Release|Any CPU
61+
{949EBADD-2826-40F2-AF8F-462AC1AB6BF3}.Release|x86.ActiveCfg = Release|Any CPU
62+
{949EBADD-2826-40F2-AF8F-462AC1AB6BF3}.Release|x86.Build.0 = Release|Any CPU
4163
{1BC98F0E-A5AC-4357-8E5A-DE29F3F1D6DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4264
{1BC98F0E-A5AC-4357-8E5A-DE29F3F1D6DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
65+
{1BC98F0E-A5AC-4357-8E5A-DE29F3F1D6DD}.Debug|x86.ActiveCfg = Debug|Any CPU
66+
{1BC98F0E-A5AC-4357-8E5A-DE29F3F1D6DD}.Debug|x86.Build.0 = Debug|Any CPU
4367
{1BC98F0E-A5AC-4357-8E5A-DE29F3F1D6DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
4468
{1BC98F0E-A5AC-4357-8E5A-DE29F3F1D6DD}.Release|Any CPU.Build.0 = Release|Any CPU
69+
{1BC98F0E-A5AC-4357-8E5A-DE29F3F1D6DD}.Release|x86.ActiveCfg = Release|Any CPU
70+
{1BC98F0E-A5AC-4357-8E5A-DE29F3F1D6DD}.Release|x86.Build.0 = Release|Any CPU
4571
{6933B020-918B-49DA-A072-4C60C080C2C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4672
{6933B020-918B-49DA-A072-4C60C080C2C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
73+
{6933B020-918B-49DA-A072-4C60C080C2C8}.Debug|x86.ActiveCfg = Debug|Any CPU
74+
{6933B020-918B-49DA-A072-4C60C080C2C8}.Debug|x86.Build.0 = Debug|Any CPU
4775
{6933B020-918B-49DA-A072-4C60C080C2C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
4876
{6933B020-918B-49DA-A072-4C60C080C2C8}.Release|Any CPU.Build.0 = Release|Any CPU
77+
{6933B020-918B-49DA-A072-4C60C080C2C8}.Release|x86.ActiveCfg = Release|Any CPU
78+
{6933B020-918B-49DA-A072-4C60C080C2C8}.Release|x86.Build.0 = Release|Any CPU
79+
{F13FB7EF-D892-4229-A1EB-8B595D71D64E}.Debug|Any CPU.ActiveCfg = Debug|x86
80+
{F13FB7EF-D892-4229-A1EB-8B595D71D64E}.Debug|Any CPU.Build.0 = Debug|x86
81+
{F13FB7EF-D892-4229-A1EB-8B595D71D64E}.Debug|x86.ActiveCfg = Debug|x86
82+
{F13FB7EF-D892-4229-A1EB-8B595D71D64E}.Debug|x86.Build.0 = Debug|x86
83+
{F13FB7EF-D892-4229-A1EB-8B595D71D64E}.Release|Any CPU.ActiveCfg = Release|x86
84+
{F13FB7EF-D892-4229-A1EB-8B595D71D64E}.Release|x86.ActiveCfg = Release|x86
85+
{F13FB7EF-D892-4229-A1EB-8B595D71D64E}.Release|x86.Build.0 = Release|x86
4986
EndGlobalSection
5087
GlobalSection(SolutionProperties) = preSolution
5188
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)