Merge branch 'stable'

Author: michaelklishin

dist-lib.sh

@@ -41,10 +41,11 @@
 ##---------------------------------------------------------------------------
 
 function assembly-version {
-    local RELEASE_PATTERN="^[0-9]+(\.[0-9]+){2}$"
-    local NIGHTLY_PATTERN="^[0-9]+(\.[0-9]+){3}$"
+    local RELEASE_PATTERN="^[0-9]+(\.[0-9a-z]+){2,3}$"
+    local NIGHTLY_PATTERN="^[0-9]+(\.[0-9]+){2,3}$"
     if [[ $1 =~ $RELEASE_PATTERN ]] ; then
-        ASSEMBLY_VSN=$RABBIT_VSN.0
+        # AssemblyVersion cannot contain arbitrary strings
+        ASSEMBLY_VSN=$(echo $RABBIT_VSN | sed -e "s/milestone/80/g" -e "s/rc/90/g")
     elif [[ $1 =~ $NIGHTLY_PATTERN ]] ; then
         ASSEMBLY_VSN=$RABBIT_VSN
     else

projects/client/RabbitMQ.Client/src/tokenized/AssemblyInfo.cs.in

@@ -35,19 +35,19 @@
 //  The Original Code is RabbitMQ.
 //
 //  The Initial Developer of the Original Code is GoPivotal, Inc.
-//  Copyright (c) 2007-2014 GoPivotal, Inc.  All rights reserved.
+//  Copyright (c) 2007-2015 Pivotal Software, Inc.  All rights reserved.
 //---------------------------------------------------------------------------
 
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("RabbitMQ Client Library for .Net")]
-[assembly: AssemblyDescription("Open Source Enterprise Messaging")]
+[assembly: AssemblyTitle("RabbitMQ Client Library for .NET")]
+[assembly: AssemblyDescription("See http://rabbitmq.com")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("GoPivotal, Inc.")]
+[assembly: AssemblyCompany("Pivotal Software, Inc.")]
 [assembly: AssemblyProduct("RabbitMQ")]
-[assembly: AssemblyCopyright("Copyright © 2007-2014 GoPivotal, Inc.")]
+[assembly: AssemblyCopyright("Copyright © 2007-2015 Pivotal Software, Inc.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]