Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added .Net Standard 2.0 target framework for vNext #273

Merged
merged 1 commit into from
Sep 29, 2017
Merged

Added .Net Standard 2.0 target framework for vNext #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/RawRabbit.Extensions/RawRabbit.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Net.Http" Version="4.1.1" />
<PackageReference Include="System.Net.Http" Version="4.3.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
Expand Down
2 changes: 1 addition & 1 deletion src/RawRabbit.vNext/IServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public static IServiceCollection AddRawRabbit<TMessageContext>(this IServiceColl
.AddTransient<IMessageSerializer, JsonMessageSerializer>()
.AddTransient(c => new JsonSerializer
{
TypeNameAssemblyFormat = FormatterAssemblyStyle.Simple,
TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple,
Formatting = Formatting.None,
CheckAdditionalContent = true,
ContractResolver = new CamelCasePropertyNamesContractResolver(),
Expand Down
13 changes: 12 additions & 1 deletion src/RawRabbit.vNext/RawRabbit.vNext.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Description>Take advantage of vNext for your RawRabbit setup. Extension for IServiceCollection, IConfiguration support and much more!</Description>
<VersionPrefix>1.10.3</VersionPrefix>
<Authors>pardahlman;enrique-avalon</Authors>
<TargetFrameworks>netstandard1.5;net451</TargetFrameworks>
<TargetFrameworks>netstandard1.5;net451;netstandard2.0</TargetFrameworks>
<AssemblyName>RawRabbit.vNext</AssemblyName>
<PackageId>RawRabbit.vNext</PackageId>
<PackageTags>rabbitmq;raw;rawrabbit;attributes</PackageTags>
Expand All @@ -20,6 +20,17 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.0.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' ">
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.0.2" />
Expand Down
2 changes: 1 addition & 1 deletion src/RawRabbit/RawRabbit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<ItemGroup>
<PackageReference Include="RabbitMQ.Client" Version="4.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
Expand Down