Skip to content

Commit 9eddf37

Browse files
author
Simon MacMullen
committed
Merge bug26419
2 parents 8d62da8 + 37554b8 commit 9eddf37

File tree

7 files changed

+45
-34
lines changed

7 files changed

+45
-34
lines changed

‎Local.props.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PropLaunchExe Condition="'$(PropUsingMono)' == 'true'">mono --debug </PropLaunchExe>
1414

1515
<!-- WCF component only for Windows, .NET 3.5 or higher -->
16-
<PropBuildWcf Condition="'$(PropUsingMono)' != 'true' And ('$(PropTargetFramework)' == 'v3.5' Or '$(PropTargetFramework)' == 'v4.0' Or '$(PropTargetFramework)' == 'v4.5'))">true</PropBuildWcf>
16+
<PropBuildWcf Condition="'$(PropUsingMono)' != 'true'">true</PropBuildWcf>
1717

1818
<!-- Uncomment to run a single test case with /t:RunSingleUnitTest -->
1919
<!-- <PropTestToRun>RabbitMQ.Client.Unit.TestConnectionRecovery</PropTestToRun> -->

‎dist-msi.sh

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ NAME_VSN=$NAME-$RABBIT_VSN
6060
RELEASE_DIR=release
6161

6262
function main {
63+
ensure-tmp-unzip
64+
get-binaries
6365
get-sources
6466
gen-license-rtf
6567

@@ -98,16 +100,22 @@ function build-msm-msi {
98100
safe-rm-deep-dir tmp/wix
99101
}
100102

101-
102-
function get-sources {
103+
function ensure-tmp-unzip {
103104
safe-rm-deep-dir tmp/unzip
104105
mkdir -p tmp/unzip
105-
unzip -q $RELEASE_DIR/$NAME_VSN-dotnet-2.0.zip -d tmp/unzip/$NAME_VSN-dotnet-2.0
106+
}
107+
108+
function get-sources {
106109
unzip -q $RELEASE_DIR/$NAME_VSN-client-htmldoc.zip -d tmp/unzip/$NAME_VSN-client-htmldoc
107110
cp $RELEASE_DIR/$NAME_VSN-api-guide.pdf tmp/unzip/
108111
cp $RELEASE_DIR/$NAME_VSN-user-guide.pdf tmp/unzip/
109112
}
110113

114+
function get-binaries {
115+
unzip -q $RELEASE_DIR/$NAME_VSN.zip -d tmp/unzip/
116+
mkdir -p tmp/unzip/bin
117+
cp -r tmp/unzip/$NAME_VSN/projects/client/RabbitMQ.Client/build/bin tmp/unzip/$NAME_VSN/bin
118+
}
111119

112120
function gen-wxs {
113121
set +x

‎dist.sh

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,23 @@ function main {
104104

105105

106106
function dist-zips {
107+
# clean & build
108+
dist-target-framework dotnet-3.5
109+
107110
### Source dist
108111
src-dist
109112

110-
### .NET 3.5 library (bin), examples (src and bin), WCF bindings library (bin)
111-
### and WCF examples (src) dist (WCF built only if MONO_DIST is undefined)
112-
dist-target-framework dotnet-3.5
113+
gendoc-dist \
114+
build/bin/RabbitMQ.Client.xml \
115+
$NAME_VSN-client-htmldoc.zip \
116+
"/suppress:RabbitMQ.Client.Framing \
117+
/suppress:RabbitMQ.Client.Framing.Impl \
118+
/suppress:RabbitMQ.Client.Impl \
119+
/suppress:RabbitMQ.Client.Apigen.Attributes" \
120+
$NAME_VSN-tmp-xmldoc.zip \
121+
projects/client/RabbitMQ.Client \
122+
../../..
123+
113124
if [ -z "$MONO_DIST" ]; then
114125
### HTML documentation for the WCF bindings library dist
115126
gendoc-dist \
@@ -160,7 +171,7 @@ function src-dist {
160171
function dist-target-framework {
161172
TARGET_FRAMEWORK="$1"
162173
BUILD_WCF=
163-
test "$TARGET_FRAMEWORK" == "dotnet-3.0" && test -z "$MONO_DIST" && BUILD_WCF="true"
174+
test -z "$MONO_DIST" && BUILD_WCF="true"
164175

165176
### Make sure we can use MSBuild.Community.Tasks.dll (it might be from a
166177
### remote location)

‎docs/wikipages/data.BuildingTheClient.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,16 @@ The source tree is laid out as follows:
2323
To compile the RabbitMQ .NET client library, you will need
2424

2525
- a .NET development environment:
26-
- Microsoft .NET 2.0 (or later)
27-
- Microsoft .NET 3.0 (or later) if you want to build the WCF binding too
28-
- Microsoft Visual Studio 2005 or later (optional)
26+
- Microsoft .NET 3.5 (or later) if you want to build the WCF binding too
27+
- Microsoft Visual Studio 2008 or later (optional)
2928

3029
To run the unit tests, you will need
3130

3231
- NUnit 2.5 or later; included in the [code lib] directory
3332

3433
** Configuring Your Tree
3534

36-
Copy [code Local.props.example] to [code Local.props], and edit it if necessary (the properties in this file have suggestive names). Set [code PropTargetFramework] to [code v1.1], [code v2.0], [code v3.0] or [code v3.5]. If you would like to build under Mono, only [code v1.1] and [code v2.0] are supported; also set [code PropUsingMono] to [code true] in this case.
35+
Copy [code Local.props.example] to [code Local.props], and edit it if necessary (the properties in this file have suggestive names). Set [code PropTargetFramework] to [code v3.5], [code v4.0] or [code v4.5]. If you would like to build under Mono, set [code PropUsingMono] to [code true] in this case.
3736

3837
** Building
3938

@@ -51,7 +50,7 @@ Note: If you change a property in [code Local.props] while the solution is loade
5150

5251
*** On Windows, without Visual Studio
5352

54-
To build the client library without Visual Studio, first you need to make sure you have the .NET's framework directory in your [code PATH] environment variable. The .NET framework directory can usually be found at [code %WINDIR%\Microsoft.NET\Framework\v2.0.50727] for .NET 2.0 or [code %WINDIR%\Microsoft.NET\Framework\v3.0] for .NET 3.0.
53+
To build the client library without Visual Studio, first you need to make sure you have the .NET's framework directory in your [code PATH] environment variable. The .NET framework directory can usually be found at [code %WINDIR%\Microsoft.NET\Framework\v3.5] for .NET 3.5.
5554

5655
Open the Command Prompt (Start -> Run -> cmd) or Cygwin (if you have it installed) and change to the client's directory. Now type [code msbuild.exe] and hit return to start building the solution.
5756

@@ -63,7 +62,7 @@ For building under Mono, please refer to [link http://www.rabbitmq.com/build-dot
6362

6463
** Building the WCF binding
6564

66-
Building the WCF binding is enabled by default in [code Local.props] if the target framework is [code v3.0] or later (only on Windows).
65+
Building the WCF binding is enabled by default in [code Local.props] on Windows.
6766

6867
To disable building the WCF binding, set [code PropBuildWcf] to [code false].
6968

‎projects/client/Apigen/RabbitMQ.Client.Apigen.csproj

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,6 @@
6666
</ProjectReference>
6767
</ItemGroup>
6868
<ItemGroup>
69-
<BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
70-
<Visible>False</Visible>
71-
<ProductName>.NET Framework 2.0 %28x86%29</ProductName>
72-
<Install>true</Install>
73-
</BootstrapperPackage>
74-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
75-
<Visible>False</Visible>
76-
<ProductName>.NET Framework 3.0 %28x86%29</ProductName>
77-
<Install>false</Install>
78-
</BootstrapperPackage>
7969
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
8070
<Visible>False</Visible>
8171
<ProductName>.NET Framework 3.5</ProductName>

‎projects/client/RabbitMQ.Client/src/client/exceptions/OperationInterruptedException.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ namespace RabbitMQ.Client.Exceptions
5252
/// </summary>
5353
[Serializable]
5454
public class OperationInterruptedException
55-
// Eventually, as part of .NET 3.0, we get to inherit from ...
56-
/* : OperationCanceledException */
57-
// Until then, there's sadly nothing better to inherit from than ...
55+
// TODO: inherit from OperationCanceledException
5856
: Exception
5957
{
6058
///<summary>Possible explanation for the interruption. May be null.</summary>

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

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
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='GoPivotal, Inc.' InstallerVersion='150' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
4+
<Package Id='????????-????-????-????-????????????' Description='RabbitMQ .NET Client @VERSION@' Manufacturer='GoPivotal, Inc.'
5+
InstallerVersion='150' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
56
<!-- VERSION is the RabbitMQ release version. This might differ
67
from the RabbitMQ.Client.dll version (which always has 4
78
components). -->
@@ -14,15 +15,19 @@
1415
(i.e. will only have to be specified once, with Assembly='.net'
1516
in order to be copied in both places). -->
1617
<Component Id='ClientLibraryAssembly' Guid='06543EE8-DED2-4C1C-826E-6AAE0B403AF3'>
17-
<File Id='RabbitMQClientDllAssembly' Name='RMQClnt.dll' LongName='RabbitMQ.Client.dll' Vital='yes' Assembly='.net' KeyPath='yes' Source='..\tmp\unzip\rabbitmq-dotnet-client-@[email protected]\bin\RabbitMQ.Client.dll' />
18+
<File Id='RabbitMQClientDllAssembly' Name='RMQClnt.dll' LongName='RabbitMQ.Client.dll' Vital='yes' Assembly='.net' KeyPath='yes'
19+
Source='..\tmp\unzip\rabbitmq-dotnet-client-@VERSION@\bin\RabbitMQ.Client.dll' />
1820
</Component>
1921

2022
<Directory Id='BinFolder' Name='bin'>
2123
<Component Id='ClientLibraryBin' Guid='83A1DE00-CCB6-42C2-BD14-FBAEDDBC50E8'>
2224
<CreateFolder />
23-
<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' />
24-
<File Id='RabbitMQClientDllXml' Name='RMQClnt.xml' LongName='RabbitMQ.Client.xml' Vital='yes' Source='..\tmp\unzip\rabbitmq-dotnet-client-@[email protected]\bin\RabbitMQ.Client.xml' />
25-
<Registry Id='RabbitMQAssemblyFolderReg' Action='createKeyAndRemoveKeyOnUninstall' Key='SOFTWARE\Microsoft\.NETFramework\AssemblyFolders\RabbitMQ' Root='HKLM'>
25+
<File Id='RabbitMQClientDllBin' Name='RMQClnt.dll' LongName='RabbitMQ.Client.dll' Vital='yes' KeyPath='yes'
26+
Source='..\tmp\unzip\rabbitmq-dotnet-client-@VERSION@\bin\RabbitMQ.Client.dll' />
27+
<File Id='RabbitMQClientDllXml' Name='RMQClnt.xml' LongName='RabbitMQ.Client.xml' Vital='yes'
28+
Source='..\tmp\unzip\rabbitmq-dotnet-client-@VERSION@\bin\RabbitMQ.Client.xml' />
29+
<Registry Id='RabbitMQAssemblyFolderReg' Action='createKeyAndRemoveKeyOnUninstall'
30+
Key='SOFTWARE\Microsoft\.NETFramework\AssemblyFolders\RabbitMQ' Root='HKLM'>
2631
<Registry Id='RabbitMQAssemblyFolderRegVal' Action='write' Type='string' Value='[BinFolder]' />
2732
</Registry>
2833
</Component>
@@ -31,13 +36,13 @@
3136
<Directory Id='ExamplesFolder' Name='examples'>
3237
<Directory Id='BinExamplesFolder' Name='bin'>
3338
<Component Id='ExampleBinaries' Guid='1C270D1C-CD79-49D8-9413-E6211F52B5A8'>
34-
@FILES ../tmp/unzip/rabbitmq-dotnet-client-@VERSION@-dotnet-2.0/bin -name *.exe
39+
@FILES ../tmp/unzip/rabbitmq-dotnet-client-@VERSION@/bin -name *.exe
3540
</Component>
3641
</Directory>
3742

3843
<Directory Id='SrcExamplesFolder' Name='src'>
3944
<Component Id='ExampleSources' Guid='962896C3-D476-4C8E-B5F3-BE963D566A49'>
40-
@FILES ../tmp/unzip/rabbitmq-dotnet-client-@VERSION@-dotnet-2.0/projects/examples/client -name *.cs -not -name AssemblyInfo.cs
45+
@FILES ../tmp/unzip/rabbitmq-dotnet-client-@VERSION@/projects/examples/client -name *.cs -not -name AssemblyInfo.cs
4146
</Component>
4247
</Directory>
4348

0 commit comments

Comments
 (0)