Additional .NET 4.6 target with regards to EasyNetQ/EasyNetQ#623

Author: Richard Green

Source/EasyNetQ/EasyNetQ.csproj

@@ -5,7 +5,7 @@
     <Description>EasyNetQ</Description>
     <PackageTags>RabbitMQ;Messaging;AMQP;C#</PackageTags>
     <PackageIconUrl>https://raw.githubusercontent.com/EasyNetQ/EasyNetQ/gh-pages/design/logo_design.png</PackageIconUrl>
-    <TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net451;net46</TargetFrameworks>
     <DefineConstants>$(DefineConstants);LIBLOG_PUBLIC;LIBLOG_PORTABLE</DefineConstants>
     <DefineConstants>$(DefineConstants);LIBLOG_PUBLIC</DefineConstants>
     <LangVersion>7.1</LangVersion>
@@ -23,15 +23,15 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46' ">
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46' ">
     <DefineConstants>$(DefineConstants);NETFX</DefineConstants>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />

Source/EasyNetQ/LightInject/LightInject.cs

@@ -7421,7 +7421,7 @@ public LocalBuilder DeclareLocal(Type type)
             return localBuilder;
         }
     }
-#if NET452
+#if NET452 && !NET46
 
     /// <summary>
     /// Provides storage per logical thread of execution.
@@ -7854,4 +7854,4 @@ public class ExcludeFromCodeCoverageAttribute : Attribute
     {
     }
 #endif
-}
+}

Source/EasyNetQ/Producer/ClientCommandDispatcherSingleton.cs

@@ -42,7 +42,7 @@ public Task<T> InvokeAsync<T>(Func<IModel, T> channelAction)
         {
             Preconditions.CheckNotNull(channelAction, "channelAction");
 
-#if NETFX
+#if NETFX && !NET46
             var tcs = new TaskCompletionSource<T>();
 #else
             var tcs = new TaskCompletionSource<T>(TaskCreationOptions.RunContinuationsAsynchronously);
@@ -54,7 +54,7 @@ public Task<T> InvokeAsync<T>(Func<IModel, T> channelAction)
                 {
                     if (cancellation.IsCancellationRequested)
                     {
-#if NETFX                               
+#if NETFX && !NET46
                         tcs.TrySetCanceledAsynchronously();   
 #else
                         tcs.TrySetCanceled();
@@ -66,7 +66,7 @@ public Task<T> InvokeAsync<T>(Func<IModel, T> channelAction)
                     {
                         persistentChannel.InvokeChannelAction(channel =>
                         {
-#if NETFX                               
+#if NETFX && !NET46
                             tcs.TrySetResultAsynchronously(channelAction(channel));   
 #else
                             tcs.TrySetResult(channelAction(channel));
@@ -75,7 +75,7 @@ public Task<T> InvokeAsync<T>(Func<IModel, T> channelAction)
                     }
                     catch (Exception e)
                     {
-#if NETFX                               
+#if NETFX && !NET46
                         tcs.TrySetExceptionAsynchronously(e);   
 #else
                         tcs.TrySetException(e);
@@ -131,4 +131,4 @@ private struct NoContentStruct
         {
         }
     }
-}
+}