Build for net461 too (#100)

* Build for net461 too * only need reflection in netstandard
jonnii · Nov 22, 2017 · e23b384 · e23b384
1 parent 67840a7
commit e23b384
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 23 deletions.
diff --git a/src/Chinchilla.Api/Chinchilla.Api.csproj b/src/Chinchilla.Api/Chinchilla.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFrameworks>netstandard1.6;net461</TargetFrameworks>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Version>1.0.0</Version>
     <Authors>Jonathan Goldman,Colin Anderson</Authors>
@@ -11,20 +11,12 @@
     <PackageIconUrl>https://raw.github.com/jonnii/chinchilla/master/build/chinchilla.png</PackageIconUrl>
     <PackageTags>rabbitmq management api http chinchilla</PackageTags>
     <Company />
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>TRACE;DEBUG;NETSTANDARD1_6</DefineConstants>
-    <OutputPath>..\..\targets\chinchilla.api</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\..\targets\chinchilla.api</OutputPath>
-    <DefineConstants>TRACE;RELEASE;NETSTANDARD1_6</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="System.Net.Http" Version="4.3.2"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Chinchilla/Chinchilla.csproj b/src/Chinchilla/Chinchilla.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFrameworks>netstandard1.6;net461</TargetFrameworks>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Version>1.0.0</Version>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
@@ -12,22 +12,14 @@
     <PackageIconUrl>https://raw.github.com/jonnii/chinchilla/master/build/chinchilla.png</PackageIconUrl>
     <PackageTags>rabbitmq chinchilla</PackageTags>
     <Company />
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>TRACE;DEBUG;NETSTANDARD1_6</DefineConstants>
-    <OutputPath>..\..\targets\chinchilla</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\..\targets\chinchilla</OutputPath>
-    <DefineConstants>TRACE;RELEASE;NETSTANDARD1_6</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="RabbitMq.Client" Version="5.0.1" />
-    <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+
+    <PackageReference Include="System.Reflection.Emit" Version="4.3.0" Condition="'$(TargetFramework)' != 'net461'" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Chinchilla/SubscriptionFactory.cs b/src/Chinchilla/SubscriptionFactory.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-
 using Chinchilla.Configuration;
 using Chinchilla.Logging;
 using Chinchilla.Topologies.Model;
@@ -33,7 +32,7 @@ public IEnumerable<ISubscription> List()
         public string GetMessageTypeName(Type type)
         {
             var typeName = type.Name;
-            
+
             if (!type.GetTypeInfo().IsInterface)
             {
                 return typeName;