.Net Core support

.gitignore

@@ -52,6 +52,12 @@ build/
 [Bb]in/
 [Oo]bj/
 
+# Visual Studio 2015 cache/options directory
+.vs/
+
+# DNX
+project.lock.json
+
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
@@ -131,8 +137,7 @@ publish/
 *.pubxml
 
 # NuGet Packages Directory
-## TODO: If you have NuGet Package Restore enabled, uncomment the next line
-#packages/
+packages/
 
 # Windows Azure Build Output
 csx

IntegrationTest/IntegrationTest.csproj

@@ -35,14 +35,18 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Polly, Version=2.2.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Polly.2.2.3\lib\net45\Polly.dll</HintPath>
+    <Reference Include="Polly, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Polly.4.3.0\lib\net45\Polly.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="SlackAPI, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\SlackAPI\bin\Debug\net45\SlackAPI.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
   </ItemGroup>
   <Choose>
@@ -69,12 +73,6 @@
     <Compile Include="JoinDirectMessageChannel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\SlackAPI.csproj">
-      <Project>{0c0a58a8-174e-4a4c-907b-c3569144d15d}</Project>
-      <Name>SlackAPI</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="Configuration\config.default.json" />
     <None Include="Configuration\config.json">

IntegrationTest/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
-  <package id="Polly" version="2.2.3" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="Polly" version="4.3.0" targetFramework="net45" />
 </packages>

Nuget.config

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageRestore>
+    <add key="enabled" value="True" />
+  </packageRestore>
+  <packageSources>
+    <clear/>
+    <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+  <activePackageSource>
+    <add key="All" value="(Aggregate source)" />
+  </activePackageSource>
+</configuration>

SlackAPI.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>SlackAPI</id>
-        <version>1.0.4.1</version>
+        <version>1.0.5.0</version>
         <title>SlackAPI</title>
         <authors>Inumedia</authors>
         <owners>Inumedia</owners>
@@ -14,12 +14,12 @@
         <language>en-US</language>
         <dependencies>
             <group targetFramework=".NETFramework4.5">
-                <dependency id="Newtonsoft.Json" version="7.0.0" />
+                <dependency id="Newtonsoft.Json" version="9.0.1" />
             </group>
         </dependencies>
     </metadata>
     <files>
-        <file src="lib\net45\SlackAPI.dll" target="lib\net45\SlackAPI.dll" />
-        <file src="lib\net45\SlackAPI.pdb" target="lib\net45\SlackAPI.pdb" />
+        <file src="SlackAPI\bin\Release\net45\SlackAPI.dll" target="lib\net45\SlackAPI.dll" />
+        <file src="SlackAPI\bin\Release\net45\SlackAPI.pdb" target="lib\net45\SlackAPI.pdb" />
     </files>
-</package>
+</package>

SlackAPI.sln

@@ -1,30 +1,32 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SlackAPI", "SlackAPI.csproj", "{0C0A58A8-174E-4A4C-907B-C3569144D15D}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTest", "IntegrationTest\IntegrationTest.csproj", "{C254F6FF-81D4-46DF-AA21-3D1A6456253B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{80450DB7-6A58-491E-8568-D5B7E0051169} = {80450DB7-6A58-491E-8568-D5B7E0051169}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SlackApi.Console", "SlackApi.Console\SlackApi.Console.csproj", "{19140E48-E1A9-421D-86DB-5AF18EECFEF2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{80450DB7-6A58-491E-8568-D5B7E0051169} = {80450DB7-6A58-491E-8568-D5B7E0051169}
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{9FC74E78-2D91-407E-B4C8-7C89D6CECB5B}"
 	ProjectSection(SolutionItems) = preProject
 		LICENSE = LICENSE
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SlackAPI", "SlackAPI\SlackAPI.xproj", "{80450DB7-6A58-491E-8568-D5B7E0051169}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0C0A58A8-174E-4A4C-907B-C3569144D15D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C0A58A8-174E-4A4C-907B-C3569144D15D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C0A58A8-174E-4A4C-907B-C3569144D15D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0C0A58A8-174E-4A4C-907B-C3569144D15D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C254F6FF-81D4-46DF-AA21-3D1A6456253B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C254F6FF-81D4-46DF-AA21-3D1A6456253B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C254F6FF-81D4-46DF-AA21-3D1A6456253B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -33,6 +35,10 @@ Global
 		{19140E48-E1A9-421D-86DB-5AF18EECFEF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{19140E48-E1A9-421D-86DB-5AF18EECFEF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{19140E48-E1A9-421D-86DB-5AF18EECFEF2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{80450DB7-6A58-491E-8568-D5B7E0051169}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{80450DB7-6A58-491E-8568-D5B7E0051169}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{80450DB7-6A58-491E-8568-D5B7E0051169}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{80450DB7-6A58-491E-8568-D5B7E0051169}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Extensions.cs → SlackAPI/Extensions.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Runtime.Serialization;
 using Newtonsoft.Json;
 
 namespace SlackAPI
@@ -30,18 +29,17 @@ public static string ToProperTimeStamp(this DateTime that, bool toUTC = true)
         public static K Deserialize<K>(this string data)
             where K : class
         {
-            return JsonConvert.DeserializeObject<K>(data, CreateSettings(data));
+            return JsonConvert.DeserializeObject<K>(data, CreateSettings());
         }
 
         public static object Deserialize(this string data, Type type)
         {
-            return JsonConvert.DeserializeObject(data, type, CreateSettings(data));
+            return JsonConvert.DeserializeObject(data, type, CreateSettings());
         }
 
-        private static JsonSerializerSettings CreateSettings(object contextData)
+        private static JsonSerializerSettings CreateSettings()
         {
             JsonSerializerSettings settings = new JsonSerializerSettings();
-            settings.Context = new StreamingContext(StreamingContextStates.Other, contextData);
             settings.Converters = Converters;
 
             return settings;