stable to default

Author: Simon MacMullen

Makefile

@@ -2,6 +2,7 @@ NAME=rabbitmq-dotnet-client
 NAME_VSN=${NAME}-${RABBIT_VSN}
 
 RELEASE_DIR=release
+GENSRC_DIR=gensrc
 
 TMPXMLZIP=${NAME_VSN}-tmp-xmldoc.zip
 
@@ -16,6 +17,13 @@ endif
 dist: rabbit-vsn ensure-deliverables ensure-universally-readable
 	rm -f $(RELEASE_DIR)/$(TMPXMLZIP)
 
+test-xbuild-units:
+	xbuild /nologo /t:RunUnitTests projects/client/Unit/RabbitMQ.Client.Unit.csproj | grep -v "warning CS2002"
+
+test-xbuild: test-xbuild-units
+
+retest-xbuild: clean test-xbuild
+
 ensure-universally-readable:
 	chmod -R a+rX release
 
@@ -61,4 +69,4 @@ doc: rabbit-vsn ensure-prerequisites ensure-release-dir ensure-docs
 	  unzip -q ${NAME_VSN}-wcf-htmldoc.zip -d ${NAME_VSN}-wcf-htmldoc
 
 clean:
-	rm -rf $(RELEASE_DIR)/*
+	rm -rf $(GENSRC_DIR) $(RELEASE_DIR)/*

docs/specs/amqp-xml-doc0-9.pdf

@@ -165,7 +165,6 @@ public static string MangleMethodClass(AmqpClass c, AmqpMethod m) {
         public XmlDocument m_spec = null;
         public TextWriter m_outputFile = null;
 
-        public bool m_versionOverridden = false;
         public int m_majorVersion;
         public int m_minorVersion;
         public int m_revision = 0;
@@ -209,11 +208,6 @@ public void HandleOption(string opt) {
                 m_framingSubnamespace = opt.Substring(3);
             } else if (opt.StartsWith("/apiName:")) {
                 m_apiName = opt.Substring(9);
-            } else if (opt.StartsWith("/v:")) {
-                string[] parts = opt.Substring(3).Split(new char[] { '-' });
-                m_versionOverridden = true;
-                m_majorVersion = int.Parse(parts[0]);
-                m_minorVersion = int.Parse(parts[1]);
             } else if (opt == "/c") {
                 m_emitComments = true;
             } else {
@@ -227,7 +221,6 @@ public void Usage() {
             Console.Error.WriteLine("  Options include:");
             Console.Error.WriteLine("    /apiName:<identifier>");
             Console.Error.WriteLine("    /n:<name.space.prefix>");
-            Console.Error.WriteLine("    /v:<majorversion>-<minorversion>");
             Console.Error.WriteLine("  The apiName option is required.");
             Environment.Exit(1);
         }
@@ -285,15 +278,11 @@ public void LoadSpec() {
         }
 
         public void ParseSpec() {
-            Console.WriteLine("* Parsing spec");
-            if (!m_versionOverridden) {
-                m_majorVersion = GetInt(m_spec, "/amqp/@major");
-                m_minorVersion = GetInt(m_spec, "/amqp/@minor");
-                if (m_spec.SelectSingleNode("/amqp/@revision") != null)
-                {
-                    m_revision = GetInt(m_spec, "/amqp/@revision");
-                }
-            }
+            m_majorVersion = GetInt(m_spec, "/amqp/@major");
+            m_minorVersion = GetInt(m_spec, "/amqp/@minor");
+            m_revision = GetInt(m_spec, "/amqp/@revision");
+
+            Console.WriteLine("* Parsing spec for version {0}.{1}.{2}", m_majorVersion, m_minorVersion, m_revision);
             foreach (XmlNode n in m_spec.SelectNodes("/amqp/constant")) {
                 m_constants.Add(new KeyValuePair<string, int>(GetString(n, "@name"), GetInt(n, "@value")));
             }
@@ -843,6 +832,8 @@ public void MaybeEmitModelMethod(MethodInfo method) {
             if (method.IsSpecialName) {
                 // It's some kind of event- or property-related method.
                 // It shouldn't be autogenerated.
+            } else if (method.Name.EndsWith("NoWait")) {
+                // Skip *Nowait versions
             } else if (Attribute(method, typeof(AmqpMethodDoNotImplementAttribute)) != null) {
                 // Skip this method, by request (AmqpMethodDoNotImplement)
             } else if (Attribute(method, typeof(AmqpContentHeaderFactoryAttribute)) != null) {