noobot · Workshop2 · Jan 16, 2017 · Dec 11, 2016 · Dec 11, 2016 · Dec 11, 2016
diff --git a/src/SlackConnector.Tests.Integration/SlackConnector.Tests.Integration.csproj b/src/SlackConnector.Tests.Integration/SlackConnector.Tests.Integration.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SlackConnector.Tests.Integration</RootNamespace>
     <AssemblyName>SlackConnector.Tests.Integration</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

diff --git a/src/SlackConnector.Tests.Integration/app.config b/src/SlackConnector.Tests.Integration/app.config
@@ -8,4 +8,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
diff --git a/src/SlackConnector.Tests.Integration/packages.config b/src/SlackConnector.Tests.Integration/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="NUnit" version="2.6.4" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net46" />
+  <package id="NUnit" version="2.6.4" targetFramework="net46" />
 </packages>
diff --git a/src/SlackConnector.Tests.Unit/SlackConnectionTests/InboundMessageTests/ChannelJoinedTests.cs b/src/SlackConnector.Tests.Unit/SlackConnectionTests/InboundMessageTests/ChannelJoinedTests.cs
@@ -21,7 +21,7 @@ protected override void Given()
             SUT.OnChatHubJoined += hub =>
             {
                 _lastHub = hub;
-                return Task.FromResult(false);
+                return Task.CompletedTask;
             };
 
             InboundMessage = new ChannelJoinedMessage
@@ -56,7 +56,7 @@ protected override void Given()
             SUT.OnChatHubJoined += hub =>
             {
                 _lastHub = hub;
-                return Task.FromResult(false);
+                return Task.CompletedTask;
             };
 
             InboundMessage = new ChannelJoinedMessage

diff --git a/src/SlackConnector.Tests.Unit/SlackConnectionTests/InboundMessageTests/DmJoinedTests.cs b/src/SlackConnector.Tests.Unit/SlackConnectionTests/InboundMessageTests/DmJoinedTests.cs
@@ -19,7 +19,7 @@ protected override void Given()
             SUT.OnChatHubJoined += hub =>
             {
                 _lastHub = hub;
-                return Task.FromResult(false);
+                return Task.CompletedTask;
             };
 
             InboundMessage = new DmChannelJoinedMessage

diff --git a/src/SlackConnector.Tests.Unit/SlackConnectionTests/InboundMessageTests/GroupJoinedTests.cs b/src/SlackConnector.Tests.Unit/SlackConnectionTests/InboundMessageTests/GroupJoinedTests.cs
@@ -19,7 +19,7 @@ protected override void Given()
             SUT.OnChatHubJoined += hub =>
             {
                 _lastHub = hub;
-                return Task.FromResult(false);
+                return Task.CompletedTask;
             };
 
             InboundMessage = new GroupJoinedMessage
@@ -54,7 +54,7 @@ protected override void Given()
             SUT.OnChatHubJoined += hub =>
             {
                 _lastHub = hub;
-                return Task.FromResult(false);
+                return Task.CompletedTask;
             };
 
             InboundMessage = new GroupJoinedMessage

diff --git a/src/SlackConnector.Tests.Unit/SlackConnectionTests/InboundMessageTests/UserJoinedTests.cs b/src/SlackConnector.Tests.Unit/SlackConnectionTests/InboundMessageTests/UserJoinedTests.cs
@@ -22,7 +22,7 @@ protected override void Given()
             SUT.OnUserJoined += user =>
             {
                 _lastUser = user;
-                return Task.FromResult(false);
+                return Task.CompletedTask;
             };
 
             InboundMessage = new UserJoinedMessage
@@ -73,7 +73,7 @@ protected override void Given()
             SUT.OnUserJoined += slackUser =>
             {
                 _lastUser = slackUser;
-                return Task.FromResult(false);
+                return Task.CompletedTask;
             };
 
             InboundMessage = new UserJoinedMessage

diff --git a/src/SlackConnector.Tests.Unit/SlackConnector.Tests.Unit.csproj b/src/SlackConnector.Tests.Unit/SlackConnector.Tests.Unit.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SlackConnector.Tests.Unit</RootNamespace>
     <AssemblyName>SlackConnector.Tests.Unit</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -32,12 +32,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ExpectedObjects, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\ExpectedObjects.1.1.1\lib\net40\ExpectedObjects.dll</HintPath>
+    <Reference Include="ExpectedObjects, Version=1.2.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\ExpectedObjects.1.2.3\lib\net40\ExpectedObjects.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.2.1402.2112, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -52,8 +52,8 @@
       <HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
@@ -65,27 +65,27 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
+      <HintPath>..\..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Should, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Should.1.1.20\lib\Should.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SpecsFor, Version=4.3.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SpecsFor.4.3.2\lib\net40\SpecsFor.dll</HintPath>
+    <Reference Include="SpecsFor, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SpecsFor.5.0.0\lib\net40\SpecsFor.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="StructureMap, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\structuremap.3.1.0.133\lib\net40\StructureMap.dll</HintPath>
+    <Reference Include="StructureMap, Version=4.1.3.394, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\structuremap.4.1.3.394\lib\net40\StructureMap.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="StructureMap.AutoMocking.Moq, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\structuremap.automocking.moq.3.1.0.133\lib\net40\StructureMap.AutoMocking.Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="StructureMap.Net4, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\structuremap.3.1.0.133\lib\net40\StructureMap.Net4.dll</HintPath>
+    <Reference Include="StructureMap.Net4, Version=4.1.3.394, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\structuremap.4.1.3.394\lib\net40\StructureMap.Net4.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -142,11 +142,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
     <EmbeddedResource Include="Resources\Responses\HandShake.json" />
     <EmbeddedResource Include="Resources\Inputs\Attachments.json" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

diff --git a/src/SlackConnector.Tests.Unit/app.config b/src/SlackConnector.Tests.Unit/app.config
@@ -2,6 +2,10 @@
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.6.4.14350" newVersion="2.6.4.14350" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration>
diff --git a/src/SlackConnector.Tests.Unit/packages.config b/src/SlackConnector.Tests.Unit/packages.config
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ExpectedObjects" version="1.1.1" targetFramework="net45" />
-  <package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
-  <package id="NUnit" version="2.6.3" targetFramework="net45" />
-  <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net45" />
-  <package id="RestSharp" version="105.2.3" targetFramework="net45" />
-  <package id="Should" version="1.1.20" targetFramework="net45" />
-  <package id="SpecsFor" version="4.3.2" targetFramework="net45" />
-  <package id="structuremap" version="3.1.0.133" targetFramework="net45" />
-  <package id="structuremap.automocking.moq" version="3.1.0.133" targetFramework="net45" />
+  <package id="ExpectedObjects" version="1.2.3" targetFramework="net46" />
+  <package id="Moq" version="4.2.1510.2205" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net46" />
+  <package id="NUnit" version="2.6.4" targetFramework="net46" />
+  <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net46" />
+  <package id="RestSharp" version="105.2.3" targetFramework="net46" />
+  <package id="Should" version="1.1.20" targetFramework="net46" />
+  <package id="SpecsFor" version="5.0.0" targetFramework="net46" />
+  <package id="structuremap" version="4.1.3.394" targetFramework="net46" />
+  <package id="structuremap.automocking.moq" version="3.1.0.133" targetFramework="net46" />
 </packages>
diff --git a/src/SlackConnector/SlackConnection.cs b/src/SlackConnector/SlackConnection.cs
@@ -64,7 +64,10 @@ public void Initialise(ConnectionInformation connectionInformation)
 
         private Task ListenTo(InboundMessage inboundMessage)
         {
-            if (inboundMessage == null) return Task.FromResult(false);
+            if (inboundMessage == null)
+            {
+                return Task.CompletedTask;
+            }
 
             switch (inboundMessage.MessageType)
             {
@@ -75,16 +78,16 @@ private Task ListenTo(InboundMessage inboundMessage)
                 case MessageType.Team_Join: return HandleUserJoined((UserJoinedMessage)inboundMessage);
             }
 
-            return Task.FromResult(false);
+            return Task.CompletedTask;
         }
 
         private Task HandleMessage(ChatMessage inboundMessage)
         {
             if (string.IsNullOrEmpty(inboundMessage.User))
-                return Task.FromResult(false);
+                return Task.CompletedTask;
 
-            if (!string.IsNullOrEmpty(Self.Id) && inboundMessage.User == Self.Id)
-                return Task.FromResult(false);
+            if(!string.IsNullOrEmpty(Self.Id) && inboundMessage.User == Self.Id)
+                return Task.CompletedTask;
 
             //TODO: Insert into connectedHubs when DM is missing
 
@@ -104,7 +107,7 @@ private Task HandleMessage(ChatMessage inboundMessage)
         private Task HandleGroupJoined(GroupJoinedMessage inboundMessage)
         {
             string channelId = inboundMessage?.Channel?.Id;
-            if (channelId == null) return Task.FromResult(false);
+            if (channelId == null) return Task.CompletedTask;
 
             var hub = inboundMessage.Channel.ToChatHub();
             _connectedHubs[channelId] = hub;
@@ -115,7 +118,7 @@ private Task HandleGroupJoined(GroupJoinedMessage inboundMessage)
         private Task HandleChannelJoined(ChannelJoinedMessage inboundMessage)
         {
             string channelId = inboundMessage?.Channel?.Id;
-            if (channelId == null) return Task.FromResult(false);
+            if (channelId == null) return Task.CompletedTask;
 
             var hub = inboundMessage.Channel.ToChatHub();
             _connectedHubs[channelId] = hub;
@@ -126,7 +129,7 @@ private Task HandleChannelJoined(ChannelJoinedMessage inboundMessage)
         private Task HandleDmJoined(DmChannelJoinedMessage inboundMessage)
         {
             string channelId = inboundMessage?.Channel?.Id;
-            if (channelId == null) return Task.FromResult(false);
+            if (channelId == null) return Task.CompletedTask;
 
             var hub = inboundMessage.Channel.ToChatHub(_userCache.Values.ToArray());
             _connectedHubs[channelId] = hub;

diff --git a/src/SlackConnector/SlackConnector.csproj b/src/SlackConnector/SlackConnector.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SlackConnector</RootNamespace>
     <AssemblyName>SlackConnector</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -37,7 +37,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
+      <HintPath>..\..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/src/SlackConnector/app.config b/src/SlackConnector/app.config
@@ -8,4 +8,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
diff --git a/src/SlackConnector/packages.config b/src/SlackConnector/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
-  <package id="RestSharp" version="105.2.3" targetFramework="net45" />
-  <package id="websocket-sharp-with-proxy-support" version="1.9.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net46" />
+  <package id="RestSharp" version="105.2.3" targetFramework="net46" />
+  <package id="websocket-sharp-with-proxy-support" version="1.9.1" targetFramework="net46" />
 </packages>