Merging bug 22815 onto default

Author: Matthew Sackman

.hgignore

@@ -6,7 +6,7 @@ rabbit\.snk$
 ^rabbit\-mock\.snk$
 
 ^scratch$
-^releases/
+^release/
 ^build$
 ^commit$
 ^diff$

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

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

@@ -76,7 +76,7 @@ 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