Skip to content

Commit 3d931ec

Browse files
author
Emile Joubert
committed
Add RabbitMQ.Client.xml to installer payload and update manufacturer
1 parent 572f9f7 commit 3d931ec

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

dist.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ function dist-target-framework {
231231
$MSBUILD RabbitMQDotNetClient.sln /t:Build /property:Configuration="Release"
232232

233233
### Copy bin files to be zipped to tmp/dist/
234+
cp projects/client/RabbitMQ.Client/build/bin/RabbitMQ.Client.xml tmp/dist/bin/
234235
cp projects/client/RabbitMQ.Client/build/bin/RabbitMQ.Client.dll tmp/dist/bin/
235236
for example in $(ls projects/examples/client); do
236237
cp projects/examples/client/$example/build/bin/$example.exe tmp/dist/bin/

wix/dotnet-client-merge-module.wxs.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
33
<Module Id='DotNetClientModule' Guid='97DB49A3-B75E-4AE1-B01A-DFC8E335F866' Language='1033' Codepage='1252' Version='@VERSION@'>
4-
<Package Id='????????-????-????-????-????????????' Description='RabbitMQ .NET Client @VERSION@' Manufacturer='LShift Ltd.' InstallerVersion='150' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
4+
<Package Id='????????-????-????-????-????????????' Description='RabbitMQ .NET Client @VERSION@' Manufacturer='Rabbit Technologies Ltd.' InstallerVersion='150' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
55

66
<Directory Id='TARGETDIR' Name='SourceDir'>
77
<!-- Note that RabbitMQ.Client.dll has to appear twice
@@ -18,6 +18,7 @@
1818
<Component Id='ClientLibraryBin' Guid='83A1DE00-CCB6-42C2-BD14-FBAEDDBC50E8'>
1919
<CreateFolder />
2020
<File Id='RabbitMQClientDllBin' Name='RMQClnt.dll' LongName='RabbitMQ.Client.dll' Vital='yes' KeyPath='yes' Source='..\tmp\unzip\rabbitmq-dotnet-client-@[email protected]\bin\RabbitMQ.Client.dll' />
21+
<File Id='RabbitMQClientDllXml' Name='RMQClnt.xml' LongName='RabbitMQ.Client.xml' Vital='yes' Source='..\tmp\unzip\rabbitmq-dotnet-client-@[email protected]\bin\RabbitMQ.Client.xml' />
2122
<Registry Id='RabbitMQAssemblyFolderReg' Action='createKeyAndRemoveKeyOnUninstall' Key='SOFTWARE\Microsoft\.NETFramework\AssemblyFolders\RabbitMQ' Root='HKLM'>
2223
<Registry Id='RabbitMQAssemblyFolderRegVal' Action='write' Type='string' Value='[BinFolder]' />
2324
</Registry>

wix/dotnet-client-product.wxs.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
33
<Product Name='RabbitMQ .NET Client @VERSION@' Id='23B1A788-647D-4414-B1C6-028DAC04F761' Language='1033' Codepage='1252' Version='@VERSION@' Manufacturer='LShift Ltd.' UpgradeCode='904A1129-A675-44F9-9FBD-5CE979698179'>
4-
<Package Id='????????-????-????-????-????????????' Description='RabbitMQ .NET Client @VERSION@ for .NET 2.0' Manufacturer='LShift Ltd.' InstallerVersion='150' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
4+
<Package Id='????????-????-????-????-????????????' Description='RabbitMQ .NET Client @VERSION@ for .NET 2.0' Manufacturer='Rabbit Technologies Ltd.' InstallerVersion='150' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
55

66
<Condition Message="You need to be an administrator to install this product.">
77
Privileged

0 commit comments

Comments
 (0)