From 16418f61b9b52bd3ba546fc26acb1a0b19233b36 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Sat, 17 Oct 2015 23:44:55 -0300
Subject: [PATCH] Move TaskHelper to Shared folder

---
 src/Discord.Net.Commands/CommandBuilder.cs              |  6 +-----
 src/Discord.Net.Commands/project.json                   |  1 +
 src/Discord.Net.Net45/Discord.Net.csproj                | 10 ++++++++--
 .../Helpers/{TaskHelper.cs => TaskExtensions.cs}        | 16 +++-------------
 src/Discord.Net/Shared/TaskHelper.cs                    | 17 +++++++++++++++++
 5 files changed, 30 insertions(+), 20 deletions(-)
 rename src/Discord.Net/Helpers/{TaskHelper.cs => TaskExtensions.cs} (83%)
 create mode 100644 src/Discord.Net/Shared/TaskHelper.cs

diff --git a/src/Discord.Net.Commands/CommandBuilder.cs b/src/Discord.Net.Commands/CommandBuilder.cs
index aca8dd46b..0db5a388f 100644
--- a/src/Discord.Net.Commands/CommandBuilder.cs
+++ b/src/Discord.Net.Commands/CommandBuilder.cs
@@ -61,11 +61,7 @@ namespace Discord.Commands
 		}
 		public CommandBuilder Do(Action<CommandEventArgs> func)
 		{
-#if DNXCORE50
-			_command.Handler = e => { func(e); return Task.CompletedTask; };
-#else
-			_command.Handler = e => { func(e); return Task.Delay(0); };
-#endif
+			_command.Handler = e => { func(e); return TaskHelper.CompletedTask; };
 			return this;
 		}
 	}
diff --git a/src/Discord.Net.Commands/project.json b/src/Discord.Net.Commands/project.json
index f4aed4985..668ba485b 100644
--- a/src/Discord.Net.Commands/project.json
+++ b/src/Discord.Net.Commands/project.json
@@ -5,6 +5,7 @@
 	"tags": [ "discord", "discordapp" ],
 	"projectUrl": "https://github.com/RogueException/Discord.Net",
 	"licenseUrl": "http://opensource.org/licenses/MIT",
+	"compile": ["**/*.cs", "../Discord.Net/Shared/*.cs"],
 	"repository": {
 		"type": "git",
 		"url": "git://github.com/RogueException/Discord.Net"
diff --git a/src/Discord.Net.Net45/Discord.Net.csproj b/src/Discord.Net.Net45/Discord.Net.csproj
index 24844af8f..4357803a8 100644
--- a/src/Discord.Net.Net45/Discord.Net.csproj
+++ b/src/Discord.Net.Net45/Discord.Net.csproj
@@ -184,8 +184,8 @@
     <Compile Include="..\Discord.Net\Helpers\MessageCleaner.cs">
       <Link>Helpers\MessageCleaner.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Helpers\TaskHelper.cs">
-      <Link>Helpers\TaskHelper.cs</Link>
+    <Compile Include="..\Discord.Net\Helpers\TaskExtensions.cs">
+      <Link>Helpers\TaskExtensions.cs</Link>
     </Compile>
     <Compile Include="..\Discord.Net\Mention.cs">
       <Link>Mention.cs</Link>
@@ -217,6 +217,9 @@
     <Compile Include="..\Discord.Net\Models\User.cs">
       <Link>Models\User.cs</Link>
     </Compile>
+    <Compile Include="..\Discord.Net\Shared\TaskHelper.cs">
+      <Link>Shared\TaskHelper.cs</Link>
+    </Compile>
     <Compile Include="..\Discord.Net\TimeoutException.cs">
       <Link>TimeoutException.cs</Link>
     </Compile>
@@ -238,6 +241,9 @@
     <Compile Include="..\Discord.Net\WebSockets\Voice\Events.cs">
       <Link>WebSockets\Voice\Events.cs</Link>
     </Compile>
+    <Compile Include="..\Discord.Net\WebSockets\Voice\VoiceBuffer.cs">
+      <Link>WebSockets\Voice\VoiceBuffer.cs</Link>
+    </Compile>
     <Compile Include="..\Discord.Net\WebSockets\Voice\VoiceWebSocket.cs">
       <Link>WebSockets\Voice\VoiceWebSocket.cs</Link>
     </Compile>
diff --git a/src/Discord.Net/Helpers/TaskHelper.cs b/src/Discord.Net/Helpers/TaskExtensions.cs
similarity index 83%
rename from src/Discord.Net/Helpers/TaskHelper.cs
rename to src/Discord.Net/Helpers/TaskExtensions.cs
index 348678267..fa555dc0a 100644
--- a/src/Discord.Net/Helpers/TaskHelper.cs
+++ b/src/Discord.Net/Helpers/TaskExtensions.cs
@@ -2,26 +2,16 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Discord.Helpers
+namespace Discord
 {
-	internal static class TaskHelper
+    public static class TaskExtensions
 	{
-		public static Task CompletedTask { get; }
-		static TaskHelper()
-		{
-#if DNXCORE50
-			CompletedTask = Task.CompletedTask;
-#else
-			CompletedTask = Task.Delay(0);
-#endif
-		}
-
 		public static async Task Timeout(this Task self, int milliseconds)
 		{
 			Task timeoutTask = Task.Delay(milliseconds);
 			Task finishedTask = await Task.WhenAny(self, timeoutTask);
 			if (finishedTask == timeoutTask)
-                throw new TimeoutException();
+				throw new TimeoutException();
 			else
 				await self;
 		}
diff --git a/src/Discord.Net/Shared/TaskHelper.cs b/src/Discord.Net/Shared/TaskHelper.cs
new file mode 100644
index 000000000..0dd82d5b0
--- /dev/null
+++ b/src/Discord.Net/Shared/TaskHelper.cs
@@ -0,0 +1,17 @@
+using System.Threading.Tasks;
+
+namespace Discord
+{
+	internal static class TaskHelper
+	{
+		public static Task CompletedTask { get; }
+		static TaskHelper()
+		{
+#if DNXCORE50
+			CompletedTask = Task.CompletedTask;
+#else
+			CompletedTask = Task.Delay(0);
+#endif
+		}
+	}
+}