Skip to content

Commit 651f82e

Browse files
dpwdpw
committed
Merge bug21220 into default
2 parents a483289 + 984f24a commit 651f82e

File tree

360 files changed

+27175
-14932
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

360 files changed

+27175
-14932
lines changed

‎.hgignore

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,34 @@
11
syntax: regexp
2-
^build$
2+
3+
^Local.props$
4+
^local.dist$
5+
rabbit\.snk$
6+
^rabbit\-mock\.snk$
7+
38
^scratch$
4-
^local\.build$
5-
^TestResult.xml$
6-
^releases$
9+
^releases/
10+
^build$
711
^commit$
812
^diff$
9-
10-
^src/wcf/.*/(bin|obj)$
11-
^src/wcf/.*/*.suo$
12-
1313
^src/wcf/RabbitMQ\.ServiceModel/RabbitMQ\.ServiceModel\.xml
1414
^src/wcf/RabbitMQ\.ServiceModel/AssemblyInfo\.cs$
1515

1616
^wix/dotnet-client-merge-module\.wxs$
1717
^wix/dotnet-client-product\.wxs$
1818
^wix/License\.rtf$
1919

20+
^projects/.*/(build|obj)$
21+
^.*\.suo$
22+
^RabbitMQDotNetClient\.sln\.proj$
23+
^RabbitMQDotNetClient\.sln\.cache$
24+
^UpgradeLog\.XML$
25+
^\_UpgradeReport\_Files/
26+
^gensrc/
27+
^projects/.*/.*\.csproj\.user$
28+
^projects/client/Unit/TestResult\.xml$
29+
30+
^docs/pyle\.log$
31+
^build/
32+
2033
~$
34+

‎Dist-dotnet-2.0.props.in

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<PropTargetFramework>v2.0</PropTargetFramework>
5+
<PropAssemblyVersion>@VERSION@</PropAssemblyVersion>
6+
<PropKeyfile>$(MSBuildProjectDirectory)\..\..\..\@KEYFILE@</PropKeyfile>
7+
</PropertyGroup>
8+
</Project>

‎Dist-dotnet-3.0.props.in

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<PropTargetFramework>v3.0</PropTargetFramework>
5+
<PropBuildWcf>true</PropBuildWcf>
6+
<PropAssemblyVersion>@VERSION@</PropAssemblyVersion>
7+
<PropKeyfile>$(MSBuildProjectDirectory)\..\..\..\@KEYFILE@</PropKeyfile>
8+
</PropertyGroup>
9+
</Project>

‎Local.props.example

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<PropTargetFramework>v3.5</PropTargetFramework>
5+
<PropAssemblyVersion>1.6.0</PropAssemblyVersion>
6+
<PropUsingMono>false</PropUsingMono>
7+
8+
<!-- Assembly strong naming - $(MSBuildProjectDirectory) is the RabbitMQ.Client project directory -->
9+
<!-- <PropKeyfile>$(MSBuildProjectDirectory)\rabbit.snk</PropKeyfile> -->
10+
11+
<!-- Program to prepend to commands when launching .exe files (note the trailing space) -->
12+
<!-- (do not worry about this under Windows, just set PropUsingMono to false) -->
13+
<PropLaunchExe Condition="'$(PropUsingMono)' == 'true'">mono </PropLaunchExe>
14+
15+
<!-- WCF component only for Windows, .NET 3.0 or higher -->
16+
<PropBuildWcf Condition="'$(PropUsingMono)' != 'true' And ('$(PropTargetFramework)' == 'v3.0' Or '$(PropTargetFramework)' == 'v3.5' Or '$(PropTargetFramework)' == 'v4.0')">true</PropBuildWcf>
17+
</PropertyGroup>
18+
</Project>
19+

‎Makefile

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@ ensure-deliverables: rabbit-vsn
2424
file ${RELEASE_DIR}/${NAME_VSN}-api-guide.pdf
2525
file ${RELEASE_DIR}/${NAME_VSN}-user-guide.pdf
2626
file ${RELEASE_DIR}/${NAME_VSN}-wcf-service-model.pdf
27-
file ${RELEASE_DIR}/${NAME_VSN}-net-2.0.zip
28-
file ${RELEASE_DIR}/${NAME_VSN}-net-2.0-htmldoc.zip
29-
file ${RELEASE_DIR}/${NAME_VSN}-net-2.0-htmldoc
30-
file ${RELEASE_DIR}/${NAME_VSN}-net-3.0-wcf.zip
31-
file ${RELEASE_DIR}/${NAME_VSN}-net-3.0-wcf-htmldoc.zip
32-
file ${RELEASE_DIR}/${NAME_VSN}-net-3.0-wcf-htmldoc
27+
file ${RELEASE_DIR}/${NAME_VSN}-dotnet-2.0.zip
28+
file ${RELEASE_DIR}/${NAME_VSN}-client-htmldoc.zip
29+
file ${RELEASE_DIR}/${NAME_VSN}-client-htmldoc
30+
file ${RELEASE_DIR}/${NAME_VSN}-dotnet-3.0.zip
31+
file ${RELEASE_DIR}/${NAME_VSN}-wcf-htmldoc.zip
32+
file ${RELEASE_DIR}/${NAME_VSN}-wcf-htmldoc
33+
file ${RELEASE_DIR}/${NAME_VSN}.msi
34+
file ${RELEASE_DIR}/${NAME_VSN}.msm
3335

3436
ensure-prerequisites: rabbit-vsn
3537
dpkg -L htmldoc plotutils transfig graphviz docbook-utils > /dev/null
@@ -38,13 +40,13 @@ ensure-release-dir: rabbit-vsn
3840
touch ${RELEASE_DIR}/
3941

4042
ensure-docs: rabbit-vsn
41-
file ${RELEASE_DIR}/${NAME_VSN}-net-2.0-htmldoc.zip
43+
file ${RELEASE_DIR}/${NAME_VSN}-client-htmldoc.zip
4244
file ${RELEASE_DIR}/${TMPXMLZIP}
4345

4446
doc: rabbit-vsn ensure-prerequisites ensure-release-dir ensure-docs
4547
rm -rf build/tmpdoc build/doc
4648
mkdir -p build/tmpdoc/html build/tmpdoc/xml
47-
unzip -j ${RELEASE_DIR}/${NAME_VSN}-net-2.0-htmldoc.zip -d build/tmpdoc/html
49+
unzip -j ${RELEASE_DIR}/${NAME_VSN}-client-htmldoc.zip -d build/tmpdoc/html
4850
unzip -j ${RELEASE_DIR}/${NAME_VSN}-tmp-xmldoc.zip -d build/tmpdoc/xml
4951
cd docs && ./api-guide.sh && \
5052
mv api-guide.pdf ../${RELEASE_DIR}/${NAME_VSN}-api-guide.pdf
@@ -53,7 +55,8 @@ doc: rabbit-vsn ensure-prerequisites ensure-release-dir ensure-docs
5355
cp docs/"RabbitMQ Service Model.pdf" \
5456
${RELEASE_DIR}/${NAME_VSN}-wcf-service-model.pdf
5557
cd ${RELEASE_DIR} && \
56-
rm -rf ${NAME_VSN}-net-2.0-htmldoc && \
57-
unzip ${NAME_VSN}-net-2.0-htmldoc.zip && \
58-
rm -rf unzip ${NAME_VSN}-net-3.0-wcf-htmldoc && \
59-
unzip ${NAME_VSN}-net-3.0-wcf-htmldoc.zip
58+
rm -rf ${NAME_VSN}-htmldoc && \
59+
unzip ${NAME_VSN}-client-htmldoc.zip -d ${NAME_VSN}-client-htmldoc && \
60+
rm -rf ${NAME_VSN}-wcf-htmldoc && \
61+
unzip ${NAME_VSN}-wcf-htmldoc.zip -d ${NAME_VSN}-wcf-htmldoc
62+

‎README.in

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
Please see http://www.rabbitmq.com/build-dotnet-client.html for build
2-
instructions.
3-
4-
For your convenience, a text copy of these instructions is available
5-
below. Please be aware that the instructions here may not be as up to
6-
date as those at the above URL.
7-
8-
===========================================================================
1+
Please see http://www.rabbitmq.com/build-dotnet-client.html for build
2+
instructions.
3+
4+
For your convenience, a text copy of these instructions is available
5+
below. Please be aware that the instructions here may not be as up to
6+
date as those at the above URL.
7+
8+
===========================================================================

0 commit comments

Comments
 (0)