Merge pull request #37 from NerosoftDev/develop

Develop

Euonia.sln

@@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution", "Solution", "{CC
 	ProjectSection(SolutionItems) = preProject
 		Directory.Packages.props = Directory.Packages.props
 		NuGet.config = NuGet.config
+		project.props = project.props
 		README.md = README.md
 	EndProjectSection
 EndProject

Samples/common.props

@@ -1,17 +1,12 @@
 <Project>
+    <Import Project="..\project.props" />
+
     <PropertyGroup>
-        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+        <TargetFramework>net8.0</TargetFramework>
 		<RootNamespace>Nerosoft.Euonia.Sample</RootNamespace>
-        <Version>8.0.0</Version>
-        <Authors>damon</Authors>
-        <Company>Nerosoft Co., Ltd.</Company>
-        <Product>Euonia</Product>
-        <Copyright>© 2018-2023 Nerosoft. All Rights Reserved.</Copyright>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>disable</Nullable>
-        <LangVersion>latest</LangVersion>
         <Description>Euonia development framework and toolkit library for .NET application/service. Powered by Nerosoft.</Description>
         <Configurations>Debug;Release;Product</Configurations>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)'=='Debug' ">

Source/Euonia.Bus.Abstract/Properties/AssemblyInfo.cs

@@ -3,4 +3,5 @@
 [assembly: InternalsVisibleTo("Euonia.Bus")]
 
 
+// ReSharper disable once EmptyNamespace
 namespace Nerosoft.Euonia.Bus.Properties;

Source/Euonia.Bus.InMemory/Messages/AsyncCollectionRequestMessage.cs

@@ -38,7 +38,7 @@ public class AsyncCollectionRequestMessage<T> : IAsyncEnumerable<T>
 	/// </code>
 	/// If we also want to control the cancellation of the token passed to each subscriber to the message,
 	/// we can do so by passing a token we control to the returned message before starting the enumeration
-	/// (<see cref="TaskAsyncEnumerableExtensions.WithCancellation{T}(IAsyncEnumerable{T}, CancellationToken)"/>).
+	/// (<see cref="TaskAsyncEnumerableExtensions.WithCancellation{T}"/>).
 	/// The previous snippet with this additional change looks as follows:
 	/// <code>
 	/// await foreach (var document in Messenger.Default.Send&lt;OpenDocumentsRequestMessage&gt;().WithCancellation(cts.Token))
@@ -52,7 +52,7 @@ public class AsyncCollectionRequestMessage<T> : IAsyncEnumerable<T>
 	/// itself will automatically be linked and canceled with the one passed to the enumerator.
 	/// </summary>
 	public CancellationToken CancellationToken => _cancellationTokenSource.Token;
-
+	
 	/// <summary>
 	/// Replies to the current request message.
 	/// </summary>

Source/Euonia.Bus.RabbitMq/RabbitMqQueueConsumer.cs

@@ -1,12 +1,11 @@
-using System.Threading.Channels;
-using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Options;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
 
 namespace Nerosoft.Euonia.Bus.RabbitMq;
 
 /// <summary>
-/// 
+/// The RabbitMQ implementation of <see cref="IQueueConsumer"/>.
 /// </summary>
 public class RabbitMqQueueConsumer : RabbitMqQueueRecipient, IQueueConsumer
 {

Source/Euonia.Bus/Messages/MessageBusException.cs

@@ -1,4 +1,6 @@
-using System.Runtime.Serialization;
+#if !NET8_0_OR_GREATER
+using System.Runtime.Serialization;
+#endif
 
 namespace Nerosoft.Euonia.Bus;
 
@@ -10,7 +12,7 @@ namespace Nerosoft.Euonia.Bus;
 [Serializable]
 public class MessageBusException : Exception
 {
-	private object _message;
+	private readonly object _message;
 
 	/// <summary>
 	/// Initializes a new instance of the <see cref="MessageBusException"/> class.
@@ -50,6 +52,7 @@ public MessageBusException(object messageContext, string message, Exception inne
 	/// <value>The type of the message.</value>
 	public virtual object MessageContext => _message;
 
+#if !NET8_0_OR_GREATER
 	/// <inheritdoc />
 	public MessageBusException(SerializationInfo info, StreamingContext context)
 		: base(info, context)
@@ -63,4 +66,5 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
 		base.GetObjectData(info, context);
 		info.AddValue(nameof(MessageContext), _message, MessageContext.GetType());
 	}
+#endif
 }

Source/Euonia.Core/Euonia.Core.csproj

@@ -33,4 +33,7 @@
         </EmbeddedResource>
     </ItemGroup>
 
+    <ItemGroup>
+        <Using Include="System.Runtime.Serialization" />
+    </ItemGroup>
 </Project>

Source/Euonia.Core/Exceptions/BadGatewayException.cs

@@ -1,5 +1,4 @@
 using System.Net;
-using System.Runtime.Serialization;
 
 namespace Nerosoft.Euonia.Core;
 
@@ -18,11 +17,13 @@ public BadGatewayException()
     {
     }
 
-    /// <inheritdoc />
-    protected BadGatewayException(SerializationInfo info, StreamingContext context)
-        : base(info, context)
-    {
-    }
+#if !NET8_0_OR_GREATER
+	/// <inheritdoc />
+	public BadGatewayException(SerializationInfo info, StreamingContext context)
+		: base(info, context)
+	{
+	}
+#endif
 
     /// <inheritdoc />
     public BadGatewayException(string message)

Source/Euonia.Core/Exceptions/BadRequestException.cs

@@ -1,5 +1,4 @@
 using System.Net;
-using System.Runtime.Serialization;
 
 namespace Nerosoft.Euonia.Core;
 
@@ -17,11 +16,13 @@ public BadRequestException()
     {
     }
 
-    /// <inheritdoc />
-    protected BadRequestException(SerializationInfo info, StreamingContext context)
-        : base(info, context)
-    {
-    }
+#if !NET8_0_OR_GREATER
+	/// <inheritdoc />
+	public BadRequestException(SerializationInfo info, StreamingContext context)
+		: base(info, context)
+	{
+	}
+#endif
 
     /// <inheritdoc />
     public BadRequestException(string message)

Source/Euonia.Core/Exceptions/BusinessException.cs

@@ -1,68 +1,68 @@
-using System.Runtime.Serialization;
-
-namespace Nerosoft.Euonia.Core;
+namespace Nerosoft.Euonia.Core;
 
 /// <summary>
 /// Represents errors that occur during business logic execution.
 /// </summary>
 [Serializable]
 public class BusinessException : Exception
 {
-    private readonly string _code;
+	private readonly string _code;
 
-    /// <summary>
-    /// Gets the business error code.
-    /// </summary>
-    public virtual string Code => _code;
+	/// <summary>
+	/// Gets the business error code.
+	/// </summary>
+	public virtual string Code => _code;
 
-    /// <inheritdoc />
-    public BusinessException()
-    {
-    }
+	/// <inheritdoc />
+	public BusinessException()
+	{
+	}
 
-    /// <summary>
-    /// Initialize a new instance of the <see cref="BusinessException"/> with error code.
-    /// </summary>
-    /// <param name="code">The error code.</param>
-    public BusinessException(string code)
-    {
-        _code = code;
-    }
+	/// <summary>
+	/// Initialize a new instance of the <see cref="BusinessException"/> with error code.
+	/// </summary>
+	/// <param name="code">The error code.</param>
+	public BusinessException(string code)
+	{
+		_code = code;
+	}
 
-    /// <summary>
-    /// Initialize a new instance of the <see cref="BusinessException"/> with error code and message.
-    /// </summary>
-    /// <param name="code">The error code.</param>
-    /// <param name="message">The error message.</param>
-    public BusinessException(string code, string message)
-        : base(message)
-    {
-        _code = code;
-    }
+	/// <summary>
+	/// Initialize a new instance of the <see cref="BusinessException"/> with error code and message.
+	/// </summary>
+	/// <param name="code">The error code.</param>
+	/// <param name="message">The error message.</param>
+	public BusinessException(string code, string message)
+		: base(message)
+	{
+		_code = code;
+	}
 
-    /// <summary>
-    /// Initialize a new instance of the <see cref="BusinessException"/> with error code, message and inner exception.
-    /// </summary>
-    /// <param name="code">The error code.</param>
-    /// <param name="message">The error message that explains the reason for the exception.</param>
-    /// <param name="innerException">The exception that is the cause of the current exception.</param>
-    public BusinessException(string code, string message, Exception innerException)
-        : base(message, innerException)
-    {
-        _code = code;
-    }
+	/// <summary>
+	/// Initialize a new instance of the <see cref="BusinessException"/> with error code, message and inner exception.
+	/// </summary>
+	/// <param name="code">The error code.</param>
+	/// <param name="message">The error message that explains the reason for the exception.</param>
+	/// <param name="innerException">The exception that is the cause of the current exception.</param>
+	public BusinessException(string code, string message, Exception innerException)
+		: base(message, innerException)
+	{
+		_code = code;
+	}
 
-    /// <inheritdoc />
-    protected BusinessException(SerializationInfo info, StreamingContext context)
-        : base(info, context)
-    {
-        _code = info.GetString(nameof(Code));
-    }
+#if !NET8_0_OR_GREATER
+	/// <inheritdoc />
+	public BusinessException(SerializationInfo info, StreamingContext context)
+		: base(info, context)
+	{
+		_code = info.GetString(nameof(Code));
+	}
 
-    /// <inheritdoc />
-    public override void GetObjectData(SerializationInfo info, StreamingContext context)
-    {
-        base.GetObjectData(info, context);
-        info.AddValue(nameof(Code), _code, typeof(string));
-    }
-}
+	/// <inheritdoc />
+	public override void GetObjectData(SerializationInfo info, StreamingContext context)
+	{
+		base.GetObjectData(info, context);
+		info.AddValue(nameof(Code), _code, typeof(string));
+	}
+#endif
+}

Source/Euonia.Core/Exceptions/ConfigurationException.cs

@@ -1,6 +1,4 @@
-using System.Runtime.Serialization;
-
-namespace Nerosoft.Euonia.Core;
+namespace Nerosoft.Euonia.Core;
 
 /// <summary>
 /// Represents errors that occur during application configuration.
@@ -34,9 +32,11 @@ public ConfigurationException(string message, Exception innerException)
     {
     }
 
-    /// <inheritdoc />
-    protected ConfigurationException(SerializationInfo info, StreamingContext context)
-        : base(info, context)
-    {
-    }
+#if !NET8_0_OR_GREATER
+	/// <inheritdoc />
+	public ConfigurationException(SerializationInfo info, StreamingContext context)
+		: base(info, context)
+	{
+	}
+#endif
 }

Source/Euonia.Core/Exceptions/ConflictException.cs

@@ -1,5 +1,4 @@
 using System.Net;
-using System.Runtime.Serialization;
 
 namespace Nerosoft.Euonia.Core;
 
@@ -17,11 +16,13 @@ public ConflictException()
     {
     }
 
-    /// <inheritdoc />
-    protected ConflictException(SerializationInfo info, StreamingContext context)
-        : base(info, context)
-    {
-    }
+#if !NET8_0_OR_GREATER
+	/// <inheritdoc />
+	public ConflictException(SerializationInfo info, StreamingContext context)
+		: base(info, context)
+	{
+	}
+#endif
 
     /// <inheritdoc />
     public ConflictException(string message)

Source/Euonia.Core/Exceptions/ForbiddenException.cs

@@ -1,5 +1,4 @@
 using System.Net;
-using System.Runtime.Serialization;
 
 namespace Nerosoft.Euonia.Core;
 
@@ -17,11 +16,13 @@ public ForbiddenException()
     {
     }
 
-    /// <inheritdoc />
-    protected ForbiddenException(SerializationInfo info, StreamingContext context)
-        : base(info, context)
-    {
-    }
+#if !NET8_0_OR_GREATER
+	/// <inheritdoc />
+	public ForbiddenException(SerializationInfo info, StreamingContext context)
+		: base(info, context)
+	{
+	}
+#endif
 
     /// <inheritdoc />
     public ForbiddenException(string message)

Source/Euonia.Core/Exceptions/GatewayTimeoutException.cs

@@ -1,5 +1,4 @@
 using System.Net;
-using System.Runtime.Serialization;
 
 namespace Nerosoft.Euonia.Core;
 
@@ -17,14 +16,16 @@ public GatewayTimeoutException()
     {
     }
 
-    /// <inheritdoc />
-    protected GatewayTimeoutException(SerializationInfo info, StreamingContext context)
-        : base(info, context)
-    {
-    }
+#if !NET8_0_OR_GREATER
+	/// <inheritdoc />
+	public GatewayTimeoutException(SerializationInfo info, StreamingContext context)
+		: base(info, context)
+	{
+	} 
+#endif
 
-    /// <inheritdoc />
-    public GatewayTimeoutException(string message)
+	/// <inheritdoc />
+	public GatewayTimeoutException(string message)
         : base(message)
     {
     }