Skip to content

Commit e23b384

Browse files
authored
Build for net461 too (#100)
* Build for net461 too * only need reflection in netstandard
1 parent 67840a7 commit e23b384

File tree

3 files changed

+6
-23
lines changed

3 files changed

+6
-23
lines changed
Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.6</TargetFramework>
4+
<TargetFrameworks>netstandard1.6;net461</TargetFrameworks>
55
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
66
<Version>1.0.0</Version>
77
<Authors>Jonathan Goldman,Colin Anderson</Authors>
@@ -11,20 +11,12 @@
1111
<PackageIconUrl>https://raw.github.com/jonnii/chinchilla/master/build/chinchilla.png</PackageIconUrl>
1212
<PackageTags>rabbitmq management api http chinchilla</PackageTags>
1313
<Company />
14-
</PropertyGroup>
15-
16-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
17-
<DefineConstants>TRACE;DEBUG;NETSTANDARD1_6</DefineConstants>
18-
<OutputPath>..\..\targets\chinchilla.api</OutputPath>
19-
</PropertyGroup>
20-
21-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
2214
<OutputPath>..\..\targets\chinchilla.api</OutputPath>
23-
<DefineConstants>TRACE;RELEASE;NETSTANDARD1_6</DefineConstants>
2415
</PropertyGroup>
2516

2617
<ItemGroup>
2718
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
19+
<PackageReference Include="System.Net.Http" Version="4.3.2"/>
2820
</ItemGroup>
2921

3022
</Project>

src/Chinchilla/Chinchilla.csproj

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.6</TargetFramework>
4+
<TargetFrameworks>netstandard1.6;net461</TargetFrameworks>
55
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
66
<Version>1.0.0</Version>
77
<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
@@ -12,22 +12,14 @@
1212
<PackageIconUrl>https://raw.github.com/jonnii/chinchilla/master/build/chinchilla.png</PackageIconUrl>
1313
<PackageTags>rabbitmq chinchilla</PackageTags>
1414
<Company />
15-
</PropertyGroup>
16-
17-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
18-
<DefineConstants>TRACE;DEBUG;NETSTANDARD1_6</DefineConstants>
19-
<OutputPath>..\..\targets\chinchilla</OutputPath>
20-
</PropertyGroup>
21-
22-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
2315
<OutputPath>..\..\targets\chinchilla</OutputPath>
24-
<DefineConstants>TRACE;RELEASE;NETSTANDARD1_6</DefineConstants>
2516
</PropertyGroup>
2617

2718
<ItemGroup>
2819
<PackageReference Include="RabbitMq.Client" Version="5.0.1" />
29-
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
3020
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
21+
22+
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" Condition="'$(TargetFramework)' != 'net461'" />
3123
</ItemGroup>
3224

3325
</Project>

src/Chinchilla/SubscriptionFactory.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Reflection;
5-
65
using Chinchilla.Configuration;
76
using Chinchilla.Logging;
87
using Chinchilla.Topologies.Model;
@@ -33,7 +32,7 @@ public IEnumerable<ISubscription> List()
3332
public string GetMessageTypeName(Type type)
3433
{
3534
var typeName = type.Name;
36-
35+
3736
if (!type.GetTypeInfo().IsInterface)
3837
{
3938
return typeName;

0 commit comments

Comments
 (0)