UPD to amqpnetlite 2.0.0

Author: kornys

CliNetliteInstaller/CliNetliteInstaller.wixproj

@@ -6,7 +6,7 @@
     <ProductVersion>3.10</ProductVersion>
     <ProjectGuid>f13fb7ef-d892-4229-a1eb-8b595d71d64e</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>cli-netlite-1.1.0.4</OutputName>
+    <OutputName>cli-netlite-1.3.0.0</OutputName>
     <OutputType>Package</OutputType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

CliNetliteInstaller/Product.wxs

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?define version="1.1.0.4"?>
+<?define version="1.3.0.0"?>
 <?define UpgradeCode="a580c04f-caec-4e18-9134-c4b8f1c8f1be"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 	<Product Id="*"

ClientLib/ClientLib.csproj

@@ -44,8 +44,8 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Amqp.Net, Version=1.2.0.0, Culture=neutral, PublicKeyToken=905a7b1e6458e0c3, processorArchitecture=MSIL">
-      <HintPath>..\packages\AMQPNetLite.1.2.3\lib\net45\Amqp.Net.dll</HintPath>
+    <Reference Include="Amqp.Net, Version=2.0.0.0, Culture=neutral, PublicKeyToken=905a7b1e6458e0c3, processorArchitecture=MSIL">
+      <HintPath>..\packages\AMQPNetLite.2.0.0\lib\net45\Amqp.Net.dll</HintPath>
     </Reference>
     <Reference Include="NDesk.Options, Version=0.2.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\NDesk.Options.0.2.1\lib\NDesk.Options.dll</HintPath>

ClientLib/CoreClient.cs

@@ -83,7 +83,7 @@ private void SetUpCliLogging(Options options)
             if((options as BasicOptions).LogLib.ToUpper() == "TRANSPORT_FRM")
             {
                 Trace.TraceLevel = TraceLevel.Frame;
-                Trace.TraceListener = (f, a) => Console.WriteLine(
+                Trace.TraceListener = (l, f, a) => Console.WriteLine(
                         DateTime.Now.ToString("[hh:mm:ss.fff]") + " " + string.Format(f, a));
             }
         }

ClientLib/OptionsParser.cs

@@ -128,7 +128,7 @@ public abstract class BasicOptions : LinkOptions
         public int MsgCount { get; protected set; }
         public int CloseSleep { get; protected set; }
         public string SyncMode { get; protected set; }
-        public int Timeout { get; protected set; }
+        public TimeSpan Timeout { get; protected set; }
         public string LogMsgs { get; protected set; }
         public string LogStats { get; protected set; }
         public string LogLib { get; protected set; }
@@ -143,7 +143,7 @@ public BasicOptions() : base()
             this.MsgCount = 1;
             this.CloseSleep = 0;
             this.SyncMode = "none";
-            this.Timeout = 1 * this._toSecConstant;
+            this.Timeout = TimeSpan.FromSeconds(1);
             this.LogMsgs = "upstream";
             this.LogStats = String.Empty;
             this.LogLib = String.Empty;
@@ -156,7 +156,7 @@ public BasicOptions() : base()
             this.Add("sync-mode=", "sync action",
                 (string syncMode) => { this.SyncMode = syncMode; });
             this.Add("t|timeout=", "timeout",
-                (int timeout) => { this.Timeout = timeout * this._toSecConstant; });
+                (int timeout) => { this.Timeout = TimeSpan.FromSeconds(timeout); });
             this.Add("log-msgs=", "log messages output [dict|body|upstream|interop]",
                 (string logMsgs) => { this.LogMsgs = logMsgs; });
             this.Add("log-stats=", "report various statistic/debug information [endpoint]",

ClientLib/SenderClient.cs

@@ -263,7 +263,7 @@ public void Run(string[] args)
                 bool tx_batch_flag = String.IsNullOrEmpty(options.TxLoopendAction) ? (options.TxSize > 0) : true;
 
                 Stopwatch stopwatch = new Stopwatch();
-                TimeSpan timespan = new TimeSpan(0, 0, options.Timeout);
+                TimeSpan timespan = options.Timeout;
 
                 stopwatch.Start();
 

ClientLib/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AMQPNetLite" version="1.2.3" targetFramework="net45" />
+  <package id="AMQPNetLite" version="2.0.0" targetFramework="net45" />
   <package id="NDesk.Options" version="0.2.1" targetFramework="net45" />
 </packages>

cli-netlite.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.15
+VisualStudioVersion = 15.0.26730.16
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClientLib", "ClientLib\ClientLib.csproj", "{6DC6D0F4-85F4-4380-9C49-FF26BC83D000}"
 EndProject