From a13d06526843379a9860d465dd11444b704f7557 Mon Sep 17 00:00:00 2001 From: "par.dahlman" Date: Tue, 12 Jul 2016 13:05:09 +0200 Subject: [PATCH] (#94) Upgrade sln to netstandard1.5 --- README.md | 8 ++++++++ sample/RawRabbit.AspNet.Sample/project.json | 10 +++++++++- sample/RawRabbit.ConsoleApp.Sample/project.json | 10 +++++++++- sample/RawRabbit.Messages.Sample/project.json | 5 +++-- src/RawRabbit.Attributes/project.json | 10 ++++------ .../project.json | 10 ++++------ .../project.json | 9 +++------ src/RawRabbit.Extensions/project.json | 12 +++++++----- src/RawRabbit.Logging.Log4Net/project.json | 7 ++----- src/RawRabbit.Logging.NLog/project.json | 10 ++++------ src/RawRabbit.Logging.Serilog/project.json | 10 ++++------ src/RawRabbit.vNext/project.json | 10 ++++------ src/RawRabbit/project.json | 10 ++++------ 13 files changed, 65 insertions(+), 56 deletions(-) diff --git a/README.md b/README.md index b412ed3d..22ce536c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,14 @@ # RawRabbit [![Build Status](https://img.shields.io/appveyor/ci/pardahlman/rawrabbit.svg?style=flat-square)](https://ci.appveyor.com/project/pardahlman/rawrabbit) [![Documentation Status](https://readthedocs.org/projects/rawrabbit/badge/?version=latest&style=flat-square)](http://rawrabbit.readthedocs.org/) [![NuGet](https://img.shields.io/nuget/v/RawRabbit.svg?style=flat-square)](https://www.nuget.org/packages/RawRabbit) [![GitHub release](https://img.shields.io/github/release/pardahlman/rawrabbit.svg?style=flat-square)](https://github.com/pardahlman/rawrabbit/releases/latest) + +## Support for .NET Core 1.0 +The branch `dotnet-core` uses [RabbitMQ's preview of `RabbitMQ.Client` 4.0.0](https://groups.google.com/forum/#!topic/rabbitmq-users/hyJLlXCbocY), which is built for `netstandard1.5` and `net451`. This means that `RawRabbit` now can run on any platform. To Install, first make sure that you have added [RabbitMq's AppVeyor Feed](https://ci.appveyor.com/nuget/rabbitmq-dotnet-client-ci) to your NuGet feeds, then run + +``` +PM> Install-Package RawRabbit -Version 1.9.4-dotnetcore -Pre +``` + ## Quick introduction `RawRabbit` is a modern .NET client for communication over [RabbitMq](http://rabbitmq.com/). It is written for [`vNext`](http://www.asp.net/vnext) and is uses Microsoft’s new frameworks for [logging](https://github.com/aspnet/Logging), [configuration](https://github.com/aspnet/Configuration) and [dependecy injection](https://github.com/aspnet/DependencyInjection). It targets traditional `NET` runtimes, [`DNX` runtimes](https://github.com/aspnet/dnx) and has all the ground work done for [`.NET Core`](https://github.com/dotnet/core). Full documentation available at [`rawrabbit.readthedocs.org`](http://rawrabbit.readthedocs.org/). diff --git a/sample/RawRabbit.AspNet.Sample/project.json b/sample/RawRabbit.AspNet.Sample/project.json index 1b7ab7e5..b9ef8f06 100644 --- a/sample/RawRabbit.AspNet.Sample/project.json +++ b/sample/RawRabbit.AspNet.Sample/project.json @@ -25,7 +25,15 @@ }, "frameworks": { - "net46": {} + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0" + } + }, + "imports": "dnxcore50" + } }, "buildOptions": { diff --git a/sample/RawRabbit.ConsoleApp.Sample/project.json b/sample/RawRabbit.ConsoleApp.Sample/project.json index 387d6b49..56e5b0b8 100644 --- a/sample/RawRabbit.ConsoleApp.Sample/project.json +++ b/sample/RawRabbit.ConsoleApp.Sample/project.json @@ -13,7 +13,15 @@ }, "frameworks": { - "net46": { } + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0" + } + }, + "imports": "dnxcore50" + } }, "publishOptions": { diff --git a/sample/RawRabbit.Messages.Sample/project.json b/sample/RawRabbit.Messages.Sample/project.json index e7a9fa6e..f06c651b 100644 --- a/sample/RawRabbit.Messages.Sample/project.json +++ b/sample/RawRabbit.Messages.Sample/project.json @@ -2,10 +2,11 @@ "version": "1.0.0-*", "dependencies": { - "RawRabbit.Attributes": {"target": "project"} + "RawRabbit.Attributes": { "target": "project" } }, "frameworks": { - "net46": { } + "netstandard1.5": {}, + "net451": {} } } diff --git a/src/RawRabbit.Attributes/project.json b/src/RawRabbit.Attributes/project.json index b13ff13d..3aefeb44 100644 --- a/src/RawRabbit.Attributes/project.json +++ b/src/RawRabbit.Attributes/project.json @@ -1,6 +1,6 @@ { "title": "RawRabbit.Attributes", - "version": "1.9.4-*", + "version": "1.9.4-dotnetcore", "authors": [ "pardahlman" ], "description": "Configure messages and topology with attributes.", "packOptions": { @@ -11,13 +11,11 @@ }, "dependencies": { - "RawRabbit": {"target": "project" } + "RawRabbit": { "target": "project" } }, "frameworks": { - "dnx451": { }, - "net451": { }, - "net452": { }, - "net46": { } + "netstandard1.5": {}, + "net451": {} } } diff --git a/src/RawRabbit.DependencyInjection.Autofac/project.json b/src/RawRabbit.DependencyInjection.Autofac/project.json index 89707709..93f3a298 100644 --- a/src/RawRabbit.DependencyInjection.Autofac/project.json +++ b/src/RawRabbit.DependencyInjection.Autofac/project.json @@ -1,6 +1,6 @@ { "title": "RawRabbit.DependencyInjection.Autofac", - "version": "1.9.4-*", + "version": "1.9.4-dotnetcore", "authors": [ "par.dahlman" ], "description": "Wire up RawRabbit with Autfac!", @@ -13,12 +13,10 @@ "dependencies": { "RawRabbit": { "target": "project" }, - "Autofac": "3.5.2" + "Autofac": "4.0.0-rc3-293" }, "frameworks": { - "dnx451": { }, - "net451": { }, - "net452": { }, - "net46": { } + "netstandard1.5": {}, + "net451": {} } } diff --git a/src/RawRabbit.DependencyInjection.Ninject/project.json b/src/RawRabbit.DependencyInjection.Ninject/project.json index 6ca27eb2..a1d60f3c 100644 --- a/src/RawRabbit.DependencyInjection.Ninject/project.json +++ b/src/RawRabbit.DependencyInjection.Ninject/project.json @@ -1,13 +1,13 @@ { "title": "RawRabbit.DependencyInjection.Ninject", - "version": "1.9.4-*", + "version": "1.9.4-dotnetcore", "authors": [ "par.dahlman", "Joshua Barron" ], "description": "Wire up RawRabbit with Ninject!", "packOptions": { "iconUrl": "http://pardahlman.se/raw/icon.png", "projectUrl": "https://github.com/pardahlman/RawRabbit", - "tags": [ "rabbitmq", "raw", "rawrabbit", "ninject" ], + "tags": [ "rabbitmq", "raw", "rawrabbit", "ninject" ], "publishExclude": [ "**.xproj", "**.user", "**.vspscc" ] }, @@ -16,9 +16,6 @@ "Ninject": "3.2.2" }, "frameworks": { - "dnx451": { }, - "net451": { }, - "net452": { }, - "net46": { } + "net451": {} } } diff --git a/src/RawRabbit.Extensions/project.json b/src/RawRabbit.Extensions/project.json index 013736a9..b6de9546 100644 --- a/src/RawRabbit.Extensions/project.json +++ b/src/RawRabbit.Extensions/project.json @@ -1,6 +1,6 @@ { "title": "RawRabbit.Extensions", - "version": "1.9.4", + "version": "1.9.4-dotnetcore", "description": "Make the most of RawRabbit with these extensions", "authors": [ "par.dahlman" ], "packOptions": { @@ -16,9 +16,11 @@ }, "frameworks": { - "dnx451": { }, - "net451": { }, - "net452": { }, - "net46": { } + "netstandard1.5": { + "dependencies": { + "System.Net.Requests": "4.0.11" + } + }, + "net451": {} } } diff --git a/src/RawRabbit.Logging.Log4Net/project.json b/src/RawRabbit.Logging.Log4Net/project.json index af67ac42..041fbeb8 100644 --- a/src/RawRabbit.Logging.Log4Net/project.json +++ b/src/RawRabbit.Logging.Log4Net/project.json @@ -1,6 +1,6 @@ { "title": "RawRabbit.Logging.Log4Net", - "version": "1.9.4-*", + "version": "1.9.4-dotnetcore", "authors": [ "par.dahlman" ], "description": "Write RawRabbit's logs with Log4Net", @@ -17,9 +17,6 @@ }, "frameworks": { - "dnx451": { }, - "net451": { }, - "net452": { }, - "net46": { } + "net451": {} } } diff --git a/src/RawRabbit.Logging.NLog/project.json b/src/RawRabbit.Logging.NLog/project.json index c92115ac..3f919ca7 100644 --- a/src/RawRabbit.Logging.NLog/project.json +++ b/src/RawRabbit.Logging.NLog/project.json @@ -1,6 +1,6 @@ { "title": "RawRabbit.Logging.NLog", - "version": "1.9.4-*", + "version": "1.9.4-dotnetcore", "authors": [ "par.dahlman" ], "description": "Write RawRabbit's logs with NLog", @@ -13,13 +13,11 @@ "dependencies": { "RawRabbit": { "target": "project" }, - "NLog": "4.3.5" + "NLog": "4.4.0-betaV14" }, "frameworks": { - "dnx451": { }, - "net451": { }, - "net452": { }, - "net46": { } + "netstandard1.5": {}, + "net451": {} } } diff --git a/src/RawRabbit.Logging.Serilog/project.json b/src/RawRabbit.Logging.Serilog/project.json index df206d1c..68a4b1e1 100644 --- a/src/RawRabbit.Logging.Serilog/project.json +++ b/src/RawRabbit.Logging.Serilog/project.json @@ -1,6 +1,6 @@ { "title": "RawRabbit.Logging.Serilog", - "version": "1.9.4-*", + "version": "1.9.4-dotnetcore", "authors": [ "par.dahlman" ], "description": "Write RawRabbit's logs with Serilog", @@ -13,12 +13,10 @@ "dependencies": { "RawRabbit": { "target": "project" }, - "Serilog": "2.0.0" + "Serilog": "2.0.0" }, "frameworks": { - "dnx451": {}, - "net451": {}, - "net452": {}, - "net46": {} + "netstandard1.5": {}, + "net451": {} } } diff --git a/src/RawRabbit.vNext/project.json b/src/RawRabbit.vNext/project.json index cab93c5b..756039e3 100644 --- a/src/RawRabbit.vNext/project.json +++ b/src/RawRabbit.vNext/project.json @@ -1,5 +1,5 @@ { - "version": "1.9.4", + "version": "1.9.4-dotnetcore", "authors": [ "pardahlman", "enrique-avalon" ], "description": "Take advantage of vNext for your RawRabbit setup. Extension for IServiceCollection, IConfiguration support and much more!", "packOptions": { @@ -10,7 +10,7 @@ }, "dependencies": { - "RawRabbit": {"target": "project"}, + "RawRabbit": { "target": "project" }, "Microsoft.Extensions.DependencyInjection": "1.0.0", "Microsoft.Extensions.Logging": "1.0.0", "Microsoft.Extensions.Configuration": "1.0.0", @@ -18,9 +18,7 @@ }, "frameworks": { - "dnx451": { }, - "net451": { }, - "net452": { }, - "net46": { } + "netstandard1.5": {}, + "net451": {} } } diff --git a/src/RawRabbit/project.json b/src/RawRabbit/project.json index eeb1bad4..ef73d7f0 100644 --- a/src/RawRabbit/project.json +++ b/src/RawRabbit/project.json @@ -1,6 +1,6 @@ { "title": "RawRabbit", - "version": "1.9.4-*", + "version": "1.9.4-dotnetcore", "authors": [ "pardahlman", "enrique-avalon" ], "description": "A modern framework for communication over RabbitMq.", "packOptions": { @@ -11,14 +11,12 @@ }, "dependencies": { - "RabbitMQ.Client": "3.6.3", + "RabbitMQ.Client": "4.0.0-ci-201607111224", "Newtonsoft.Json": "9.0.1" }, "frameworks": { - "dnx451": { }, - "net451": { }, - "net452": { }, - "net46": { } + "netstandard1.5": {}, + "net451": {} } }