add arg validation and remove async for .net core (per robinrodricks#127

)
erisonliang · Jul 25, 2017 · 04f70bb · 04f70bb
1 parent 50d0155
commit 04f70bb
Show file tree

Hide file tree

Showing 17 changed files with 396 additions and 94 deletions.
diff --git a/FluentFTP.Tests/Tests.cs b/FluentFTP.Tests/Tests.cs
@@ -7,7 +7,7 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using System.Linq;
-#if (CORE || NETFX45)
+#if NETFX45
 using System.Threading.Tasks;
 #endif
 using System.IO.Compression;
@@ -127,7 +127,7 @@ static void Main(string[] args) {
 
 
                 //Async Tests
-#if (CORE || NETFX45)
+#if NETFX45
 				TestAsyncMethods();
 #endif
 
@@ -139,7 +139,7 @@ static void Main(string[] args) {
 			// Console.ReadKey();
 		}
 
-#if (CORE || NETFX45)
+#if NETFX45
 		private static void TestAsyncMethods() {
 			FtpTrace.WriteLine("Running Async Tests");
 			List<Task> tasks = new List<Task>() {
@@ -213,7 +213,7 @@ static void TestListPath() {
 			}
 		}
 
-#if (CORE || NETFX45)
+#if NETFX45
         static async Task TestListPathAsync()
         {
             using (FtpClient cl = new FtpClient())
@@ -258,7 +258,7 @@ static void StreamResponses() {
 			}
 		}
 
-#if (CORE || NETFX45)
+#if NETFX45
         static async Task StreamResponsesAsync()
         {
             using (FtpClient cl = new FtpClient())
@@ -330,7 +330,7 @@ static void TestGetObjectInfo() {
 			}
 		}
 
-#if (CORE || NETFX45)
+#if NETFX45
         static async Task TestGetObjectInfoAsync()
         {
             using (FtpClient cl = new FtpClient())
@@ -405,7 +405,7 @@ static void TestServerDownload(FtpClient client, string path) {
 			}
 		}
 
-#if (CORE || NETFX45)
+#if NETFX45
         static async Task TestServerDownloadAsync(FtpClient client, string path)
         {
             foreach (FtpListItem i in await client.GetListingAsync(path))
@@ -706,7 +706,7 @@ static void TestHash() {
 			}
 		}
 
-#if (CORE || NETFX45)
+#if NETFX45
         static async Task TestHashAsync()
         {
             using (FtpClient cl = new FtpClient())
@@ -1014,7 +1014,7 @@ static void TestUploadDownloadFile() {
 			}
 		}
 
-#if (CORE || NETFX45)
+#if NETFX45
         static async Task TestUploadDownloadFileAsync()
         {
 
@@ -1102,7 +1102,7 @@ static void TestUploadDownloadManyFiles() {
 			}
 		}
 
-#if (CORE || NETFX45)
+#if NETFX45
         static async Task TestUploadDownloadManyFilesAsync()
         {
 
@@ -1153,7 +1153,7 @@ static void TestUploadDownloadManyFiles2() {
 			}
 		}
 
-#if (CORE || NETFX45)
+#if NETFX45
         static async Task TestUploadDownloadManyFiles2Async()
         {
 

diff --git a/FluentFTP/Client/FtpClient_Connection.cs b/FluentFTP/Client/FtpClient_Connection.cs
@@ -19,7 +19,7 @@
 #if (CORE || NETFX)
 using System.Threading;
 #endif
-#if (CORE || NETFX45)
+#if NETFX45
 using System.Threading.Tasks;
 #endif
 
@@ -858,6 +858,7 @@ public FtpReply Execute(string command) {
 			return reply;
 		}
 
+#if !CORE
 		delegate FtpReply AsyncExecute(string command);
 
 		/// <summary>
@@ -889,8 +890,9 @@ public IAsyncResult BeginExecute(string command, AsyncCallback callback, object
 		public FtpReply EndExecute(IAsyncResult ar) {
 			return GetAsyncDelegate<AsyncExecute>(ar).EndInvoke(ar);
 		}
+#endif
 
-#if (CORE || NETFX45)
+#if NETFX45
 		/// <summary>
 		/// Performs an asynchronous execution of the specified command
 		/// </summary>
@@ -1198,6 +1200,7 @@ protected virtual void GetFeatures(FtpReply reply) {
 			}
 		}
 
+#if !CORE
 		delegate void AsyncConnect();
 
 		/// <summary>
@@ -1228,8 +1231,9 @@ public IAsyncResult BeginConnect(AsyncCallback callback, object state) {
 		public void EndConnect(IAsyncResult ar) {
 			GetAsyncDelegate<AsyncConnect>(ar).EndInvoke(ar);
 		}
+#endif
 
-#if (CORE || NETFX45)
+#if NETFX45
 		/// <summary>
 		/// Connects to the server asynchronously
 		/// </summary>
@@ -1304,6 +1308,7 @@ public virtual void Disconnect() {
 #endif
 		}
 
+#if !CORE
 		delegate void AsyncDisconnect();
 
 		/// <summary>
@@ -1334,7 +1339,8 @@ public void EndDisconnect(IAsyncResult ar) {
 			GetAsyncDelegate<AsyncDisconnect>(ar).EndInvoke(ar);
 		}
 
-#if (CORE || NETFX45)
+#endif
+#if NETFX45
 		/// <summary>
 		/// Disconnects from the server asynchronously
 		/// </summary>