Added Shared project, resync'd net45 projects with dnx ones

src/Discord.Net.Audio.Net5/Discord.Net.Audio.csproj

@@ -22,6 +22,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <LangVersion>6</LangVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -32,11 +33,19 @@
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <LangVersion>6</LangVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\DiscordBot\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\Discord.Net.Audio\API\Voice.cs">
+      <Link>API\Voice.cs</Link>
+    </Compile>
     <Compile Include="..\Discord.Net.Audio\AudioExtensions.cs">
       <Link>AudioExtensions.cs</Link>
     </Compile>
@@ -46,11 +55,14 @@
     <Compile Include="..\Discord.Net.Audio\AudioServiceConfig.cs">
       <Link>AudioServiceConfig.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net.Audio\DiscordVoiceClient.cs">
-      <Link>DiscordVoiceClient.cs</Link>
+    <Compile Include="..\Discord.Net.Audio\DiscordAudioClient.cs">
+      <Link>DiscordAudioClient.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net.Audio\Net\VoiceWebSocket.cs">
+      <Link>Net\VoiceWebSocket.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net.Audio\IDiscordVoiceClient.cs">
-      <Link>IDiscordVoiceClient.cs</Link>
+    <Compile Include="..\Discord.Net.Audio\Net\VoiceWebSocket.Events.cs">
+      <Link>Net\VoiceWebSocket.Events.cs</Link>
     </Compile>
     <Compile Include="..\Discord.Net.Audio\Opus.cs">
       <Link>Opus.cs</Link>
@@ -67,12 +79,6 @@
     <Compile Include="..\Discord.Net.Audio\VoiceBuffer.cs">
       <Link>VoiceBuffer.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net.Audio\VoiceWebSocket.cs">
-      <Link>VoiceWebSocket.cs</Link>
-    </Compile>
-    <Compile Include="..\Discord.Net.Audio\VoiceWebSocket.Events.cs">
-      <Link>VoiceWebSocket.Events.cs</Link>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -85,6 +91,20 @@
       <Name>Discord.Net</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\Discord.Net.Audio\libsodium.dll">
+      <Link>libsodium.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\Discord.Net.Audio\opus.dll">
+      <Link>opus.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="..\Discord.Net.Shared\Discord.Net.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/Discord.Net.Audio.Net5/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
+</packages>

src/Discord.Net.Audio/project.json

@@ -9,7 +9,7 @@
 		"type": "git",
 		"url": "git://github.com/RogueException/Discord.Net"
 	},
-	"compile": [ "**/*.cs", "../Discord.Net/Helpers/Shared/*.cs" ],
+	"compile": [ "**/*.cs", "../Discord.Net.Shared/*.cs" ],
 	"contentFiles": [ "libsodium.dll", "opus.dll" ],
 
 	"compilationOptions": {

src/Discord.Net.Commands.Net45/Discord.Net.Commands.csproj

@@ -117,6 +117,8 @@
       <Name>Discord.Net</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
+  <Import Project="..\Discord.Net.Shared\Discord.Net.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/Discord.Net.Commands/project.json

@@ -9,7 +9,7 @@
 		"type": "git",
 		"url": "git://github.com/RogueException/Discord.Net"
 	},
-	"compile": [ "**/*.cs", "../Discord.Net/Helpers/Shared/*.cs" ],
+	"compile": [ "**/*.cs", "../Discord.Net.Shared/*.cs" ],
 
 	"compilationOptions": {
 		"warningsAsErrors": true

src/Discord.Net.Modules.Net45/Discord.Net.Modules.csproj

@@ -69,6 +69,7 @@
       <Name>Discord.Net</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="..\Discord.Net.Shared\Discord.Net.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/Discord.Net.Modules/project.json

@@ -9,7 +9,7 @@
 		"type": "git",
 		"url": "git://github.com/RogueException/Discord.Net"
 	},
-	"compile": [ "**/*.cs", "../Discord.Net/Helpers/Shared/*.cs" ],
+	"compile": [ "**/*.cs", "../Discord.Net.Shared/*.cs" ],
 
 	"compilationOptions": {
 		"warningsAsErrors": true

src/Discord.Net.Net45/Discord.Net.csproj

@@ -137,9 +137,6 @@
     <Compile Include="..\Discord.Net\DiscordAPIClient.cs">
       <Link>DiscordAPIClient.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\DiscordAPIClientConfig.cs">
-      <Link>DiscordAPIClientConfig.cs</Link>
-    </Compile>
     <Compile Include="..\Discord.Net\DiscordClient.Channels.cs">
       <Link>DiscordClient.Channels.cs</Link>
     </Compile>
@@ -164,17 +161,8 @@
     <Compile Include="..\Discord.Net\DiscordClient.Users.cs">
       <Link>DiscordClient.Users.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\DiscordClientConfig.cs">
-      <Link>DiscordClientConfig.cs</Link>
-    </Compile>
-    <Compile Include="..\Discord.Net\DiscordWSClient.cs">
-      <Link>DiscordWSClient.cs</Link>
-    </Compile>
-    <Compile Include="..\Discord.Net\DiscordWSClient.Events.cs">
-      <Link>DiscordWSClient.Events.cs</Link>
-    </Compile>
-    <Compile Include="..\Discord.Net\DiscordWSClientConfig.cs">
-      <Link>DiscordWSClientConfig.cs</Link>
+    <Compile Include="..\Discord.Net\DiscordConfig.cs">
+      <Link>DiscordConfig.cs</Link>
     </Compile>
     <Compile Include="..\Discord.Net\Helpers\AsyncCollection.cs">
       <Link>Helpers\AsyncCollection.cs</Link>
@@ -185,33 +173,30 @@
     <Compile Include="..\Discord.Net\Helpers\CachedObject.cs">
       <Link>Helpers\CachedObject.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Helpers\EpochTime.cs">
-      <Link>Helpers\EpochTime.cs</Link>
-    </Compile>
-    <Compile Include="..\Discord.Net\Helpers\Extensions.cs">
-      <Link>Helpers\Extensions.cs</Link>
+    <Compile Include="..\Discord.Net\Helpers\CollectionExtensions.cs">
+      <Link>Helpers\CollectionExtensions.cs</Link>
     </Compile>
     <Compile Include="..\Discord.Net\Helpers\Format.cs">
       <Link>Helpers\Format.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Helpers\IdConvert.cs">
-      <Link>Helpers\IdConvert.cs</Link>
-    </Compile>
     <Compile Include="..\Discord.Net\Helpers\Mention.cs">
       <Link>Helpers\Mention.cs</Link>
     </Compile>
     <Compile Include="..\Discord.Net\Helpers\Reference.cs">
       <Link>Helpers\Reference.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Helpers\TaskHelper.cs">
-      <Link>Helpers\TaskHelper.cs</Link>
-    </Compile>
     <Compile Include="..\Discord.Net\HttpException.cs">
       <Link>HttpException.cs</Link>
     </Compile>
     <Compile Include="..\Discord.Net\IService.cs">
       <Link>IService.cs</Link>
     </Compile>
+    <Compile Include="..\Discord.Net\LogExtensions.cs">
+      <Link>LogExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\LogService.cs">
+      <Link>LogService.cs</Link>
+    </Compile>
     <Compile Include="..\Discord.Net\Models\Channel.cs">
       <Link>Models\Channel.cs</Link>
     </Compile>
@@ -266,9 +251,6 @@
     <Compile Include="..\Discord.Net\Net\WebSockets\WebSocket.cs">
       <Link>Net\WebSockets\WebSocket.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Net\WebSockets\WebSocket.Events.cs">
-      <Link>Net\WebSockets\WebSocket.Events.cs</Link>
-    </Compile>
     <Compile Include="..\Discord.Net\Net\WebSockets\WebSocketSharpEngine.cs">
       <Link>Net\WebSockets\WebSocketSharpEngine.cs</Link>
     </Compile>
@@ -278,20 +260,10 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\Discord.Net\lib\libopus.so">
-      <Link>lib\libopus.so</Link>
-    </None>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="..\Discord.Net\lib\libsodium.dll">
-      <Link>lib\libsodium.dll</Link>
-    </Content>
-    <Content Include="..\Discord.Net\lib\opus.dll">
-      <Link>lib\opus.dll</Link>
-    </Content>
-  </ItemGroup>
   <ItemGroup />
+  <Import Project="..\Discord.Net.Shared\Discord.Net.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/Discord.Net.Shared/Discord.Net.Shared.projitems

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>2875deb5-f248-4105-8ea2-5141e3de8025</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Discord.Net.Shared</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)EpochTime.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)EventHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)IdConvert.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)TaskExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)TaskHelper.cs" />
+  </ItemGroup>
+</Project>

src/Discord.Net.Shared/Discord.Net.Shared.shproj

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>2875deb5-f248-4105-8ea2-5141e3de8025</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="Discord.Net.Shared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>

src/Discord.Net/Helpers/CollectionExtensions.cs

@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Discord
 {

src/Discord.Net/project.json

@@ -14,6 +14,7 @@
 		"type": "git",
 		"url": "git://github.com/RogueException/Discord.Net"
 	},
+	"compile": [ "**/*.cs", "../Discord.Net.Shared/*.cs" ],
 
 	"configurations": {
 		"TestResponses": {