Merged bug24080 into default

Author: Emile Joubert

Makefile

@@ -46,8 +46,8 @@ ensure-docs: rabbit-vsn
 doc: rabbit-vsn ensure-prerequisites ensure-release-dir ensure-docs
 	rm -rf build/tmpdoc build/doc
 	mkdir -p build/tmpdoc/html build/tmpdoc/xml
-	unzip -j ${RELEASE_DIR}/${NAME_VSN}-client-htmldoc.zip -d build/tmpdoc/html
-	unzip -j ${RELEASE_DIR}/${NAME_VSN}-tmp-xmldoc.zip -d build/tmpdoc/xml
+	unzip -q -j ${RELEASE_DIR}/${NAME_VSN}-client-htmldoc.zip -d build/tmpdoc/html
+	unzip -q -j ${RELEASE_DIR}/${NAME_VSN}-tmp-xmldoc.zip -d build/tmpdoc/xml
 	cd docs && ./api-guide.sh && \
 	  mv api-guide.pdf ../${RELEASE_DIR}/${NAME_VSN}-api-guide.pdf
 	$(MAKE) -C docs
@@ -56,9 +56,9 @@ doc: rabbit-vsn ensure-prerequisites ensure-release-dir ensure-docs
 	  ${RELEASE_DIR}/${NAME_VSN}-wcf-service-model.pdf
 	cd ${RELEASE_DIR} && \
 	  rm -rf ${NAME_VSN}-htmldoc && \
-	  unzip ${NAME_VSN}-client-htmldoc.zip -d ${NAME_VSN}-client-htmldoc && \
+	  unzip -q ${NAME_VSN}-client-htmldoc.zip -d ${NAME_VSN}-client-htmldoc && \
 	  rm -rf ${NAME_VSN}-wcf-htmldoc && \
-	  unzip ${NAME_VSN}-wcf-htmldoc.zip -d ${NAME_VSN}-wcf-htmldoc
+	  unzip -q ${NAME_VSN}-wcf-htmldoc.zip -d ${NAME_VSN}-wcf-htmldoc
 
 clean:
 	rm -rf $(RELEASE_DIR)/*

dist-msi.sh

@@ -102,8 +102,8 @@ function build-msm-msi {
 function get-sources {
     safe-rm-deep-dir tmp/unzip
     mkdir -p tmp/unzip
-    unzip $RELEASE_DIR/$NAME_VSN-dotnet-2.0.zip -d tmp/unzip/$NAME_VSN-dotnet-2.0
-    unzip $RELEASE_DIR/$NAME_VSN-client-htmldoc.zip -d tmp/unzip/$NAME_VSN-client-htmldoc
+    unzip -q $RELEASE_DIR/$NAME_VSN-dotnet-2.0.zip -d tmp/unzip/$NAME_VSN-dotnet-2.0
+    unzip -q $RELEASE_DIR/$NAME_VSN-client-htmldoc.zip -d tmp/unzip/$NAME_VSN-client-htmldoc
     cp $RELEASE_DIR/$NAME_VSN-api-guide.pdf tmp/unzip/
     cp $RELEASE_DIR/$NAME_VSN-user-guide.pdf tmp/unzip/
 }

dist.sh

@@ -169,7 +169,7 @@ function src-dist {
     mkdir tmp/srcdist
     mv tmp/$NAME_VSN tmp/srcdist/
     cd tmp/srcdist
-    zip -r ../../$RELEASE_DIR/$NAME_VSN.zip . -x \*.snk \*.resharper \*.csproj.user
+    zip -q -r ../../$RELEASE_DIR/$NAME_VSN.zip . -x \*.snk \*.resharper \*.csproj.user
     cd ../..
 
     ### Remove tmp/srcdist
@@ -197,14 +197,14 @@ function dist-target-framework {
     mkdir -p tmp/dist/bin tmp/dist/projects/examples
 
     ### Clean
-    $MSBUILD RabbitMQDotNetClient.sln /t:Clean /property:Configuration="Release"
+    $MSBUILD /verbosity:quiet RabbitMQDotNetClient.sln /t:Clean /property:Configuration="Release"
 
     ### Copy examples code to be zipped to tmp/dist/
     cp -r projects/examples/client tmp/dist/projects/examples/
     test "$BUILD_WCF" && cp -r projects/examples/wcf tmp/dist/projects/examples/
 
     ### Build
-    $MSBUILD RabbitMQDotNetClient.sln /t:Build /property:Configuration="Release"
+    $MSBUILD /verbosity:quiet RabbitMQDotNetClient.sln /t:Build /property:Configuration="Release"
 
     ### Copy bin files to be zipped to tmp/dist/
     cp projects/client/RabbitMQ.Client/build/bin/RabbitMQ.Client.xml tmp/dist/bin/
@@ -217,7 +217,7 @@ function dist-target-framework {
 
     ### Zip tmp/dist
     cd tmp/dist
-    zip -r ../../$RELEASE_DIR/$NAME_VSN-$TARGET_FRAMEWORK.zip .
+    zip -q -r ../../$RELEASE_DIR/$NAME_VSN-$TARGET_FRAMEWORK.zip .
     cd ../..
 
     ### Remove tmp/dist
@@ -269,7 +269,7 @@ function gendoc-dist {
     ### Zip ndocproc's output
     if [ "$ZIP_TMP_XML_DOC_FILENAME" ]; then
         cd tmp/gendoc/xml
-        zip -r ../../../$RELEASE_DIR/$ZIP_TMP_XML_DOC_FILENAME .
+        zip -q -r ../../../$RELEASE_DIR/$ZIP_TMP_XML_DOC_FILENAME .
         cd ../../..
     fi
 
@@ -285,7 +285,7 @@ function gendoc-dist {
 
     ### Zip tmp/gendoc
     cd tmp/gendoc
-    zip -r ../../$RELEASE_DIR/$ZIP_DESTINATION_FILENAME .
+    zip -q -r ../../$RELEASE_DIR/$ZIP_DESTINATION_FILENAME .
     cd ../..
 
     ### Remove tmp/gendoc

docs/Makefile

@@ -49,7 +49,7 @@ $(MANDIR)/%.pdf: %-skeleton.xml
 	mv $(TMPDIR)/$*.pdf $(MANDIR)
 
 unpack-pyle:
-	unzip ../tools/pyle2-snapshot-20080107.zip
+	unzip -q ../tools/pyle2-snapshot-20080107.zip
 	cp pyle2-config.py pyle2-snapshot-20080107/Config.py
 
 delete-unpacked-pyle: stop-pyle

projects/client/RabbitMQ.Client/src/client/api/SslOption.cs

@@ -93,20 +93,28 @@ public string CertPassphrase
             set { m_certPass = value; }
         }
 
+        private X509CertificateCollection m_certs;
 
-        ///<summary>Convenience read-only property to retrieve an X509CertificateCollection
-        ///containing the client certificate</summary>
+        ///<summary>Retrieve or set the X509CertificateCollection
+        ///containing the client certificate. If no collection is set,
+        ///the client will attempt to load one from the specified
+        ///CertPath.</summary>
         public X509CertificateCollection Certs
         {
-            get { 
-                if(m_certPath == "") {
+            get {
+                if (m_certs != null) {
+                    return m_certs;
+                } else if (m_certPath == "") {
                     return null;
                 } else {
                     X509CertificateCollection c = new X509CertificateCollection();
                     c.Add(new X509Certificate2(m_certPath, m_certPass));
                     return c;
                 }
             }
+            set {
+                m_certs = value;
+            }
         }
 
         private string m_serverName;

tools/check-distribution

@@ -194,8 +194,8 @@ mv $NET11ZIP $NET11ZIP.asc $NET20ZIP $NET20ZIP.asc $UPLOAD_ROOT/releases/binary
 mv $SRCZIP $SRCZIP.asc $UPLOAD_ROOT/releases/source
 mv *.pdf $COREDOCZIP $COREDOCZIP.asc $WCFDOCZIP $WCFDOCZIP.asc $UPLOAD_ROOT/releases/doc/rabbitmq-dotnet-$RELEASE_TAG
 cd $UPLOAD_ROOT/releases/doc/rabbitmq-dotnet-$RELEASE_TAG
-unzip $COREDOCZIP
-unzip $WCFDOCZIP
+unzip -q $COREDOCZIP
+unzip -q $WCFDOCZIP
 cd /tmp
 rm $TMPDIRNAME/installfiles
 rmdir $TMPDIRNAME