From c1c7b52fee0573ebb5c618c74e27f45fffe9a1e9 Mon Sep 17 00:00:00 2001 From: Christopher Read Date: Fri, 10 Nov 2017 14:22:33 +0000 Subject: [PATCH 1/2] Updated to Obvs v.40. Fixes #20 Updated csproj files to new format. Removed unneeded files. --- .gitignore | 3 +- .../EndpointProviderFacts.cs | 4 +- .../Obvs.AzureServiceBus.Tests.csproj | 153 ++---------------- .../Properties/AssemblyInfo.cs | 16 -- Obvs.AzureServiceBus.Tests/packages.config | 22 --- Obvs.AzureServiceBus.sln | 4 +- Obvs.AzureServiceBus/MessagePublisher.cs | 4 + .../Obvs.AzureServiceBus.csproj | 121 ++------------ .../Obvs.AzureServiceBus.nuspec | 17 -- .../Properties/AssemblyInfo.cs | 21 --- Obvs.AzureServiceBus/packages.config | 11 -- 11 files changed, 33 insertions(+), 343 deletions(-) delete mode 100644 Obvs.AzureServiceBus.Tests/Properties/AssemblyInfo.cs delete mode 100644 Obvs.AzureServiceBus.Tests/packages.config delete mode 100644 Obvs.AzureServiceBus/Obvs.AzureServiceBus.nuspec delete mode 100644 Obvs.AzureServiceBus/Properties/AssemblyInfo.cs delete mode 100644 Obvs.AzureServiceBus/packages.config diff --git a/.gitignore b/.gitignore index 7403ac2..273c9a0 100644 --- a/.gitignore +++ b/.gitignore @@ -229,4 +229,5 @@ $RECYCLE.BIN/ # Windows shortcuts *.lnk -/packages \ No newline at end of file +/packages +.vs \ No newline at end of file diff --git a/Obvs.AzureServiceBus.Tests/EndpointProviderFacts.cs b/Obvs.AzureServiceBus.Tests/EndpointProviderFacts.cs index 603c695..0c28804 100644 --- a/Obvs.AzureServiceBus.Tests/EndpointProviderFacts.cs +++ b/Obvs.AzureServiceBus.Tests/EndpointProviderFacts.cs @@ -148,7 +148,7 @@ public async Task CanPublishEndpointEvents() .Returns(mockMessageSender.Object); var endpointProvider = new AzureServiceBusEndpointProvider( - "TestEndpoint", _mockMessagingFactory.Object, new JsonMessageSerializer(), new JsonMessageDeserializerFactory(), _messageTypePathMappings, _testAssemblyFilter, _testMessageTypeFilter, _messagePropertyProviderManager, _mockMessageOutgoingPropertiesTable.Object); + "TestEndpoint", _mockMessagingFactory.Object, new JsonMessageSerializer(), new JsonMessageDeserializerFactory(typeof(JsonMessageDeserializer<>)), _messageTypePathMappings, _testAssemblyFilter, _testMessageTypeFilter, _messagePropertyProviderManager, _mockMessageOutgoingPropertiesTable.Object); var testEvent = new TestSpecificEvent1 { @@ -213,7 +213,7 @@ public async Task CanReceiveEndpointClientEvents() .Returns(mockMessageSender.Object); var endpointProvider = new AzureServiceBusEndpointProvider( - "TestEndpoint", _mockMessagingFactory.Object, new JsonMessageSerializer(), new JsonMessageDeserializerFactory(), _messageTypePathMappings, _testAssemblyFilter, _testMessageTypeFilter, _messagePropertyProviderManager, _mockMessageOutgoingPropertiesTable.Object); + "TestEndpoint", _mockMessagingFactory.Object, new JsonMessageSerializer(), new JsonMessageDeserializerFactory(typeof(JsonMessageDeserializer<>)), _messageTypePathMappings, _testAssemblyFilter, _testMessageTypeFilter, _messagePropertyProviderManager, _mockMessageOutgoingPropertiesTable.Object); var endpointClient = endpointProvider.CreateEndpointClient(); diff --git a/Obvs.AzureServiceBus.Tests/Obvs.AzureServiceBus.Tests.csproj b/Obvs.AzureServiceBus.Tests/Obvs.AzureServiceBus.Tests.csproj index 2bbb87a..bb7d022 100644 --- a/Obvs.AzureServiceBus.Tests/Obvs.AzureServiceBus.Tests.csproj +++ b/Obvs.AzureServiceBus.Tests/Obvs.AzureServiceBus.Tests.csproj @@ -1,149 +1,18 @@ - - - - - + - Debug - AnyCPU - {15275F11-AF1B-4787-8B6D-E52ABDB4C705} - Library - Properties - Obvs.AzureServiceBus.Tests - Obvs.AzureServiceBus.Tests - v4.5 - 512 - - + net45 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\FluentAssertions.4.2.1\lib\net45\FluentAssertions.dll - True - - - ..\packages\FluentAssertions.4.2.1\lib\net45\FluentAssertions.Core.dll - True - - - ..\packages\WindowsAzure.ServiceBus.3.1.2\lib\net45-full\Microsoft.ServiceBus.dll - True - - - ..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll - True - - - ..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll - True - - - ..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll - True - - - ..\packages\Obvs.3.0.0.47\lib\net45\Obvs.dll - True - - - ..\packages\Obvs.Serialization.Json.2.0.0.16\lib\net45\Obvs.Serialization.Json.dll - True - - - - - ..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll - True - - - ..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll - True - - - ..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll - True - - - - - - - - - - ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - - - ..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll - True - - - ..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - True - - - ..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True - - - - - - - - - - - - - - - - Designer - - - - {2c889e39-b633-4ec8-9bf0-4c98db630b0a} - Obvs.AzureServiceBus - + + + + + + + + - + - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/Obvs.AzureServiceBus.Tests/Properties/AssemblyInfo.cs b/Obvs.AzureServiceBus.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 977fb78..0000000 --- a/Obvs.AzureServiceBus.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Reflection; - -[assembly: AssemblyTitle("Obvs.AzureServiceBus.Tests")] -[assembly: AssemblyDescription("Test for the Azure ServiceBus support for the Obvs framework.")] -#if DEBUG -[assembly: AssemblyConfiguration("Debug")] -#else -[assembly: AssemblyConfiguration("Release")] -#endif -[assembly: AssemblyCompany("Drew Marsh")] -[assembly: AssemblyProduct("Obvs.AzureServiceBus")] -[assembly: AssemblyCopyright("Copyright © Drew Marsh 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: AssemblyVersion("0.1.0.*")] \ No newline at end of file diff --git a/Obvs.AzureServiceBus.Tests/packages.config b/Obvs.AzureServiceBus.Tests/packages.config deleted file mode 100644 index afd7998..0000000 --- a/Obvs.AzureServiceBus.Tests/packages.config +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Obvs.AzureServiceBus.sln b/Obvs.AzureServiceBus.sln index 5226a3e..f3a36f6 100644 --- a/Obvs.AzureServiceBus.sln +++ b/Obvs.AzureServiceBus.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25008.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.27004.2005 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Obvs.AzureServiceBus", "Obvs.AzureServiceBus\Obvs.AzureServiceBus.csproj", "{2C889E39-B633-4EC8-9BF0-4C98DB630B0A}" EndProject diff --git a/Obvs.AzureServiceBus/MessagePublisher.cs b/Obvs.AzureServiceBus/MessagePublisher.cs index 648d292..b9bf2ab 100644 --- a/Obvs.AzureServiceBus/MessagePublisher.cs +++ b/Obvs.AzureServiceBus/MessagePublisher.cs @@ -2,6 +2,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.IO; +using System.Runtime.CompilerServices; using System.Threading.Tasks; using Microsoft.ServiceBus.Messaging; using Obvs.AzureServiceBus.Infrastructure; @@ -9,6 +10,9 @@ using Obvs.Serialization; using Obvs.Types; +[assembly: InternalsVisibleTo("Obvs.AzureServiceBus.Tests")] +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] + namespace Obvs.AzureServiceBus { public class MessagePublisher : IMessagePublisher diff --git a/Obvs.AzureServiceBus/Obvs.AzureServiceBus.csproj b/Obvs.AzureServiceBus/Obvs.AzureServiceBus.csproj index 2214753..f1240de 100644 --- a/Obvs.AzureServiceBus/Obvs.AzureServiceBus.csproj +++ b/Obvs.AzureServiceBus/Obvs.AzureServiceBus.csproj @@ -1,114 +1,17 @@ - - - + - Debug - AnyCPU - {2C889E39-B633-4EC8-9BF0-4C98DB630B0A} - Library - Properties - Obvs.AzureServiceBus - Obvs.AzureServiceBus - v4.5 - 512 + net45 + Drew Marsh + Copyright © Drew Marsh 2015 + 1.0.0 + true + https://github.com/drub0y/Obvs.AzureServiceBus + Updated to Obvs v4.0 + AzureServiceBus transport support for Obvs - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\WindowsAzure.ServiceBus.3.1.2\lib\net45-full\Microsoft.ServiceBus.dll - True - - - ..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll - True - - - ..\packages\Obvs.3.0.0.47\lib\net45\Obvs.dll - True - - - - - ..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll - True - - - ..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll - True - - - ..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - + + + - - \ No newline at end of file diff --git a/Obvs.AzureServiceBus/Obvs.AzureServiceBus.nuspec b/Obvs.AzureServiceBus/Obvs.AzureServiceBus.nuspec deleted file mode 100644 index 06db07e..0000000 --- a/Obvs.AzureServiceBus/Obvs.AzureServiceBus.nuspec +++ /dev/null @@ -1,17 +0,0 @@ - - - - $id$ - $version$ - $title$ - Drew Marsh (@drub0y) - https://github.com/drub0y/Obvs.AzureServiceBus/ - https://github.com/drub0y/Obvs.AzureServiceBus/blob/master/LICENSE.md - Microsoft Azure Service Bus transport support for the Obvs Framework. - Copyright 2015 - Azure Commands Events CQRS Rx Observable - - FIX: fixing bug outgoing message properties were not actually being applied to the outgoing BrokeredMessage. - - - diff --git a/Obvs.AzureServiceBus/Properties/AssemblyInfo.cs b/Obvs.AzureServiceBus/Properties/AssemblyInfo.cs deleted file mode 100644 index 79e6cab..0000000 --- a/Obvs.AzureServiceBus/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly: AssemblyTitle("Obvs.AzureServiceBus")] -[assembly: AssemblyDescription("Azure ServiceBus support for the Obvs framework.")] -#if DEBUG -[assembly: AssemblyConfiguration("Debug")] -#else -[assembly: AssemblyConfiguration("Release")] -#endif -[assembly: AssemblyCompany("Drew Marsh")] -[assembly: AssemblyProduct("Obvs.AzureServiceBus")] -[assembly: AssemblyCopyright("Copyright © Drew Marsh 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: AssemblyVersion("0.15.2.*")] -[assembly: AssemblyInformationalVersion("0.15.2-beta2")] - -[assembly: InternalsVisibleTo("Obvs.AzureServiceBus.Tests")] -[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] \ No newline at end of file diff --git a/Obvs.AzureServiceBus/packages.config b/Obvs.AzureServiceBus/packages.config deleted file mode 100644 index 53d1f20..0000000 --- a/Obvs.AzureServiceBus/packages.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file From 8d4cba2b3d13330085bc2d25044feccaa8a91ad1 Mon Sep 17 00:00:00 2001 From: Christopher Read Date: Mon, 13 Nov 2017 16:43:39 +0000 Subject: [PATCH 2/2] Updated readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d2825f4..369c246 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Obvs.AzureServiceBus [![Join the chat at https://gitter.im/drub0y/Obvs.AzureServiceBus](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/drub0y/Obvs.AzureServiceBus?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -An Azure ServiceBus transport support for [the Obvs framework](https://github.com/inter8ection/Obvs). +An Azure ServiceBus transport support for [the Obvs framework](https://github.com/christopherread/Obvs). ---