From 55d39a99d929e2f9d4c3a2c1a72945c24015e200 Mon Sep 17 00:00:00 2001 From: "par.dahlman" Date: Sat, 21 May 2016 16:24:28 +0200 Subject: [PATCH] (#85) Update to RC2 --- NuGet.Config | 1 + RawRabbit.sln | 122 +++++++++--------- global.json | 4 +- .../Properties/AssemblyInfo.cs | 5 +- .../RawRabbit.Attributes.xproj | 11 +- src/RawRabbit.Attributes/project.json | 38 ++---- .../Properties/AssemblyInfo.cs | 2 +- ...awRabbit.DependencyInjection.Autofac.xproj | 11 +- .../project.json | 29 +++-- .../Properties/AssemblyInfo.cs | 2 +- ...awRabbit.DependencyInjection.Ninject.xproj | 18 +-- .../project.json | 27 ++-- .../Properties/AssemblyInfo.cs | 5 +- .../RawRabbit.Extensions.xproj | 11 +- src/RawRabbit.Extensions/project.json | 24 ++-- .../Properties/AssemblyInfo.cs | 5 +- .../RawRabbit.Logging.Log4Net.xproj | 11 +- src/RawRabbit.Logging.Log4Net/project.json | 26 ++-- .../Properties/AssemblyInfo.cs | 5 +- .../RawRabbit.Logging.NLog.xproj | 11 +- src/RawRabbit.Logging.NLog/project.json | 24 ++-- .../Properties/AssemblyInfo.cs | 7 +- .../RawRabbit.Logging.Serilog.xproj | 15 ++- src/RawRabbit.Logging.Serilog/project.json | 32 ++--- src/RawRabbit.vNext/BusClientFactory.cs | 1 - .../IServiceCollectionExtensions.cs | 2 +- .../Logging/LoggingFactoryAdapter.cs | 15 +-- .../Properties/AssemblyInfo.cs | 19 +++ src/RawRabbit.vNext/RawRabbit.vNext.xproj | 16 ++- src/RawRabbit.vNext/project.json | 33 ++--- src/RawRabbit/Logging/LoggerFactory.cs | 27 ++-- src/RawRabbit/Properties/AssemblyInfo.cs | 19 +++ src/RawRabbit/RawRabbit.xproj | 13 +- src/RawRabbit/project.json | 40 ++---- .../Features/MessageContextTests.cs | 2 +- .../Properties/AssemblyInfo.cs | 19 +++ .../RawRabbit.IntegrationTests.xproj | 14 +- test/RawRabbit.IntegrationTests/project.json | 37 +++--- .../Properties/AssemblyInfo.cs | 19 +++ test/RawRabbit.Tests/RawRabbit.Tests.xproj | 15 +-- test/RawRabbit.Tests/project.json | 37 ++---- 41 files changed, 393 insertions(+), 381 deletions(-) create mode 100644 src/RawRabbit.vNext/Properties/AssemblyInfo.cs create mode 100644 src/RawRabbit/Properties/AssemblyInfo.cs create mode 100644 test/RawRabbit.IntegrationTests/Properties/AssemblyInfo.cs create mode 100644 test/RawRabbit.Tests/Properties/AssemblyInfo.cs diff --git a/NuGet.Config b/NuGet.Config index 91b11e81..d50906ea 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -3,5 +3,6 @@ + diff --git a/RawRabbit.sln b/RawRabbit.sln index d5cce68a..9fc64bc3 100644 --- a/RawRabbit.sln +++ b/RawRabbit.sln @@ -13,27 +13,27 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RawRabbit", "src\RawRabbit\RawRabbit.xproj", "{14195F79-B374-4FEB-BA3C-E24138542421}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RawRabbit.vNext", "src\RawRabbit.vNext\RawRabbit.vNext.xproj", "{BB0866FF-0613-447B-987B-328C1863B288}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2F91E22A-AEBA-4BEF-9A03-C8232830F697}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RawRabbit.Extensions", "src\RawRabbit.Extensions\RawRabbit.Extensions.xproj", "{252773AA-C8E3-4AB9-A073-0BA9B120297E}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RawRabbit.Attributes", "src\RawRabbit.Attributes\RawRabbit.Attributes.xproj", "{F17ABDF4-E121-4641-9B9A-546F5C842EC0}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RawRabbit.Tests", "test\RawRabbit.Tests\RawRabbit.Tests.xproj", "{2318827A-0FE9-49D0-916E-3E0955AF6544}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RawRabbit.DependencyInjection.Autofac", "src\RawRabbit.DependencyInjection.Autofac\RawRabbit.DependencyInjection.Autofac.xproj", "{23381B29-382A-4CF7-B10F-9661C2EA4F75}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2F91E22A-AEBA-4BEF-9A03-C8232830F697}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RawRabbit.DependencyInjection.Ninject", "src\RawRabbit.DependencyInjection.Ninject\RawRabbit.DependencyInjection.Ninject.xproj", "{B763B208-1986-4995-921B-0CE1D417EE83}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RawRabbit.IntegrationTests", "test\RawRabbit.IntegrationTests\RawRabbit.IntegrationTests.xproj", "{A3181958-F6A1-489A-AFCB-388AF4BAAB4A}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RawRabbit.Extensions", "src\RawRabbit.Extensions\RawRabbit.Extensions.xproj", "{F227BC8C-B0C9-4C62-8E9C-DA5707027E24}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RawRabbit.DependencyInjection.Autofac", "src\RawRabbit.DependencyInjection.Autofac\RawRabbit.DependencyInjection.Autofac.xproj", "{CB108BB0-9CA3-44DD-9D58-5A42AA8750B1}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RawRabbit.vNext", "src\RawRabbit.vNext\RawRabbit.vNext.xproj", "{62F08E39-36C4-4BE0-ADAF-4AA7FD91117B}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RawRabbit.DependencyInjection.Ninject", "src\RawRabbit.DependencyInjection.Ninject\RawRabbit.DependencyInjection.Ninject.xproj", "{F756087B-0F11-4524-B6D7-342B632F0255}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RawRabbit.Logging.Log4Net", "src\RawRabbit.Logging.Log4Net\RawRabbit.Logging.Log4Net.xproj", "{FA7F9725-DC41-425D-B6EA-BEAF6BA1BA4A}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RawRabbit.Logging.NLog", "src\RawRabbit.Logging.NLog\RawRabbit.Logging.NLog.xproj", "{D44822DE-FF26-4972-8D46-7BDDCB790CFC}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RawRabbit.Logging.NLog", "src\RawRabbit.Logging.NLog\RawRabbit.Logging.NLog.xproj", "{38383E3A-84D6-45A2-BE38-E848BE436587}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RawRabbit.Logging.Serilog", "src\RawRabbit.Logging.Serilog\RawRabbit.Logging.Serilog.xproj", "{1D15516B-603F-48FE-BDD9-EC4A2C039326}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RawRabbit.Logging.Serilog", "src\RawRabbit.Logging.Serilog\RawRabbit.Logging.Serilog.xproj", "{78C75F6F-E8CF-45FD-9F84-590A05A168D3}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RawRabbit.Logging.Log4Net", "src\RawRabbit.Logging.Log4Net\RawRabbit.Logging.Log4Net.xproj", "{9385228C-444E-443E-B1E8-BD88CAFA508B}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RawRabbit.Tests", "test\RawRabbit.Tests\RawRabbit.Tests.xproj", "{BCCCEBD4-7456-43F7-93C5-380C563705DA}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RawRabbit.Attributes", "src\RawRabbit.Attributes\RawRabbit.Attributes.xproj", "{F7EDEBE9-230E-493B-8F7A-75A15091E7C8}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RawRabbit.IntegrationTests", "test\RawRabbit.IntegrationTests\RawRabbit.IntegrationTests.xproj", "{98C9E1D2-CBD2-4058-BE9F-BB5F0F3795B4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -45,61 +45,61 @@ Global {14195F79-B374-4FEB-BA3C-E24138542421}.Debug|Any CPU.Build.0 = Debug|Any CPU {14195F79-B374-4FEB-BA3C-E24138542421}.Release|Any CPU.ActiveCfg = Release|Any CPU {14195F79-B374-4FEB-BA3C-E24138542421}.Release|Any CPU.Build.0 = Release|Any CPU - {BB0866FF-0613-447B-987B-328C1863B288}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB0866FF-0613-447B-987B-328C1863B288}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB0866FF-0613-447B-987B-328C1863B288}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB0866FF-0613-447B-987B-328C1863B288}.Release|Any CPU.Build.0 = Release|Any CPU - {252773AA-C8E3-4AB9-A073-0BA9B120297E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {252773AA-C8E3-4AB9-A073-0BA9B120297E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {252773AA-C8E3-4AB9-A073-0BA9B120297E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {252773AA-C8E3-4AB9-A073-0BA9B120297E}.Release|Any CPU.Build.0 = Release|Any CPU - {2318827A-0FE9-49D0-916E-3E0955AF6544}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2318827A-0FE9-49D0-916E-3E0955AF6544}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2318827A-0FE9-49D0-916E-3E0955AF6544}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2318827A-0FE9-49D0-916E-3E0955AF6544}.Release|Any CPU.Build.0 = Release|Any CPU - {A3181958-F6A1-489A-AFCB-388AF4BAAB4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3181958-F6A1-489A-AFCB-388AF4BAAB4A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3181958-F6A1-489A-AFCB-388AF4BAAB4A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3181958-F6A1-489A-AFCB-388AF4BAAB4A}.Release|Any CPU.Build.0 = Release|Any CPU - {CB108BB0-9CA3-44DD-9D58-5A42AA8750B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB108BB0-9CA3-44DD-9D58-5A42AA8750B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB108BB0-9CA3-44DD-9D58-5A42AA8750B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB108BB0-9CA3-44DD-9D58-5A42AA8750B1}.Release|Any CPU.Build.0 = Release|Any CPU - {F756087B-0F11-4524-B6D7-342B632F0255}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F756087B-0F11-4524-B6D7-342B632F0255}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F756087B-0F11-4524-B6D7-342B632F0255}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F756087B-0F11-4524-B6D7-342B632F0255}.Release|Any CPU.Build.0 = Release|Any CPU - {D44822DE-FF26-4972-8D46-7BDDCB790CFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D44822DE-FF26-4972-8D46-7BDDCB790CFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D44822DE-FF26-4972-8D46-7BDDCB790CFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D44822DE-FF26-4972-8D46-7BDDCB790CFC}.Release|Any CPU.Build.0 = Release|Any CPU - {1D15516B-603F-48FE-BDD9-EC4A2C039326}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D15516B-603F-48FE-BDD9-EC4A2C039326}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D15516B-603F-48FE-BDD9-EC4A2C039326}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D15516B-603F-48FE-BDD9-EC4A2C039326}.Release|Any CPU.Build.0 = Release|Any CPU - {9385228C-444E-443E-B1E8-BD88CAFA508B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9385228C-444E-443E-B1E8-BD88CAFA508B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9385228C-444E-443E-B1E8-BD88CAFA508B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9385228C-444E-443E-B1E8-BD88CAFA508B}.Release|Any CPU.Build.0 = Release|Any CPU - {F7EDEBE9-230E-493B-8F7A-75A15091E7C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F7EDEBE9-230E-493B-8F7A-75A15091E7C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F7EDEBE9-230E-493B-8F7A-75A15091E7C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F7EDEBE9-230E-493B-8F7A-75A15091E7C8}.Release|Any CPU.Build.0 = Release|Any CPU + {F17ABDF4-E121-4641-9B9A-546F5C842EC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F17ABDF4-E121-4641-9B9A-546F5C842EC0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F17ABDF4-E121-4641-9B9A-546F5C842EC0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F17ABDF4-E121-4641-9B9A-546F5C842EC0}.Release|Any CPU.Build.0 = Release|Any CPU + {23381B29-382A-4CF7-B10F-9661C2EA4F75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {23381B29-382A-4CF7-B10F-9661C2EA4F75}.Debug|Any CPU.Build.0 = Debug|Any CPU + {23381B29-382A-4CF7-B10F-9661C2EA4F75}.Release|Any CPU.ActiveCfg = Release|Any CPU + {23381B29-382A-4CF7-B10F-9661C2EA4F75}.Release|Any CPU.Build.0 = Release|Any CPU + {B763B208-1986-4995-921B-0CE1D417EE83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B763B208-1986-4995-921B-0CE1D417EE83}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B763B208-1986-4995-921B-0CE1D417EE83}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B763B208-1986-4995-921B-0CE1D417EE83}.Release|Any CPU.Build.0 = Release|Any CPU + {F227BC8C-B0C9-4C62-8E9C-DA5707027E24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F227BC8C-B0C9-4C62-8E9C-DA5707027E24}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F227BC8C-B0C9-4C62-8E9C-DA5707027E24}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F227BC8C-B0C9-4C62-8E9C-DA5707027E24}.Release|Any CPU.Build.0 = Release|Any CPU + {62F08E39-36C4-4BE0-ADAF-4AA7FD91117B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {62F08E39-36C4-4BE0-ADAF-4AA7FD91117B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {62F08E39-36C4-4BE0-ADAF-4AA7FD91117B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {62F08E39-36C4-4BE0-ADAF-4AA7FD91117B}.Release|Any CPU.Build.0 = Release|Any CPU + {FA7F9725-DC41-425D-B6EA-BEAF6BA1BA4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FA7F9725-DC41-425D-B6EA-BEAF6BA1BA4A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FA7F9725-DC41-425D-B6EA-BEAF6BA1BA4A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FA7F9725-DC41-425D-B6EA-BEAF6BA1BA4A}.Release|Any CPU.Build.0 = Release|Any CPU + {38383E3A-84D6-45A2-BE38-E848BE436587}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {38383E3A-84D6-45A2-BE38-E848BE436587}.Debug|Any CPU.Build.0 = Debug|Any CPU + {38383E3A-84D6-45A2-BE38-E848BE436587}.Release|Any CPU.ActiveCfg = Release|Any CPU + {38383E3A-84D6-45A2-BE38-E848BE436587}.Release|Any CPU.Build.0 = Release|Any CPU + {78C75F6F-E8CF-45FD-9F84-590A05A168D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {78C75F6F-E8CF-45FD-9F84-590A05A168D3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {78C75F6F-E8CF-45FD-9F84-590A05A168D3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {78C75F6F-E8CF-45FD-9F84-590A05A168D3}.Release|Any CPU.Build.0 = Release|Any CPU + {BCCCEBD4-7456-43F7-93C5-380C563705DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BCCCEBD4-7456-43F7-93C5-380C563705DA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BCCCEBD4-7456-43F7-93C5-380C563705DA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BCCCEBD4-7456-43F7-93C5-380C563705DA}.Release|Any CPU.Build.0 = Release|Any CPU + {98C9E1D2-CBD2-4058-BE9F-BB5F0F3795B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {98C9E1D2-CBD2-4058-BE9F-BB5F0F3795B4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {98C9E1D2-CBD2-4058-BE9F-BB5F0F3795B4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {98C9E1D2-CBD2-4058-BE9F-BB5F0F3795B4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {14195F79-B374-4FEB-BA3C-E24138542421} = {7FCF8D3B-BA55-4C47-AC60-5CEF75418BEB} - {BB0866FF-0613-447B-987B-328C1863B288} = {7FCF8D3B-BA55-4C47-AC60-5CEF75418BEB} - {252773AA-C8E3-4AB9-A073-0BA9B120297E} = {7FCF8D3B-BA55-4C47-AC60-5CEF75418BEB} - {2318827A-0FE9-49D0-916E-3E0955AF6544} = {2F91E22A-AEBA-4BEF-9A03-C8232830F697} - {A3181958-F6A1-489A-AFCB-388AF4BAAB4A} = {2F91E22A-AEBA-4BEF-9A03-C8232830F697} - {CB108BB0-9CA3-44DD-9D58-5A42AA8750B1} = {7FCF8D3B-BA55-4C47-AC60-5CEF75418BEB} - {F756087B-0F11-4524-B6D7-342B632F0255} = {7FCF8D3B-BA55-4C47-AC60-5CEF75418BEB} - {D44822DE-FF26-4972-8D46-7BDDCB790CFC} = {7FCF8D3B-BA55-4C47-AC60-5CEF75418BEB} - {1D15516B-603F-48FE-BDD9-EC4A2C039326} = {7FCF8D3B-BA55-4C47-AC60-5CEF75418BEB} - {9385228C-444E-443E-B1E8-BD88CAFA508B} = {7FCF8D3B-BA55-4C47-AC60-5CEF75418BEB} - {F7EDEBE9-230E-493B-8F7A-75A15091E7C8} = {7FCF8D3B-BA55-4C47-AC60-5CEF75418BEB} + {F17ABDF4-E121-4641-9B9A-546F5C842EC0} = {7FCF8D3B-BA55-4C47-AC60-5CEF75418BEB} + {23381B29-382A-4CF7-B10F-9661C2EA4F75} = {7FCF8D3B-BA55-4C47-AC60-5CEF75418BEB} + {B763B208-1986-4995-921B-0CE1D417EE83} = {7FCF8D3B-BA55-4C47-AC60-5CEF75418BEB} + {F227BC8C-B0C9-4C62-8E9C-DA5707027E24} = {7FCF8D3B-BA55-4C47-AC60-5CEF75418BEB} + {62F08E39-36C4-4BE0-ADAF-4AA7FD91117B} = {7FCF8D3B-BA55-4C47-AC60-5CEF75418BEB} + {FA7F9725-DC41-425D-B6EA-BEAF6BA1BA4A} = {7FCF8D3B-BA55-4C47-AC60-5CEF75418BEB} + {38383E3A-84D6-45A2-BE38-E848BE436587} = {7FCF8D3B-BA55-4C47-AC60-5CEF75418BEB} + {78C75F6F-E8CF-45FD-9F84-590A05A168D3} = {7FCF8D3B-BA55-4C47-AC60-5CEF75418BEB} + {BCCCEBD4-7456-43F7-93C5-380C563705DA} = {2F91E22A-AEBA-4BEF-9A03-C8232830F697} + {98C9E1D2-CBD2-4058-BE9F-BB5F0F3795B4} = {2F91E22A-AEBA-4BEF-9A03-C8232830F697} EndGlobalSection EndGlobal diff --git a/global.json b/global.json index b143a1e0..c9c6f180 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,4 @@ { "projects": [ "src", "test" ], - "sdk": { - "version": "1.0.0-rc1-update2" - } + "sdk": { "version": "1.0.0-preview1-002702" } } diff --git a/src/RawRabbit.Attributes/Properties/AssemblyInfo.cs b/src/RawRabbit.Attributes/Properties/AssemblyInfo.cs index 81c3713c..e53137f9 100644 --- a/src/RawRabbit.Attributes/Properties/AssemblyInfo.cs +++ b/src/RawRabbit.Attributes/Properties/AssemblyInfo.cs @@ -8,9 +8,8 @@ [assembly: AssemblyTitle("RawRabbit.Attributes")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Valtech AB")] +[assembly: AssemblyCompany("")] [assembly: AssemblyProduct("RawRabbit.Attributes")] -[assembly: AssemblyCopyright("Copyright © Valtech AB 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -20,4 +19,4 @@ [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f7edebe9-230e-493b-8f7a-75a15091e7c8")] +[assembly: Guid("f17abdf4-e121-4641-9b9a-546f5c842ec0")] diff --git a/src/RawRabbit.Attributes/RawRabbit.Attributes.xproj b/src/RawRabbit.Attributes/RawRabbit.Attributes.xproj index 0db125ce..df90fb1c 100644 --- a/src/RawRabbit.Attributes/RawRabbit.Attributes.xproj +++ b/src/RawRabbit.Attributes/RawRabbit.Attributes.xproj @@ -5,16 +5,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + - f7edebe9-230e-493b-8f7a-75a15091e7c8 + f17abdf4-e121-4641-9b9a-546f5c842ec0 RawRabbit.Attributes - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5.2 2.0 - + diff --git a/src/RawRabbit.Attributes/project.json b/src/RawRabbit.Attributes/project.json index 619d3a87..8622d256 100644 --- a/src/RawRabbit.Attributes/project.json +++ b/src/RawRabbit.Attributes/project.json @@ -1,35 +1,23 @@ { - "version": "1.9.1-*", - "authors": ["pardahlman"], - "description": "Configure messages and topology with attributes.", - "iconUrl": "http://pardahlman.se/raw/icon.png", - "projectUrl": "https://github.com/pardahlman/RawRabbit", "title": "RawRabbit.Attributes", - "tags": ["rabbitmq", "raw", "rawrabbit", "attributes"], + "version": "1.9.2-*", + "authors": [ "pardahlman" ], + "description": "Configure messages and topology with attributes.", + "packOptions": { + "iconUrl": "http://pardahlman.se/raw/icon.png", + "projectUrl": "https://github.com/pardahlman/RawRabbit", + "tags": [ "rabbitmq", "raw", "rawrabbit", "attributes" ], + "publishExclude": [ "**.xproj", "**.user", "**.vspscc" ] + }, "dependencies": { - "RawRabbit": "" - }, - "commands": { - "test": "xunit.runner.dnx" + "RawRabbit": {"target": "project" } }, + "frameworks": { - "dnx45": { }, "dnx451": { }, - "dnx50": { }, - "net45": { }, "net451": { }, "net452": { }, - "net46": { }, - "net50": { } - }, - - "publishExclude": [ - "**.xproj", - "**.user", - "**.vspscc" - ], - - "exclude": [ - ] + "net46": { } + } } diff --git a/src/RawRabbit.DependencyInjection.Autofac/Properties/AssemblyInfo.cs b/src/RawRabbit.DependencyInjection.Autofac/Properties/AssemblyInfo.cs index 20d0ee8e..52e3f9da 100644 --- a/src/RawRabbit.DependencyInjection.Autofac/Properties/AssemblyInfo.cs +++ b/src/RawRabbit.DependencyInjection.Autofac/Properties/AssemblyInfo.cs @@ -20,4 +20,4 @@ [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("cb108bb0-9ca3-44dd-9d58-5a42aa8750b1")] +[assembly: Guid("23381b29-382a-4cf7-b10f-9661c2ea4f75")] diff --git a/src/RawRabbit.DependencyInjection.Autofac/RawRabbit.DependencyInjection.Autofac.xproj b/src/RawRabbit.DependencyInjection.Autofac/RawRabbit.DependencyInjection.Autofac.xproj index 3e447e2e..db675212 100644 --- a/src/RawRabbit.DependencyInjection.Autofac/RawRabbit.DependencyInjection.Autofac.xproj +++ b/src/RawRabbit.DependencyInjection.Autofac/RawRabbit.DependencyInjection.Autofac.xproj @@ -5,16 +5,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + - cb108bb0-9ca3-44dd-9d58-5a42aa8750b1 + 23381b29-382a-4cf7-b10f-9661c2ea4f75 RawRabbit.DependencyInjection.Autofac - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5.2 2.0 - + diff --git a/src/RawRabbit.DependencyInjection.Autofac/project.json b/src/RawRabbit.DependencyInjection.Autofac/project.json index 7f6ddd7f..c336ae46 100644 --- a/src/RawRabbit.DependencyInjection.Autofac/project.json +++ b/src/RawRabbit.DependencyInjection.Autofac/project.json @@ -1,23 +1,24 @@ { + "title": "RawRabbit.DependencyInjection.Autofac", + "version": "1.9.2-*", "authors": [ "par.dahlman" ], + "description": "Wire up RawRabbit with Autfac!", + + "packOptions": { + "iconUrl": "http://pardahlman.se/raw/icon.png", + "projectUrl": "https://github.com/pardahlman/RawRabbit", + "tags": [ "rabbitmq", "raw", "rawrabbit", "autofac" ], + "publishExclude": [ "**.xproj", "**.user", "**.vspscc" ] + }, + "dependencies": { - "RawRabbit": "", - "Autofac": "2.2.4.900" + "RawRabbit": { "target": "project" }, + "Autofac": "3.5.2" }, - "description": "Wire up RawRabbit with Autfac!", "frameworks": { - "dnx45": { }, "dnx451": { }, - "dnx50": { }, - "net45": { }, "net451": { }, "net452": { }, - "net46": { }, - "net50": { } - }, - "iconUrl": "http://pardahlman.se/raw/icon.png", - "projectUrl": "https://github.com/pardahlman/RawRabbit", - "tags": [ "rabbitmq", "raw", "rawrabbit", "autofac" ], - "title": "RawRabbit.DependencyInjection.Autofac", - "version": "1.9.1-*" + "net46": { } + } } diff --git a/src/RawRabbit.DependencyInjection.Ninject/Properties/AssemblyInfo.cs b/src/RawRabbit.DependencyInjection.Ninject/Properties/AssemblyInfo.cs index 48205361..5ebcc771 100644 --- a/src/RawRabbit.DependencyInjection.Ninject/Properties/AssemblyInfo.cs +++ b/src/RawRabbit.DependencyInjection.Ninject/Properties/AssemblyInfo.cs @@ -19,4 +19,4 @@ [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f756087b-0f11-4524-b6d7-342b632f0255")] +[assembly: Guid("b763b208-1986-4995-921b-0ce1d417ee83")] diff --git a/src/RawRabbit.DependencyInjection.Ninject/RawRabbit.DependencyInjection.Ninject.xproj b/src/RawRabbit.DependencyInjection.Ninject/RawRabbit.DependencyInjection.Ninject.xproj index 3315dfd7..cd16986d 100644 --- a/src/RawRabbit.DependencyInjection.Ninject/RawRabbit.DependencyInjection.Ninject.xproj +++ b/src/RawRabbit.DependencyInjection.Ninject/RawRabbit.DependencyInjection.Ninject.xproj @@ -4,18 +4,18 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + + - f756087b-0f11-4524-b6d7-342b632f0255 + b763b208-1986-4995-921b-0ce1d417ee83 RawRabbit.DependencyInjection.Ninject - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5.2 + 2.0 - - True - - - \ No newline at end of file + + diff --git a/src/RawRabbit.DependencyInjection.Ninject/project.json b/src/RawRabbit.DependencyInjection.Ninject/project.json index 5b2917fe..0761886a 100644 --- a/src/RawRabbit.DependencyInjection.Ninject/project.json +++ b/src/RawRabbit.DependencyInjection.Ninject/project.json @@ -1,23 +1,24 @@ { + "title": "RawRabbit.DependencyInjection.Ninject", + "version": "1.9.2-*", "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" ], + "publishExclude": [ "**.xproj", "**.user", "**.vspscc" ] + }, + "dependencies": { - "RawRabbit": "", + "RawRabbit": { "target": "project" }, "Ninject": "3.2.2" }, - "description": "Wire up RawRabbit with Ninject!", "frameworks": { - "dnx45": { }, "dnx451": { }, - "dnx50": { }, - "net45": { }, "net451": { }, "net452": { }, - "net46": { }, - "net50": { } - }, - "iconUrl": "http://pardahlman.se/raw/icon.png", - "projectUrl": "https://github.com/pardahlman/RawRabbit", - "tags": [ "rabbitmq", "raw", "rawrabbit", "ninject" ], - "title": "RawRabbit.DependencyInjection.Ninject", - "version": "1.9.1-*" + "net46": { } + } } diff --git a/src/RawRabbit.Extensions/Properties/AssemblyInfo.cs b/src/RawRabbit.Extensions/Properties/AssemblyInfo.cs index 0e8e6b70..0e9d9fbb 100644 --- a/src/RawRabbit.Extensions/Properties/AssemblyInfo.cs +++ b/src/RawRabbit.Extensions/Properties/AssemblyInfo.cs @@ -8,9 +8,8 @@ [assembly: AssemblyTitle("RawRabbit.Extensions")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Valtech AB")] +[assembly: AssemblyCompany("")] [assembly: AssemblyProduct("RawRabbit.Extensions")] -[assembly: AssemblyCopyright("Copyright © Valtech AB 2015")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -20,4 +19,4 @@ [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("252773aa-c8e3-4ab9-a073-0ba9b120297e")] +[assembly: Guid("f227bc8c-b0c9-4c62-8e9c-da5707027e24")] diff --git a/src/RawRabbit.Extensions/RawRabbit.Extensions.xproj b/src/RawRabbit.Extensions/RawRabbit.Extensions.xproj index 4927dea6..f8f5ebcc 100644 --- a/src/RawRabbit.Extensions/RawRabbit.Extensions.xproj +++ b/src/RawRabbit.Extensions/RawRabbit.Extensions.xproj @@ -5,16 +5,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + - 252773aa-c8e3-4ab9-a073-0ba9b120297e + f227bc8c-b0c9-4c62-8e9c-da5707027e24 RawRabbit.Extensions - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5.2 2.0 - + diff --git a/src/RawRabbit.Extensions/project.json b/src/RawRabbit.Extensions/project.json index a05d2e63..2f68e163 100644 --- a/src/RawRabbit.Extensions/project.json +++ b/src/RawRabbit.Extensions/project.json @@ -1,26 +1,24 @@ { - "version": "1.9.1-rc1-update2", + "title": "RawRabbit.Extensions", + "version": "1.9.2-rc2-final", "description": "Make the most of RawRabbit with these extensions", "authors": [ "par.dahlman" ], - "tags": [ "raw", "rabbit", "rawrabbit", "rabbitmq", "extensions" ], - "iconUrl": "http://pardahlman.se/raw/icon.png", - "projectUrl": "https://github.com/pardahlman/RawRabbit", - "title": "RawRabbit.Extensions", + "packOptions": { + "iconUrl": "http://pardahlman.se/raw/icon.png", + "projectUrl": "https://github.com/pardahlman/RawRabbit", + "tags": [ "rabbitmq", "raw", "rawrabbit", "extensions" ], + "publishExclude": [ "**.xproj", "**.user", "**.vspscc" ] + }, "dependencies": { - "RawRabbit": "", - "RawRabbit.vNext": "", - "Microsoft.Extensions.DependencyInjection": "1.0.0-rc1-final", - "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-rc1-final", - "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc1-final" + "RawRabbit": { "target": "project" }, + "RawRabbit.vNext": { "target": "project" } }, "frameworks": { "dnx451": { }, - "dnx50": { }, "net451": { }, "net452": { }, - "net46": { }, - "net50": { } + "net46": { } } } diff --git a/src/RawRabbit.Logging.Log4Net/Properties/AssemblyInfo.cs b/src/RawRabbit.Logging.Log4Net/Properties/AssemblyInfo.cs index 1a73fd05..d14ab65f 100644 --- a/src/RawRabbit.Logging.Log4Net/Properties/AssemblyInfo.cs +++ b/src/RawRabbit.Logging.Log4Net/Properties/AssemblyInfo.cs @@ -5,12 +5,9 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("RawRabbit.Logging.Log4Net")] -[assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Valtech AB")] [assembly: AssemblyProduct("RawRabbit.Logging.Log4Net")] -[assembly: AssemblyCopyright("Copyright © Valtech AB 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -20,4 +17,4 @@ [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("9385228c-444e-443e-b1e8-bd88cafa508b")] +[assembly: Guid("fa7f9725-dc41-425d-b6ea-beaf6ba1ba4a")] diff --git a/src/RawRabbit.Logging.Log4Net/RawRabbit.Logging.Log4Net.xproj b/src/RawRabbit.Logging.Log4Net/RawRabbit.Logging.Log4Net.xproj index cc4e0d7b..255045d7 100644 --- a/src/RawRabbit.Logging.Log4Net/RawRabbit.Logging.Log4Net.xproj +++ b/src/RawRabbit.Logging.Log4Net/RawRabbit.Logging.Log4Net.xproj @@ -5,16 +5,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + - 9385228c-444e-443e-b1e8-bd88cafa508b + fa7f9725-dc41-425d-b6ea-beaf6ba1ba4a RawRabbit.Logging.Log4Net - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5.2 2.0 - + diff --git a/src/RawRabbit.Logging.Log4Net/project.json b/src/RawRabbit.Logging.Log4Net/project.json index 4a3a3798..bcb1ffb2 100644 --- a/src/RawRabbit.Logging.Log4Net/project.json +++ b/src/RawRabbit.Logging.Log4Net/project.json @@ -1,23 +1,25 @@ { - "version": "1.9.1", - "description": "Write RawRabbit's logs with Serilog", - "authors": [ "par.dahlman" ], - "tags": [ "raw", "rabbit", "rawrabbit", "rabbitmq", "logger", "log4net" ], - "iconUrl": "http://pardahlman.se/raw/icon.png", - "projectUrl": "https://github.com/pardahlman/RawRabbit", "title": "RawRabbit.Logging.Log4Net", + "version": "1.9.2-*", + "authors": [ "par.dahlman" ], + "description": "Write RawRabbit's logs with Log4Net", + + "packOptions": { + "iconUrl": "http://pardahlman.se/raw/icon.png", + "projectUrl": "https://github.com/pardahlman/RawRabbit", + "tags": [ "raw", "rabbit", "rawrabbit", "rabbitmq", "logger", "log4net" ], + "publishExclude": [ "**.xproj", "**.user", "**.vspscc" ] + }, - "dependencies": { - "RawRabbit": "", + "dependencies": { + "RawRabbit": { "target": "project" }, "log4net": "2.0.5" - }, + }, "frameworks": { "dnx451": { }, - "dnx50": { }, "net451": { }, "net452": { }, - "net46": { }, - "net50": { } + "net46": { } } } diff --git a/src/RawRabbit.Logging.NLog/Properties/AssemblyInfo.cs b/src/RawRabbit.Logging.NLog/Properties/AssemblyInfo.cs index 1e4bb000..b6cb27f0 100644 --- a/src/RawRabbit.Logging.NLog/Properties/AssemblyInfo.cs +++ b/src/RawRabbit.Logging.NLog/Properties/AssemblyInfo.cs @@ -8,9 +8,8 @@ [assembly: AssemblyTitle("RawRabbit.Logging.NLog")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Valtech AB")] +[assembly: AssemblyCompany("")] [assembly: AssemblyProduct("RawRabbit.Logging.NLog")] -[assembly: AssemblyCopyright("Copyright © Valtech AB 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -20,4 +19,4 @@ [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("d44822de-ff26-4972-8d46-7bddcb790cfc")] +[assembly: Guid("38383e3a-84d6-45a2-be38-e848be436587")] diff --git a/src/RawRabbit.Logging.NLog/RawRabbit.Logging.NLog.xproj b/src/RawRabbit.Logging.NLog/RawRabbit.Logging.NLog.xproj index f410c0bf..eddce48c 100644 --- a/src/RawRabbit.Logging.NLog/RawRabbit.Logging.NLog.xproj +++ b/src/RawRabbit.Logging.NLog/RawRabbit.Logging.NLog.xproj @@ -5,16 +5,17 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + - d44822de-ff26-4972-8d46-7bddcb790cfc + 38383e3a-84d6-45a2-be38-e848be436587 RawRabbit.Logging.NLog - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5.2 2.0 - + diff --git a/src/RawRabbit.Logging.NLog/project.json b/src/RawRabbit.Logging.NLog/project.json index e190ee64..11a093a2 100644 --- a/src/RawRabbit.Logging.NLog/project.json +++ b/src/RawRabbit.Logging.NLog/project.json @@ -1,23 +1,25 @@ { - "version": "1.9.1", - "description": "Write RawRabbit's logs with NLog", - "authors": [ "par.dahlman" ], - "tags": [ "raw", "rabbit", "rawrabbit", "rabbitmq", "logger", "nlog" ], - "iconUrl": "http://pardahlman.se/raw/icon.png", - "projectUrl": "https://github.com/pardahlman/RawRabbit", "title": "RawRabbit.Logging.NLog", + "version": "1.9.2-*", + "authors": [ "par.dahlman" ], + "description": "Write RawRabbit's logs with NLog", + + "packOptions": { + "iconUrl": "http://pardahlman.se/raw/icon.png", + "projectUrl": "https://github.com/pardahlman/RawRabbit", + "tags": [ "raw", "rabbit", "rawrabbit", "rabbitmq", "logger", "nlog" ], + "publishExclude": [ "**.xproj", "**.user", "**.vspscc" ] + }, "dependencies": { - "RawRabbit": "", - "NLog": "4.2.3" + "RawRabbit": { "target": "project" }, + "NLog": "4.3.4" }, "frameworks": { "dnx451": { }, - "dnx50": { }, "net451": { }, "net452": { }, - "net46": { }, - "net50": { } + "net46": { } } } diff --git a/src/RawRabbit.Logging.Serilog/Properties/AssemblyInfo.cs b/src/RawRabbit.Logging.Serilog/Properties/AssemblyInfo.cs index 98a61ee6..b4f25a4e 100644 --- a/src/RawRabbit.Logging.Serilog/Properties/AssemblyInfo.cs +++ b/src/RawRabbit.Logging.Serilog/Properties/AssemblyInfo.cs @@ -8,9 +8,8 @@ [assembly: AssemblyTitle("RawRabbit.Logger.Serilog")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Valtech AB")] -[assembly: AssemblyProduct("RawRabbit.Logger.Serilog")] -[assembly: AssemblyCopyright("Copyright © Valtech AB 2016")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("RawRabbit.Logging.Serilog")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -20,4 +19,4 @@ [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("1d15516b-603f-48fe-bdd9-ec4a2c039326")] +[assembly: Guid("78c75f6f-e8cf-45fd-9f84-590a05a168d3")] diff --git a/src/RawRabbit.Logging.Serilog/RawRabbit.Logging.Serilog.xproj b/src/RawRabbit.Logging.Serilog/RawRabbit.Logging.Serilog.xproj index 11e0959e..35f30aab 100644 --- a/src/RawRabbit.Logging.Serilog/RawRabbit.Logging.Serilog.xproj +++ b/src/RawRabbit.Logging.Serilog/RawRabbit.Logging.Serilog.xproj @@ -4,15 +4,18 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + + - 1d15516b-603f-48fe-bdd9-ec4a2c039326 + 78c75f6f-e8cf-45fd-9f84-590a05a168d3 RawRabbit.Logging.Serilog - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5.2 + 2.0 - - \ No newline at end of file + + diff --git a/src/RawRabbit.Logging.Serilog/project.json b/src/RawRabbit.Logging.Serilog/project.json index 1271c34c..cf34177f 100644 --- a/src/RawRabbit.Logging.Serilog/project.json +++ b/src/RawRabbit.Logging.Serilog/project.json @@ -1,28 +1,27 @@ { - "version": "1.9.1", - "description": "Write RawRabbit's logs with Serilog", - "authors": [ "par.dahlman" ], - "tags": [ "raw", "rabbit", "rawrabbit", "rabbitmq", "logger", "serilog" ], - "iconUrl": "http://pardahlman.se/raw/icon.png", - "projectUrl": "https://github.com/pardahlman/RawRabbit", "title": "RawRabbit.Logging.Serilog", + "version": "1.9.2-*", + "authors": [ "par.dahlman" ], + "description": "Write RawRabbit's logs with Serilog", - "dependencies": { - "RawRabbit": "", - "Serilog": "1.5.11" + "packOptions": { + "iconUrl": "http://pardahlman.se/raw/icon.png", + "projectUrl": "https://github.com/pardahlman/RawRabbit", + "tags": [ "raw", "rabbit", "rawrabbit", "rabbitmq", "logger", "serilog" ], + "publishExclude": [ "**.xproj", "**.user", "**.vspscc" ] }, + "dependencies": { + "RawRabbit": { "target": "project" }, + "Serilog": "1.5.14" + + }, "frameworks": { "dnx451": { "frameworkAssemblies": { "System.Runtime": "4.0.0.0" } }, - "dnx50": { - "frameworkAssemblies": { - "System.Runtime": "4.0.0.0" - } - }, "net451": { "frameworkAssemblies": { "System.Runtime": "4.0.0.0" @@ -37,11 +36,6 @@ "frameworkAssemblies": { "System.Runtime": "4.0.0.0" } - }, - "net50": { - "frameworkAssemblies": { - "System.Runtime": "4.0.0.0" - } } } } diff --git a/src/RawRabbit.vNext/BusClientFactory.cs b/src/RawRabbit.vNext/BusClientFactory.cs index 792f2b84..ea8756ea 100644 --- a/src/RawRabbit.vNext/BusClientFactory.cs +++ b/src/RawRabbit.vNext/BusClientFactory.cs @@ -1,7 +1,6 @@ using System; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using RawRabbit.Common; using RawRabbit.Configuration; using RawRabbit.Context; diff --git a/src/RawRabbit.vNext/IServiceCollectionExtensions.cs b/src/RawRabbit.vNext/IServiceCollectionExtensions.cs index f7f95d5d..191aebbc 100644 --- a/src/RawRabbit.vNext/IServiceCollectionExtensions.cs +++ b/src/RawRabbit.vNext/IServiceCollectionExtensions.cs @@ -44,7 +44,7 @@ public static IServiceCollection AddRawRabbit(this IServiceColl { var builder = new ConfigurationBuilder(); config(builder); - collection.AddSingleton(c => builder.Build().Get()); + collection.AddSingleton(c => builder.Build().GetValue(string.Empty)); } else { diff --git a/src/RawRabbit.vNext/Logging/LoggingFactoryAdapter.cs b/src/RawRabbit.vNext/Logging/LoggingFactoryAdapter.cs index 20907bc5..ef0a189e 100644 --- a/src/RawRabbit.vNext/Logging/LoggingFactoryAdapter.cs +++ b/src/RawRabbit.vNext/Logging/LoggingFactoryAdapter.cs @@ -1,5 +1,4 @@ -using System; -using RawRabbit.Logging; +using RawRabbit.Logging; namespace RawRabbit.vNext.Logging { @@ -17,18 +16,6 @@ public void Dispose() _vNextFactory.Dispose(); } - public LogLevel MinimumLevel - { - get - { - return (LogLevel)Enum.Parse(typeof(Microsoft.Extensions.Logging.LogLevel), _vNextFactory.MinimumLevel.ToString(), true); - } - set - { - _vNextFactory.MinimumLevel = (Microsoft.Extensions.Logging.LogLevel)Enum.Parse(typeof(LogLevel), value.ToString(), true); - } - } - public ILogger CreateLogger(string categoryName) { var vNextLogger = _vNextFactory.CreateLogger(categoryName); diff --git a/src/RawRabbit.vNext/Properties/AssemblyInfo.cs b/src/RawRabbit.vNext/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..0e03a0bf --- /dev/null +++ b/src/RawRabbit.vNext/Properties/AssemblyInfo.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("RawRabbit.vNext")] +[assembly: AssemblyTrademark("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("62f08e39-36c4-4be0-adaf-4aa7fd91117b")] diff --git a/src/RawRabbit.vNext/RawRabbit.vNext.xproj b/src/RawRabbit.vNext/RawRabbit.vNext.xproj index 609e05be..cfabf87c 100644 --- a/src/RawRabbit.vNext/RawRabbit.vNext.xproj +++ b/src/RawRabbit.vNext/RawRabbit.vNext.xproj @@ -4,16 +4,18 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + + - bb0866ff-0613-447b-987b-328c1863b288 + 62f08e39-36c4-4be0-adaf-4aa7fd91117b RawRabbit.vNext - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5.2 + 2.0 - 63650 - - \ No newline at end of file + + diff --git a/src/RawRabbit.vNext/project.json b/src/RawRabbit.vNext/project.json index 99328d20..9cfd33da 100644 --- a/src/RawRabbit.vNext/project.json +++ b/src/RawRabbit.vNext/project.json @@ -1,31 +1,26 @@ { - "version": "1.9.1-rc1-update2", + "version": "1.9.2-rc2-final", "authors": [ "pardahlman", "enrique-avalon" ], "description": "Take advantage of vNext for your RawRabbit setup. Extension for IServiceCollection, IConfiguration support and much more!", - "iconUrl": "http://pardahlman.se/raw/icon.png", - "projectUrl": "https://github.com/pardahlman/RawRabbit", - "title": "RawRabbit.vNext", - "tags": [ "rabbitmq", "raw", "rawrabbit", "amqp" ], + "packOptions": { + "iconUrl": "http://pardahlman.se/raw/icon.png", + "projectUrl": "https://github.com/pardahlman/RawRabbit", + "tags": [ "rabbitmq", "raw", "rawrabbit", "attributes" ], + "publishExclude": [ "**.xproj", "**.user", "**.vspscc" ] + }, "dependencies": { - "RawRabbit": "", - "Microsoft.Extensions.DependencyInjection": "1.0.0-rc1-final", - "Microsoft.Extensions.Logging": "1.0.0-rc1-final", - "Microsoft.Extensions.Configuration": "1.0.0-rc1-final", - "Microsoft.Extensions.Configuration.Binder": "1.0.0-rc1-final" + "RawRabbit": {"target": "project"}, + "Microsoft.Extensions.DependencyInjection": "1.0.0-rc2-final", + "Microsoft.Extensions.Logging": "1.0.0-rc2-final", + "Microsoft.Extensions.Configuration": "1.0.0-rc2-final", + "Microsoft.Extensions.Configuration.Binder": "1.0.0-rc2-final" }, "frameworks": { "dnx451": { }, - "dnx50": { }, "net451": { }, "net452": { }, - "net46": { }, - "net50": { } - }, - - "publishExclude": [ - ], - "exclude": [ - ] + "net46": { } + } } diff --git a/src/RawRabbit/Logging/LoggerFactory.cs b/src/RawRabbit/Logging/LoggerFactory.cs index 0f8c4a92..ed57f2ed 100644 --- a/src/RawRabbit/Logging/LoggerFactory.cs +++ b/src/RawRabbit/Logging/LoggerFactory.cs @@ -1,14 +1,10 @@ using System; +using System.Collections.Concurrent; namespace RawRabbit.Logging { public interface ILoggerFactory : IDisposable { - /// - /// The minimum level of log messages sent to loggers. - /// - LogLevel MinimumLevel { get; set; } - /// /// Creates a new instance. /// @@ -19,26 +15,29 @@ public interface ILoggerFactory : IDisposable public class LoggerFactory : ILoggerFactory { - private readonly Func _createFn; + private readonly Func _createFn; + private readonly ConcurrentDictionary _categoryToLogger; - public LoggerFactory() : this((level, s) => new ConsoleLogger(level, s)) + public LoggerFactory() : this(s => new ConsoleLogger(LogLevel.Debug, s)) { } - public LoggerFactory(Func createFn) + public LoggerFactory(Func createFn) { _createFn = createFn; + _categoryToLogger = new ConcurrentDictionary(); } - public void Dispose() - { - } - - public LogLevel MinimumLevel { get; set; } + public void Dispose() { } public ILogger CreateLogger(string categoryName) { - return _createFn(MinimumLevel, categoryName); + ILogger logger; + if (!_categoryToLogger.TryGetValue(categoryName, out logger)) + { + logger = _categoryToLogger.GetOrAdd(categoryName, _createFn); + } + return logger; } } diff --git a/src/RawRabbit/Properties/AssemblyInfo.cs b/src/RawRabbit/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..955a5ce6 --- /dev/null +++ b/src/RawRabbit/Properties/AssemblyInfo.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("RawRabbit")] +[assembly: AssemblyTrademark("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("5bec0b38-6746-47de-b931-b9a7b8e0e732")] diff --git a/src/RawRabbit/RawRabbit.xproj b/src/RawRabbit/RawRabbit.xproj index eb8f6a3f..ef45b437 100644 --- a/src/RawRabbit/RawRabbit.xproj +++ b/src/RawRabbit/RawRabbit.xproj @@ -4,19 +4,16 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + 14195f79-b374-4feb-ba3c-e24138542421 RawRabbit - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5.2 2.0 - 51798 - - True - - + \ No newline at end of file diff --git a/src/RawRabbit/project.json b/src/RawRabbit/project.json index dc2d3cf1..a8e82894 100644 --- a/src/RawRabbit/project.json +++ b/src/RawRabbit/project.json @@ -1,36 +1,24 @@ { - "version": "1.9.1-*", - "authors": ["pardahlman", "enrique-avalon"], - "description": "A modern framework for communication over RabbitMq.", - "iconUrl": "http://pardahlman.se/raw/icon.png", - "projectUrl": "https://github.com/pardahlman/RawRabbit", "title": "RawRabbit", - "tags": ["rabbitmq", "raw", "rawrabbit", "amqp"], + "version": "1.9.2-*", + "authors": [ "pardahlman", "enrique-avalon" ], + "description": "A modern framework for communication over RabbitMq.", + "packOptions": { + "iconUrl": "http://pardahlman.se/raw/icon.png", + "projectUrl": "https://github.com/pardahlman/RawRabbit", + "tags": [ "rabbitmq", "raw", "rawrabbit", "attributes" ], + "publishExclude": [ "**.xproj", "**.user", "**.vspscc" ] + }, "dependencies": { - "RabbitMQ.Client": "3.6.2", - "Newtonsoft.Json": "8.0.2" - }, - "commands": { - "test": "xunit.runner.dnx" + "RabbitMQ.Client": "3.6.2", + "Newtonsoft.Json": "8.0.3" }, + "frameworks": { - "dnx45": { }, "dnx451": { }, - "dnx50": { }, - "net45": { }, "net451": { }, "net452": { }, - "net46": { }, - "net50": { } - }, - - "publishExclude": [ - "**.xproj", - "**.user", - "**.vspscc" - ], - - "exclude": [ - ] + "net46": { } + } } diff --git a/test/RawRabbit.IntegrationTests/Features/MessageContextTests.cs b/test/RawRabbit.IntegrationTests/Features/MessageContextTests.cs index 243bf9ee..71cf80f0 100644 --- a/test/RawRabbit.IntegrationTests/Features/MessageContextTests.cs +++ b/test/RawRabbit.IntegrationTests/Features/MessageContextTests.cs @@ -26,7 +26,7 @@ public async Task Should_Send_Message_Context_Correctly() var expectedId = Guid.NewGuid(); var subscribeTcs = new TaskCompletionSource(); var contextProvider = new MessageContextProvider(new JsonSerializer(), () => new MessageContext {GlobalRequestId = expectedId}); - var publisher = BusClientFactory.CreateDefault(collection => collection.AddInstance(typeof (IMessageContextProvider), contextProvider)); + var publisher = BusClientFactory.CreateDefault(collection => collection.AddSingleton>(contextProvider)); subscriber.SubscribeAsync((msg, c) => { subscribeTcs.SetResult(c.GlobalRequestId); diff --git a/test/RawRabbit.IntegrationTests/Properties/AssemblyInfo.cs b/test/RawRabbit.IntegrationTests/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..8feb949b --- /dev/null +++ b/test/RawRabbit.IntegrationTests/Properties/AssemblyInfo.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("RawRabbit.IntegrationTests")] +[assembly: AssemblyTrademark("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("98c9e1d2-cbd2-4058-be9f-bb5f0f3795b4")] diff --git a/test/RawRabbit.IntegrationTests/RawRabbit.IntegrationTests.xproj b/test/RawRabbit.IntegrationTests/RawRabbit.IntegrationTests.xproj index 7129c8e3..c352df1f 100644 --- a/test/RawRabbit.IntegrationTests/RawRabbit.IntegrationTests.xproj +++ b/test/RawRabbit.IntegrationTests/RawRabbit.IntegrationTests.xproj @@ -4,21 +4,19 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + - a3181958-f6a1-489a-afcb-388af4baab4a + 98c9e1d2-cbd2-4058-be9f-bb5f0f3795b4 RawRabbit.IntegrationTests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5.2 2.0 - - True - - + \ No newline at end of file diff --git a/test/RawRabbit.IntegrationTests/project.json b/test/RawRabbit.IntegrationTests/project.json index bd010584..c8bc0f07 100644 --- a/test/RawRabbit.IntegrationTests/project.json +++ b/test/RawRabbit.IntegrationTests/project.json @@ -1,27 +1,24 @@ { "version": "1.0.0-*", - + "authors": [ "par.dahlman" ], + "testRunner": "xunit", + "dependencies": { - "RawRabbit": "", - "RawRabbit.Attributes": "", - "RawRabbit.vNext": "", - "RawRabbit.Extensions": "", + "RawRabbit": { "target": "project" }, + "RawRabbit.DependencyInjection.Autofac": { "target": "project" }, + "RawRabbit.DependencyInjection.Ninject": { "target": "project" }, + "RawRabbit.Attributes": { "target": "project" }, + "RawRabbit.Extensions": { "target": "project" }, + "RawRabbit.vNext": { "target": "project" }, + "Moq": "4.2.1510.2205", "xunit": "2.1.0", - "xunit.runner.dnx": "2.1.0-rc1-build204", - "Moq": "4.2.1510.2205" + "dotnet-test-xunit": "1.0.0-rc3-*" }, - - "commands": { - "test": "xunit.runner.dnx" - }, - "frameworks": { - "dnx451": { } - }, - - "publishExclude": [ - ], - - "exclude": [ - ] + "net46": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027" + } + } + } } diff --git a/test/RawRabbit.Tests/Properties/AssemblyInfo.cs b/test/RawRabbit.Tests/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..019a67cc --- /dev/null +++ b/test/RawRabbit.Tests/Properties/AssemblyInfo.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("RawRabbit.Tests")] +[assembly: AssemblyTrademark("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("bcccebd4-7456-43f7-93c5-380c563705da")] diff --git a/test/RawRabbit.Tests/RawRabbit.Tests.xproj b/test/RawRabbit.Tests/RawRabbit.Tests.xproj index 1ac77dfd..b9e801d3 100644 --- a/test/RawRabbit.Tests/RawRabbit.Tests.xproj +++ b/test/RawRabbit.Tests/RawRabbit.Tests.xproj @@ -4,22 +4,19 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + - 2318827a-0fe9-49d0-916e-3e0955af6544 + bcccebd4-7456-43f7-93c5-380c563705da RawRabbit.Tests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5.2 2.0 - 51997 - - - True - + \ No newline at end of file diff --git a/test/RawRabbit.Tests/project.json b/test/RawRabbit.Tests/project.json index 5c5dd18e..ff42d3cb 100644 --- a/test/RawRabbit.Tests/project.json +++ b/test/RawRabbit.Tests/project.json @@ -1,31 +1,22 @@ { "version": "1.0.0-*", + "authors": [ "par.dahlman" ], + "testRunner": "xunit", "dependencies": { - "Autofac": "2.2.4.900", - "Microsoft.Extensions.Configuration": "1.0.0-rc1-final", - "Moq" : "4.2.1510.2205", - "RawRabbit": "", - "RawRabbit.DependencyInjection.Autofac": "", - "RawRabbit.DependencyInjection.Ninject": "", - "RawRabbit.vNext": "", + "RawRabbit": { "target": "project" }, + "RawRabbit.DependencyInjection.Autofac": { "target": "project" }, + "RawRabbit.DependencyInjection.Ninject": { "target": "project" }, + "RawRabbit.vNext": { "target": "project" }, + "Moq": "4.2.1510.2205", "xunit": "2.1.0", - "xunit.runner.dnx": "2.1.0-rc1-build204" + "dotnet-test-xunit": "1.0.0-rc3-*" }, - - "commands": { - "test": "xunit.runner.dnx" - }, - "frameworks": { - "dnx451": { } - }, - - "publishExclude": [ - "**.xproj", - "**.user", - "**.vspscc" - ], - "exclude": [ - ] + "net46": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027" + } + } + } }