Skip to content

Commit c17af66

Browse files
kornyskornys
committed
DEL remove netcore app from msi installer
1 parent 9c3ad89 commit c17af66

File tree

6 files changed

+88
-128
lines changed

6 files changed

+88
-128
lines changed

‎CliNetliteInstaller/CliNetliteInstaller.wixproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ProductVersion>3.10</ProductVersion>
77
<ProjectGuid>f13fb7ef-d892-4229-a1eb-8b595d71d64e</ProjectGuid>
88
<SchemaVersion>2.0</SchemaVersion>
9-
<OutputName>cli-netlite-2.0.0</OutputName>
9+
<OutputName>cli-netlite-2.0.1</OutputName>
1010
<OutputType>Package</OutputType>
1111
</PropertyGroup>
1212
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

‎CliNetliteInstaller/Product.wxs

Lines changed: 79 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,79 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<?define version="2.0.0.0"?>
3-
<?define UpgradeCode="a580c04f-caec-4e18-9134-c4b8f1c8f1be"?>
4-
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
5-
<Product Id="*"
6-
Name="cli-netlite"
7-
Language="1033"
8-
Version="$(var.version)"
9-
Manufacturer="David Kornel"
10-
UpgradeCode="$(var.UpgradeCode)">
11-
12-
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
13-
<Media Id="1" Cabinet="clinetlite.cab" EmbedCab="yes" />
14-
15-
<WixVariable Id="WixUILicenseRtf" Value="/LICENSE.rtf" />
16-
17-
<MajorUpgrade
18-
AllowDowngrades="no" DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit."
19-
AllowSameVersionUpgrades="yes"
20-
Schedule="afterInstallInitialize"
21-
/>
22-
23-
<UI>
24-
<UIRef Id="Custom_WixUI_Minimal"/>
25-
</UI>
26-
27-
<Feature Id="ProductFeature" Title="cli-netlite" Level="1">
28-
<ComponentGroupRef Id="ProductComponents" />
29-
</Feature>
30-
</Product>
31-
32-
<Fragment>
33-
<Directory Id="TARGETDIR" Name="SourceDir">
34-
<Directory Id="ProgramFilesFolder">
35-
<Directory Id="INSTALLFOLDER" Name="CliNetlite"/>
36-
</Directory>
37-
</Directory>
38-
</Fragment>
39-
40-
<Fragment>
41-
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
42-
<Component Id="SenderExe" Guid="36195613-0263-44f0-ac1a-0d3e33a5ed1d">
43-
<File Id="SenderExecutable" Source="..\Sender\bin\Debug\cli-netlite-sender.exe" KeyPath="yes" Vital="yes" System="yes"/>
44-
</Component>
45-
<Component Id="ReceiverExe" Guid="4ec83438-b3a8-4955-ba9b-a003efdd5ee1">
46-
<File Id="ReceiverExecutable" Source="..\Receiver\bin\Debug\cli-netlite-receiver.exe" KeyPath="yes" Vital="yes" System="yes"/>
47-
</Component>
48-
<Component Id="ConnectorExe" Guid="b146d03d-7942-4fd3-bdc4-245c25a95e4b">
49-
<File Id="ConnectorExecutable" Source="..\Connector\bin\Debug\cli-netlite-connector.exe" KeyPath="yes" Vital="yes" System="yes"/>
50-
</Component>
51-
<Component Id="ClientLib.dll">
52-
<File Id="ClientLib.dll" Source="..\ClientLib\bin\Debug\ClientLib.dll" KeyPath="yes" Checksum="yes"/>
53-
</Component>
54-
<Component Id="Amqp.Net.dll">
55-
<File Id="Amqp.Net.dll" Source="..\ClientLib\bin\Debug\Amqp.Net.dll" KeyPath="yes" Checksum="yes"/>
56-
</Component>
57-
<Component Id="NDesk.Options.dll">
58-
<File Id="NDesk.Options.dll" Source="..\ClientLib\bin\Debug\NDesk.Options.dll" KeyPath="yes" Checksum="yes"/>
59-
</Component>
60-
<Component Id="ClientLibNetCore.dll">
61-
<File Id="ClientLibNetCore.dll" Source="..\ClientLibNetCore\bin\Debug\netcoreapp2.0\ClientLibNetCore.dll" KeyPath="yes" Checksum="yes"/>
62-
</Component>
63-
<Component Id="NetCoreSender.dll">
64-
<File Id="SenderCoreExecutable.dll" Source="..\NetCoreSender\bin\Debug\netcoreapp2.0\cli-netlite-core-sender.dll" KeyPath="yes" Checksum="yes"/>
65-
</Component>
66-
<Component Id="NetCoreReceiver.dll">
67-
<File Id="ReceiverCoreExecutable.dll" Source="..\NetCoreReceiver\bin\Debug\netcoreapp2.0\cli-netlite-core-receiver.dll" KeyPath="yes" Checksum="yes"/>
68-
</Component>
69-
<Component Id="NetCoreConnector.dll">
70-
<File Id="ConnectorCoreExecutable.dll" Source="..\NetCoreConnector\bin\Debug\netcoreapp2.0\cli-netlite-core-connector.dll" KeyPath="yes" Checksum="yes"/>
71-
</Component>
72-
<Component Id="NetCoreSenderRunner.dll">
73-
<File Id="SenderCoreExecutableRunner.dll" Source="..\NetCoreSender\bin\Debug\netcoreapp2.0\cli-netlite-core-sender.runtimeconfig.json" KeyPath="yes" Checksum="yes"/>
74-
</Component>
75-
<Component Id="NetCoreReceiverRunner.dll">
76-
<File Id="ReceiverCoreExecutableRunner.dll" Source="..\NetCoreReceiver\bin\Debug\netcoreapp2.0\cli-netlite-core-receiver.runtimeconfig.json" KeyPath="yes" Checksum="yes"/>
77-
</Component>
78-
<Component Id="NetCoreConnectorRunner.dll">
79-
<File Id="ConnectorCoreExecutableRunner.dll" Source="..\NetCoreConnector\bin\Debug\netcoreapp2.0\cli-netlite-core-connector.runtimeconfig.json" KeyPath="yes" Checksum="yes"/>
80-
</Component>
81-
<Component Id="NetCoreSenderDeps.dll">
82-
<File Id="SenderCoreExecutableDeps.dll" Source="..\NetCoreSender\bin\Debug\netcoreapp2.0\cli-netlite-core-sender.deps.json" KeyPath="yes" Checksum="yes"/>
83-
</Component>
84-
<Component Id="NetCoreReceiverDeps.dll">
85-
<File Id="ReceiverCoreExecutableDeps.dll" Source="..\NetCoreReceiver\bin\Debug\netcoreapp2.0\cli-netlite-core-receiver.deps.json" KeyPath="yes" Checksum="yes"/>
86-
</Component>
87-
<Component Id="NetCoreConnectorDeps.dll">
88-
<File Id="ConnectorCoreExecutableDeps.dll" Source="..\NetCoreConnector\bin\Debug\netcoreapp2.0\cli-netlite-core-connector.deps.json" KeyPath="yes" Checksum="yes"/>
89-
</Component>
90-
<Component Id="jsonLib">
91-
<File Id="jsonLib" Source="../packages/Newtonsoft.Json.10.0.3/lib/netstandard1.3/Newtonsoft.Json.dll" KeyPath="yes" Checksum="yes"/>
92-
</Component>
93-
<Component Id="SetEnvPath"
94-
Guid="{016cb18d-0357-425b-90a8-caf1826ddee6}">
95-
<CreateFolder />
96-
<Environment Id="PATH" Name="PATH" Value="[INSTALLFOLDER]" Permanent="no" Part="last" Action="set" System="yes" />
97-
</Component>
98-
</ComponentGroup>
99-
</Fragment>
100-
101-
<Fragment>
102-
<Feature Id="MainApplication" Title="Main Application" Level="1">
103-
<ComponentRef Id="ClientLib.dll" />
104-
<ComponentRef Id="Amqp.Net.dll" />
105-
<ComponentRef Id="NDesk.Options.dll" />
106-
<ComponentRef Id="SenderExe" />
107-
<ComponentRef Id="ReceiverExe" />
108-
<ComponentRef Id="ConnectorExe"/>
109-
<ComponentRef Id="ClientLibNetCore.dll"/>
110-
<ComponentRef Id="SenderCoreExecutable.dll"/>
111-
<ComponentRef Id="ConnectorCoreExecutable.dll"/>
112-
<ComponentRef Id="ReceiverCoreExecutable.dll"/>
113-
<ComponentRef Id="SenderCoreExecutableRunner.dll"/>
114-
<ComponentRef Id="ConnectorCoreExecutableRunner.dll"/>
115-
<ComponentRef Id="ReceiverCoreExecutableRunner.dll"/>
116-
<ComponentRef Id="SenderCoreExecutableDeps.dll"/>
117-
<ComponentRef Id="ConnectorCoreExecutableDeps.dll"/>
118-
<ComponentRef Id="ReceiverCoreExecutableDeps.dll"/>
119-
<ComponentRef Id="jsonLib"/>
120-
</Feature>
121-
</Fragment>
122-
</Wix>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<?define version="2.0.1"?>
3+
<?define UpgradeCode="a580c04f-caec-4e18-9134-c4b8f1c8f1be"?>
4+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
5+
<Product Id="*"
6+
Name="cli-netlite"
7+
Language="1033"
8+
Version="$(var.version)"
9+
Manufacturer="David Kornel"
10+
UpgradeCode="$(var.UpgradeCode)">
11+
12+
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
13+
<Media Id="1" Cabinet="clinetlite.cab" EmbedCab="yes" />
14+
15+
<WixVariable Id="WixUILicenseRtf" Value="/LICENSE.rtf" />
16+
17+
<MajorUpgrade
18+
AllowDowngrades="no" DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit."
19+
AllowSameVersionUpgrades="yes"
20+
Schedule="afterInstallInitialize"
21+
/>
22+
23+
<UI>
24+
<UIRef Id="Custom_WixUI_Minimal"/>
25+
</UI>
26+
27+
<Feature Id="ProductFeature" Title="cli-netlite" Level="1">
28+
<ComponentGroupRef Id="ProductComponents" />
29+
</Feature>
30+
</Product>
31+
32+
<Fragment>
33+
<Directory Id="TARGETDIR" Name="SourceDir">
34+
<Directory Id="ProgramFilesFolder">
35+
<Directory Id="INSTALLFOLDER" Name="CliNetlite"/>
36+
</Directory>
37+
</Directory>
38+
</Fragment>
39+
40+
<Fragment>
41+
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
42+
<Component Id="SenderExe" Guid="36195613-0263-44f0-ac1a-0d3e33a5ed1d">
43+
<File Id="SenderExecutable" Source="..\Sender\bin\Debug\cli-netlite-sender.exe" KeyPath="yes" Vital="yes" System="yes"/>
44+
</Component>
45+
<Component Id="ReceiverExe" Guid="4ec83438-b3a8-4955-ba9b-a003efdd5ee1">
46+
<File Id="ReceiverExecutable" Source="..\Receiver\bin\Debug\cli-netlite-receiver.exe" KeyPath="yes" Vital="yes" System="yes"/>
47+
</Component>
48+
<Component Id="ConnectorExe" Guid="b146d03d-7942-4fd3-bdc4-245c25a95e4b">
49+
<File Id="ConnectorExecutable" Source="..\Connector\bin\Debug\cli-netlite-connector.exe" KeyPath="yes" Vital="yes" System="yes"/>
50+
</Component>
51+
<Component Id="ClientLib.dll">
52+
<File Id="ClientLib.dll" Source="..\ClientLib\bin\Debug\ClientLib.dll" KeyPath="yes" Checksum="yes"/>
53+
</Component>
54+
<Component Id="Amqp.Net.dll">
55+
<File Id="Amqp.Net.dll" Source="..\ClientLib\bin\Debug\Amqp.Net.dll" KeyPath="yes" Checksum="yes"/>
56+
</Component>
57+
<Component Id="NDesk.Options.dll">
58+
<File Id="NDesk.Options.dll" Source="..\ClientLib\bin\Debug\NDesk.Options.dll" KeyPath="yes" Checksum="yes"/>
59+
</Component>
60+
<Component Id="SetEnvPath"
61+
Guid="{016cb18d-0357-425b-90a8-caf1826ddee6}">
62+
<CreateFolder />
63+
<Environment Id="PATH" Name="PATH" Value="[INSTALLFOLDER]" Permanent="no" Part="last" Action="set" System="yes" />
64+
</Component>
65+
</ComponentGroup>
66+
</Fragment>
67+
68+
<Fragment>
69+
<Feature Id="MainApplication" Title="Main Application" Level="1">
70+
<ComponentRef Id="ClientLib.dll" />
71+
<ComponentRef Id="Amqp.Net.dll" />
72+
<ComponentRef Id="NDesk.Options.dll" />
73+
<ComponentRef Id="SenderExe" />
74+
<ComponentRef Id="ReceiverExe" />
75+
<ComponentRef Id="ConnectorExe"/>
76+
</Feature>
77+
</Fragment>
78+
79+
</Wix>

‎ClientLibNetCore/ClientLibNetCore.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="amqpnetlite" Version="2.1.1" />
10-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
9+
<PackageReference Include="AMQPNetLite" Version="2.1.2" />
10+
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
1111
</ItemGroup>
1212

1313
</Project>

‎NetCoreConnector/NetCoreConnector.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<OutputType>Exe</OutputType>
55
<TargetFramework>netcoreapp2.0</TargetFramework>
66
<AssemblyName>cli-netlite-core-connector</AssemblyName>
7-
<Version>2.0.0</Version>
7+
<Version>2.0.1</Version>
8+
<RuntimeIdentifiers>win7-x64;ubuntu.16.10-x64;osx.10.12-x64;rhel.7-x64</RuntimeIdentifiers>
89
</PropertyGroup>
910

1011
<ItemGroup>

‎NetCoreReceiver/NetCoreReceiver.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<OutputType>Exe</OutputType>
55
<TargetFramework>netcoreapp2.0</TargetFramework>
66
<AssemblyName>cli-netlite-core-receiver</AssemblyName>
7-
<Version>2.0.0</Version>
7+
<Version>2.0.1</Version>
8+
<RuntimeIdentifiers>win7-x64;ubuntu.16.10-x64;osx.10.12-x64;rhel.7-x64</RuntimeIdentifiers>
89
</PropertyGroup>
910

1011
<ItemGroup>

‎NetCoreSender/NetCoreSender.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<OutputType>Exe</OutputType>
55
<TargetFramework>netcoreapp2.0</TargetFramework>
66
<AssemblyName>cli-netlite-core-sender</AssemblyName>
7-
<Version>2.0.0</Version>
7+
<Version>2.0.1</Version>
8+
<RuntimeIdentifiers>win7-x64;ubuntu.16.10-x64;osx.10.12-x64;rhel.7-x64</RuntimeIdentifiers>
89
</PropertyGroup>
910

1011
<ItemGroup>

0 commit comments

Comments
 (0)