Merge pull request #1141 from rabbitmq/lukebakken/fix-appveyor

Fix and update AppVeyor build

(cherry picked from commit 4628927)

Author: michaelklishin

.travis.yml

@@ -3,14 +3,13 @@ version: "7.0.0.{build}"
 platform: Any CPU
 configuration: Release
 skip_tags: true
-skip_branch_with_pr: true
 image: Visual Studio 2019
 
 cache:
   # Note: this must match the $rabbitmq_installer_path and $erlang_installer_path values in
   # tools\appveyor\install.ps1
-  - "%HOMEDRIVE%%HOMEPATH%\\rabbitmq-server-3.8.9.exe"
-  - "%HOMEDRIVE%%HOMEPATH%\\otp_win64_23.1.2.exe"
+  - "%HOMEDRIVE%%HOMEPATH%\\rabbitmq-server-3.9.13.exe"
+  - "%HOMEDRIVE%%HOMEPATH%\\otp_win64_24.2.1.exe"
 
 install:
   - ps: .\tools\appveyor\install.ps1

appveyor.yml

@@ -1,5 +1,5 @@
 @ECHO OFF
 set DOTNET_CLI_TELEMETRY_OPTOUT=1
 dotnet restore .\RabbitMQDotNetClient.sln
-dotnet run -p .\projects\Apigen\Apigen.csproj --apiName:AMQP_0_9_1 .\projects\specs\amqp0-9-1.stripped.xml .\gensrc\autogenerated-api-0-9-1.cs
+dotnet run --project .\projects\Apigen\Apigen.csproj --apiName:AMQP_0_9_1 .\projects\specs\amqp0-9-1.stripped.xml .\gensrc\autogenerated-api-0-9-1.cs
 dotnet build .\RabbitMQDotNetClient.sln

build.bat

@@ -14,7 +14,7 @@ fi
 cd "$script_dir"
 
 dotnet restore ./RabbitMQDotNetClient.sln
-dotnet run -p ./projects/Apigen/Apigen.csproj --apiName:AMQP_0_9_1 \
+dotnet run --project ./projects/Apigen/Apigen.csproj --apiName:AMQP_0_9_1 \
     ./projects/specs/amqp0-9-1.stripped.xml \
     ./gensrc/autogenerated-api-0-9-1.cs
 dotnet build ./RabbitMQDotNetClient.sln

build.sh

@@ -29,5 +29,10 @@ public void Dispose()
                 ArrayPool<byte>.Shared.Return(_rentedArray);
             }
         }
+
+        public override string ToString()
+        {
+            return $"IncomingCommand Method={Method.ProtocolMethodName}, Body.Length={Body.Length}";
+        }
     }
 }

projects/RabbitMQ.Client/client/impl/IncomingCommand.cs

@@ -883,4 +883,4 @@ namespace RabbitMQ.Client.Logging
         public string Type { get; }
         public override string ToString() { }
     }
-}
+}

projects/Unit/APIApproval.Approve.verified.txt

@@ -504,7 +504,7 @@ internal Process ExecCommand(string command, string args)
             return ExecCommand(command, args, null);
         }
 
-        internal Process ExecCommand(string ctl, string args, string changeDirTo)
+        internal Process ExecCommand(string cmd, string args, string changeDirTo)
         {
             var proc = new Process
             {
@@ -514,31 +514,25 @@ internal Process ExecCommand(string ctl, string args, string changeDirTo)
                     UseShellExecute = false
                 }
             };
-            if(changeDirTo != null)
+
+            if (changeDirTo != null)
             {
                 proc.StartInfo.WorkingDirectory = changeDirTo;
             }
 
-            string cmd;
-            if(IsRunningOnMonoOrDotNetCore()) {
-                cmd  = ctl;
-            } else {
-                cmd  = "cmd.exe";
-                args = $"/c \"\"{ctl}\" {args}\"";
-            }
-
             try {
               proc.StartInfo.FileName = cmd;
               proc.StartInfo.Arguments = args;
               proc.StartInfo.RedirectStandardError = true;
               proc.StartInfo.RedirectStandardOutput = true;
 
               proc.Start();
-                string stderr = proc.StandardError.ReadToEnd();
               proc.WaitForExit();
+
+              string stderr = proc.StandardError.ReadToEnd();
               if (stderr.Length >  0 || proc.ExitCode > 0)
               {
-                    string stdout = proc.StandardOutput.ReadToEnd();
+                  string stdout = proc.StandardOutput.ReadToEnd();
                   ReportExecFailure(cmd, args, $"{stderr}\n{stdout}");
               }
 
@@ -649,21 +643,21 @@ internal List<ConnectionInfo> ListConnections()
         internal void CloseConnection(IConnection conn)
         {
             ConnectionInfo ci = ListConnections().First(x => conn.ClientProvidedName == x.Name);
-            CloseConnection(ci.Pid);
+            CloseConnection(conn.ClientProvidedName, ci.Pid);
         }
 
         internal void CloseAllConnections()
         {
             List<ConnectionInfo> cs = ListConnections();
             foreach(ConnectionInfo c in cs)
             {
-                CloseConnection(c.Pid);
+                CloseConnection(c.Name, c.Pid);
             }
         }
 
-        internal void CloseConnection(string pid)
+        internal void CloseConnection(string name, string pid)
         {
-            ExecRabbitMQCtl($"close_connection \"{pid}\" \"Closed via rabbitmqctl\"");
+            ExecRabbitMQCtl($"close_connection \"{pid}\" \"{name} {pid} closed via rabbitmqctl\"");
         }
 
         internal void RestartRabbitMQ()