Merge xml serializer (#331)

Merge the `Tingle.EventBus.Serializers.Xml` into the main library/project.
tinglesoftware · Oct 29, 2021 · 2f51d1d · 2f51d1d
1 parent 74a27ca
commit 2f51d1d
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,6 @@ This repository contains the code for the `Tingle.EventBus` libraries. This proj
 |--|--|--|
 |`Tingle.EventBus`|[![NuGet](https://img.shields.io/nuget/v/Tingle.EventBus.svg)](https://www.nuget.org/packages/Tingle.EventBus/)|Base of the event bus library to allow you publish and consume events from different transports.|
 |`Tingle.EventBus.Serializers.NewtonsoftJson`|[![NuGet](https://img.shields.io/nuget/v/Tingle.EventBus.Serializers.NewtonsoftJson.svg)](https://www.nuget.org/packages/Tingle.EventBus.Serializers.NewtonsoftJson/)|Support for serializing events using [Newtonsoft.Json](https://www.nuget.org/packages/Newtonsoft.Json/).|
-|`Tingle.EventBus.Serializers.Xml`|[![NuGet](https://img.shields.io/nuget/v/Tingle.EventBus.Serializers.Xml.svg)](https://www.nuget.org/packages/Tingle.EventBus.Serializers.Xml/)|Support for serializing events using XML.|
 |`Tingle.EventBus.Transports.Amazon.Abstractions`|[![NuGet](https://img.shields.io/nuget/v/Tingle.EventBus.Transports.Amazon.Abstractions.svg)](https://www.nuget.org/packages/Tingle.EventBus.Transports.Amazon.Abstractions/)|Abstractions for working with Amazon (AWS) based transports.|
 |`Tingle.EventBus.Transports.Amazon.Kinesis`|[![NuGet](https://img.shields.io/nuget/v/Tingle.EventBus.Transports.Amazon.Kinesis.svg)](https://www.nuget.org/packages/Tingle.EventBus.Transports.Amazon.Kinesis/)|Event bus transport based on [Amazon Kinesis](https://aws.amazon.com/kinesis/).|
 |`Tingle.EventBus.Transports.Amazon.Sqs`|[![NuGet](https://img.shields.io/nuget/v/Tingle.EventBus.Transports.Amazon.Sqs.svg)](https://www.nuget.org/packages/Tingle.EventBus.Transports.Amazon.Sqs/)|Event bus transport based on [Amazon Simple Queue Service](https://aws.amazon.com/sqs/).|

diff --git a/Tingle.EventBus.sln b/Tingle.EventBus.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30611.23
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31825.309
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3647730E-193B-45E9-8ECE-DDA7494C9030}"
 	ProjectSection(SolutionItems) = preProject
@@ -12,8 +12,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tingle.EventBus", "src\Ting
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tingle.EventBus.Serializers.NewtonsoftJson", "src\Tingle.EventBus.Serializers.NewtonsoftJson\Tingle.EventBus.Serializers.NewtonsoftJson.csproj", "{B292B03E-7909-49F4-9295-F9F1FED0EF02}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tingle.EventBus.Serializers.Xml", "src\Tingle.EventBus.Serializers.Xml\Tingle.EventBus.Serializers.Xml.csproj", "{C897FE6B-2F1D-4C71-8F3B-4330226AB220}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tingle.EventBus.Transports.Amazon.Abstractions", "src\Tingle.EventBus.Transports.Amazon.Abstractions\Tingle.EventBus.Transports.Amazon.Abstractions.csproj", "{1ED48501-B1A3-4882-B67A-FC39278505BE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tingle.EventBus.Transports.Amazon.Kinesis", "src\Tingle.EventBus.Transports.Amazon.Kinesis\Tingle.EventBus.Transports.Amazon.Kinesis.csproj", "{7432F6AC-265B-4226-B285-AE9ABB33F4AD}"
@@ -80,10 +78,6 @@ Global
 		{B292B03E-7909-49F4-9295-F9F1FED0EF02}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B292B03E-7909-49F4-9295-F9F1FED0EF02}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B292B03E-7909-49F4-9295-F9F1FED0EF02}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C897FE6B-2F1D-4C71-8F3B-4330226AB220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C897FE6B-2F1D-4C71-8F3B-4330226AB220}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C897FE6B-2F1D-4C71-8F3B-4330226AB220}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C897FE6B-2F1D-4C71-8F3B-4330226AB220}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1ED48501-B1A3-4882-B67A-FC39278505BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1ED48501-B1A3-4882-B67A-FC39278505BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1ED48501-B1A3-4882-B67A-FC39278505BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -175,7 +169,6 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{967CBEC5-4A2D-4635-905D-6AA2DFE1341F} = {3647730E-193B-45E9-8ECE-DDA7494C9030}
 		{B292B03E-7909-49F4-9295-F9F1FED0EF02} = {3647730E-193B-45E9-8ECE-DDA7494C9030}
-		{C897FE6B-2F1D-4C71-8F3B-4330226AB220} = {3647730E-193B-45E9-8ECE-DDA7494C9030}
 		{1ED48501-B1A3-4882-B67A-FC39278505BE} = {3647730E-193B-45E9-8ECE-DDA7494C9030}
 		{7432F6AC-265B-4226-B285-AE9ABB33F4AD} = {3647730E-193B-45E9-8ECE-DDA7494C9030}
 		{9D2FB610-EBAB-434C-A7C3-6FB20C3D0C3E} = {3647730E-193B-45E9-8ECE-DDA7494C9030}

diff --git a/samples/MultiEventsConsumer/MultiEventsConsumer.csproj b/samples/MultiEventsConsumer/MultiEventsConsumer.csproj
@@ -9,7 +9,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Tingle.EventBus.Serializers.Xml\Tingle.EventBus.Serializers.Xml.csproj" />
     <ProjectReference Include="..\..\src\Tingle.EventBus.Transports.InMemory\Tingle.EventBus.Transports.InMemory.csproj" />
   </ItemGroup>
 

diff --git a/src/Tingle.EventBus.Serializers.Xml/Tingle.EventBus.Serializers.Xml.csproj b/src/Tingle.EventBus.Serializers.Xml/Tingle.EventBus.Serializers.Xml.csproj
diff --git a/...ializers.Xml/EventBusBuilderExtensions.cs → ...lization/Xml/EventBusBuilderExtensions.cs b/...ializers.Xml/EventBusBuilderExtensions.cs → ...lization/Xml/EventBusBuilderExtensions.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Options;
 using System;
-using Tingle.EventBus.Serializers;
+using Tingle.EventBus.Serialization.Xml;
 
 namespace Microsoft.Extensions.DependencyInjection
 {

diff --git a/...ntBus.Serializers.Xml/XmlEventEnvelope.cs → ...Bus/Serialization/Xml/XmlEventEnvelope.cs b/...ntBus.Serializers.Xml/XmlEventEnvelope.cs → ...Bus/Serialization/Xml/XmlEventEnvelope.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Xml.Serialization;
 
-namespace Tingle.EventBus.Serialization
+namespace Tingle.EventBus.Serialization.Xml
 {
     ///
     [XmlRoot("EventEnvelope")]

diff --git a/...Bus.Serializers.Xml/XmlEventSerializer.cs → ...s/Serialization/Xml/XmlEventSerializer.cs b/...Bus.Serializers.Xml/XmlEventSerializer.cs → ...s/Serialization/Xml/XmlEventSerializer.cs
@@ -7,9 +7,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Xml.Serialization;
-using Tingle.EventBus.Serialization;
 
-namespace Tingle.EventBus.Serializers
+namespace Tingle.EventBus.Serialization.Xml
 {
     /// <summary>
     /// The default implementation of <see cref="IEventSerializer"/> for XML.

diff --git a/...ializers.Xml/XmlEventSerializerOptions.cs → ...lization/Xml/XmlEventSerializerOptions.cs b/...ializers.Xml/XmlEventSerializerOptions.cs → ...lization/Xml/XmlEventSerializerOptions.cs
@@ -1,4 +1,4 @@
-namespace Tingle.EventBus.Serializers
+namespace Microsoft.Extensions.DependencyInjection
 {
     /// <summary>
     /// Options for configuring XML based event serializer.

diff --git a/...XmlEventSerializerPostConfigureOptions.cs → ...XmlEventSerializerPostConfigureOptions.cs b/...XmlEventSerializerPostConfigureOptions.cs → ...XmlEventSerializerPostConfigureOptions.cs
@@ -1,5 +1,4 @@
 using Microsoft.Extensions.Options;
-using Tingle.EventBus.Serializers;
 
 namespace Microsoft.Extensions.DependencyInjection
 {

diff --git a/...gle.EventBus.Serializers.Xml/XmlHeader.cs → ...e.EventBus/Serialization/Xml/XmlHeader.cs b/...gle.EventBus.Serializers.Xml/XmlHeader.cs → ...e.EventBus/Serialization/Xml/XmlHeader.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace Tingle.EventBus.Serialization
+namespace Tingle.EventBus.Serialization.Xml
 {
     ///
     [XmlType("Header")]