Merged default into bug23320

Author: Emile Joubert

.hgignore

@@ -6,7 +6,7 @@ rabbit\.snk$
 ^rabbit\-mock\.snk$
 
 ^scratch$
-^releases/
+^release/
 ^build$
 ^commit$
 ^diff$
@@ -31,4 +31,7 @@ rabbit\.snk$
 ^build/
 
 ~$
+[Rr]e[Ss]harper
+\.user$
+\.orig$
 

Dist-dotnet-2.0.props.in

@@ -2,7 +2,10 @@
 <Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PropTargetFramework>v2.0</PropTargetFramework>
+    <PropUsingMono>@USINGMONO@</PropUsingMono>
+    <PropLaunchExe Condition="'$(PropUsingMono)' == 'true'">mono </PropLaunchExe>
     <PropAssemblyVersion>@VERSION@</PropAssemblyVersion>
     <PropKeyfile>$(MSBuildProjectDirectory)\..\..\..\@KEYFILE@</PropKeyfile>
   </PropertyGroup>
 </Project>
+

Dist-dotnet-3.0.props.in

@@ -2,8 +2,11 @@
 <Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PropTargetFramework>v3.0</PropTargetFramework>
-    <PropBuildWcf>true</PropBuildWcf>
+    <PropUsingMono>@USINGMONO@</PropUsingMono>
+    <PropLaunchExe Condition="'$(PropUsingMono)' == 'true'">mono </PropLaunchExe>
+    <PropBuildWcf Condition="'$(PropUsingMono)' != 'true'">true</PropBuildWcf>
     <PropAssemblyVersion>@VERSION@</PropAssemblyVersion>
     <PropKeyfile>$(MSBuildProjectDirectory)\..\..\..\@KEYFILE@</PropKeyfile>
   </PropertyGroup>
 </Project>
+

Makefile

@@ -1,7 +1,7 @@
 NAME=rabbitmq-dotnet-client
 NAME_VSN=${NAME}-${RABBIT_VSN}
 
-RELEASE_DIR=releases/${NAME}/v${RABBIT_VSN}
+RELEASE_DIR=release
 
 TMPXMLZIP=${NAME_VSN}-tmp-xmldoc.zip
 
@@ -17,7 +17,7 @@ dist: rabbit-vsn ensure-deliverables ensure-universally-readable
 	rm -f $(RELEASE_DIR)/$(TMPXMLZIP)
 
 ensure-universally-readable:
-	chmod -R a+rX releases
+	chmod -R a+rX release
 
 ensure-deliverables: rabbit-vsn
 	file ${RELEASE_DIR}/${NAME_VSN}.zip
@@ -60,3 +60,5 @@ doc: rabbit-vsn ensure-prerequisites ensure-release-dir ensure-docs
 	  rm -rf ${NAME_VSN}-wcf-htmldoc && \
 	  unzip ${NAME_VSN}-wcf-htmldoc.zip -d ${NAME_VSN}-wcf-htmldoc
 
+clean:
+	rm -rf $(RELEASE_DIR)/*

README.in

@@ -1,8 +1,8 @@
-Please see http://www.rabbitmq.com/build-dotnet-client.html for build 
+Please see http://www.rabbitmq.com/build-dotnet-client.html for build
 instructions.
 
-For your convenience, a text copy of these instructions is available 
-below. Please be aware that the instructions here may not be as up to 
+For your convenience, a text copy of these instructions is available
+below. Please be aware that the instructions here may not be as up to
 date as those at the above URL.
 
 ===========================================================================

RabbitMQDotNetClient.sln

@@ -60,6 +60,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Examples.Sh
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Examples.PerfTest", "projects\examples\client\PerfTest\RabbitMQ.Client.Examples.PerfTest.csproj", "{6ED176D6-B789-4673-8300-CB671962FE00}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Examples.Subscriber", "projects\examples\client\Subscriber\RabbitMQ.Client.Examples.Subscriber.csproj", "{F6DF1899-A038-4DBF-86D0-0DE64F2422EC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -192,6 +194,12 @@ Global
 		{6ED176D6-B789-4673-8300-CB671962FE00}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
 		{6ED176D6-B789-4673-8300-CB671962FE00}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6ED176D6-B789-4673-8300-CB671962FE00}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6DF1899-A038-4DBF-86D0-0DE64F2422EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6DF1899-A038-4DBF-86D0-0DE64F2422EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6DF1899-A038-4DBF-86D0-0DE64F2422EC}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6DF1899-A038-4DBF-86D0-0DE64F2422EC}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
+		{F6DF1899-A038-4DBF-86D0-0DE64F2422EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6DF1899-A038-4DBF-86D0-0DE64F2422EC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -219,6 +227,7 @@ Global
 		{44D14FF0-1015-4AAA-ABCA-BF611879816C} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
 		{8BCE15DB-C92F-4FA4-AE57-9CA73DE91EB2} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
 		{6ED176D6-B789-4673-8300-CB671962FE00} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
+		{F6DF1899-A038-4DBF-86D0-0DE64F2422EC} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
 		{20E34D9F-EE72-4B55-B6FE-1D0DBE5B74CD} = {EA42A7EF-7CE6-4EDA-98EA-6675C7EF7F69}
 		{39CA1299-1F9E-452E-AA00-4BF874944B1E} = {EA42A7EF-7CE6-4EDA-98EA-6675C7EF7F69}
 		{201B37E1-9BFC-4A01-9760-30C5BB19CFE3} = {20E34D9F-EE72-4B55-B6FE-1D0DBE5B74CD}

dist-msi.sh

@@ -72,7 +72,7 @@ test "$SKIP_MSIVAL2" || SKIP_MSIVAL2=
 ### Other, general vars
 NAME=rabbitmq-dotnet-client
 NAME_VSN=$NAME-$RABBIT_VSN
-RELEASE_DIR=releases/$NAME/v$RABBIT_VSN
+RELEASE_DIR=release
 
 
 function main {

dist.sh

@@ -69,14 +69,23 @@ CYGWIN=nontsec
 ### Overrideable vars
 test "$KEYFILE" || KEYFILE=rabbit-mock.snk
 test "$RABBIT_VSN" || RABBIT_VSN=0.0.0
-test "$MSBUILD" || MSBUILD=msbuild.exe
 test "$WEB_URL" || WEB_URL=http://stage.rabbitmq.com/
 test "$UNOFFICIAL_RELEASE" || UNOFFICIAL_RELEASE=
+test "$MONO_DIST" || MONO_DIST=
 
 ### Other, general vars
 NAME=rabbitmq-dotnet-client
 NAME_VSN=$NAME-$RABBIT_VSN
-RELEASE_DIR=releases/$NAME/v$RABBIT_VSN
+RELEASE_DIR=release
+if [ "$MONO_DIST" ] ; then
+    INCLUDE_WCF=true
+    MSBUILD=xbuild
+    DOTNET_PROGRAM_PREPEND="mono"
+else
+    INCLUDE_WCF=true
+    MSBUILD=msbuild.exe
+    DOTNET_PROGRAM_PREPEND=
+fi
 
 
 function main {
@@ -117,27 +126,35 @@ function dist-zips {
     dist-target-framework dotnet-2.0
     ### HTML documentation for the .NET 2.0 library dist
     gendoc-dist \
-        projects/client/RabbitMQ.Client/build/bin/RabbitMQ.Client.xml \
+        build/bin/RabbitMQ.Client.xml \
         $NAME_VSN-client-htmldoc.zip \
         "/suppress:RabbitMQ.Client.Framing.v0_8 \
          /suppress:RabbitMQ.Client.Framing.v0_8qpid \
          /suppress:RabbitMQ.Client.Framing.v0_9 \
+         /suppress:RabbitMQ.Client.Framing.v0_9_1 \
          /suppress:RabbitMQ.Client.Framing.Impl.v0_8 \
          /suppress:RabbitMQ.Client.Framing.Impl.v0_8qpid \
          /suppress:RabbitMQ.Client.Framing.Impl.v0_9 \
+         /suppress:RabbitMQ.Client.Framing.Impl.v0_9_1 \
          /suppress:RabbitMQ.Client.Impl \
          /suppress:RabbitMQ.Client.Apigen.Attributes" \
-        $NAME_VSN-tmp-xmldoc.zip
+        $NAME_VSN-tmp-xmldoc.zip \
+        projects/client/RabbitMQ.Client \
+        ../../..
 
     ### .NET 3.0 library (bin), examples (src and bin), WCF bindings library (bin)
-    ### and WCF examples (src) dist
+    ### and WCF examples (src) dist (WCF built only if MONO_DIST is undefined)
     dist-target-framework dotnet-3.0
-    ### HTML documentation for the WCF bindings library dist
-    gendoc-dist \
-        projects/wcf/RabbitMQ.ServiceModel/build/bin/RabbitMQ.ServiceModel.xml \
-        $NAME_VSN-wcf-htmldoc.zip \
-        "" \
-        ""
+    if [ -z "$MONO_DIST" ]; then
+        ### HTML documentation for the WCF bindings library dist
+        gendoc-dist \
+            build/bin/RabbitMQ.ServiceModel.xml \
+            $NAME_VSN-wcf-htmldoc.zip \
+            "" \
+            "" \
+            projects/wcf/RabbitMQ.ServiceModel \
+            ../../..
+    fi
 }
 
 
@@ -187,7 +204,7 @@ function src-dist {
 function dist-target-framework {
     TARGET_FRAMEWORK="$1"
     BUILD_WCF=
-    test "$TARGET_FRAMEWORK" == "dotnet-3.0" && BUILD_WCF="true"
+    test "$TARGET_FRAMEWORK" == "dotnet-3.0" && test -z "$MONO_DIST" && BUILD_WCF="true"
 
     ### Make sure we can use MSBuild.Community.Tasks.dll (it might be from a
     ### remote location)
@@ -235,8 +252,14 @@ function dist-target-framework {
 }
 
 function gen-props {
+    if [ "$MONO_DIST" ]; then
+        USING_MONO="true"
+    else
+        USING_MONO="false"
+    fi
     sed -e "s:@VERSION@:$RABBIT_VSN:g" \
         -e "s:@KEYFILE@:$KEYFILE:g" \
+        -e "s:@USINGMONO@:$USING_MONO:g" \
     < $1 > $2
 }
 
@@ -246,19 +269,25 @@ function gendoc-dist {
     EXTRA_NDOCPROC_ARGS="$3"
     ### If this is an empty string, the intermediate xml output will not be saved in a zip
     ZIP_TMP_XML_DOC_FILENAME="$4"
+    PROJECT_DIR="$5"
+    RELATIVE_DIR="$6"
 
     mkdir -p tmp/gendoc/xml tmp/gendoc/html
 
     ### Make sure we can use ndocproc (it might be from a remote location)
     chmod +x lib/ndocproc-bin/bin/ndocproc.exe
 
+    cd $PROJECT_DIR
+
     ### Generate XMLs with ndocproc    
-    lib/ndocproc-bin/bin/ndocproc.exe \
+    $DOTNET_PROGRAM_PREPEND $RELATIVE_DIR/lib/ndocproc-bin/bin/ndocproc.exe \
     /nosubtypes \
     $EXTRA_NDOCPROC_ARGS \
-    tmp/gendoc/xml \
+    $RELATIVE_DIR/tmp/gendoc/xml \
     $XML_SOURCE_FILE \
-    docs/namespaces.xml
+    $RELATIVE_DIR/docs/namespaces.xml
+    
+    cd $RELATIVE_DIR
 
     ### Zip ndocproc's output
     if [ "$ZIP_TMP_XML_DOC_FILENAME" ]; then
@@ -297,3 +326,4 @@ function genhtml {
 
 
 main $@
+

docs/specs/amqp0-8.stripped.xml

@@ -456,10 +456,18 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <field name="delivery tag" domain="delivery tag"/>
       <field name="requeue" type="bit"/>
     </method>
-    <method name="recover" index="100">
+    <method name="recover-async" index="100">
       <chassis name="server" implement="MUST"/>
       <field name="requeue" type="bit"/>
     </method>
+    <method name="recover" synchronous="1" index="110">
+      <response name="recover-ok"/>
+      <chassis name="server" implement="MAY"/>
+      <field name="requeue" domain="bit"/>
+    </method>
+    <method name="recover-ok" index="111">
+      <chassis name="client" implement="MAY"/>
+    </method>
   </class>
   <class name="file" handler="channel" index="70">
     <chassis name="server" implement="MAY"/>