Merge pull request #31 from NerosoftDev/net8.0

Net8.0
NerosoftDev · Nov 30, 2023 · 3d0e9bc · 3d0e9bc
2 parents 7b484b2 + 87fdaa0
commit 3d0e9bc
Show file tree

Hide file tree

Showing 46 changed files with 172 additions and 252 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,7 +3,8 @@
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
         <EnablePackageVersionOverride>true</EnablePackageVersionOverride>
         <MicrosoftPackageVersion6>6.0.24</MicrosoftPackageVersion6>
-        <MicrosoftPackageVersion7>7.0.13</MicrosoftPackageVersion7>
+        <MicrosoftPackageVersion7>7.0.14</MicrosoftPackageVersion7>
+        <MicrosoftPackageVersion8>8.0.0</MicrosoftPackageVersion8>
         <GrpcAspNetCoreVersion>2.59.0</GrpcAspNetCoreVersion>
     </PropertyGroup>
     <ItemGroup>
@@ -12,10 +13,10 @@
         <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="8.0.0"/>
         <PackageVersion Include="Autofac.Extras.DynamicProxy" Version="7.1.0"/>
         <PackageVersion Include="AutoMapper" Version="12.0.1"/>
-        <PackageVersion Include="Azure.Storage.Blobs" Version="12.19.0"/>
+        <PackageVersion Include="Azure.Storage.Blobs" Version="12.19.1"/>
         <PackageVersion Include="Castle.Core" Version="5.1.1"/>
         <PackageVersion Include="Consul" Version="1.6.10.9"/>
-        <PackageVersion Include="FluentValidation" Version="11.8.0"/>
+        <PackageVersion Include="FluentValidation" Version="11.8.1"/>
         <PackageVersion Include="IdentityModel" Version="6.2.0"/>
         <PackageVersion Include="IdentityModel.AspNetCore.OAuth2Introspection" Version="6.2.0"/>
         <PackageVersion Include="Mapster" Version="7.4.0"/>
@@ -24,53 +25,53 @@
         <PackageVersion Include="MediatR.Contracts" Version="2.0.1"/>
         <PackageVersion Include="mongocsharpdriver" Version="2.22.0"/>
         <PackageVersion Include="Newtonsoft.Json" Version="13.0.3"/>
-        <PackageVersion Include="Polly" Version="8.1.0"/>
+        <PackageVersion Include="Polly" Version="8.2.0"/>
         <PackageVersion Include="protobuf-net" Version="3.1.33"/>
-        <PackageVersion Include="Quartz" Version="3.7.0"/>
-        <PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.7.0"/>
-        <PackageVersion Include="Quartz.Extensions.Hosting" Version="3.7.0"/>
-        <PackageVersion Include="RabbitMQ.Client" Version="6.6.0"/>
+        <PackageVersion Include="Quartz" Version="3.8.0"/>
+        <PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.8.0"/>
+        <PackageVersion Include="Quartz.Extensions.Hosting" Version="3.8.0"/>
+        <PackageVersion Include="RabbitMQ.Client" Version="6.7.0"/>
         <PackageVersion Include="Refit" Version="6.3.2"/>
         <PackageVersion Include="Refit.HttpClientFactory" Version="6.3.2"/>
         <PackageVersion Include="Refit.Newtonsoft.Json" Version="6.3.2"/>
         <PackageVersion Include="Serilog" Version="3.1.1"/>
-        <PackageVersion Include="Serilog.AspNetCore" Version="7.0.0"/>
+        <PackageVersion Include="Serilog.AspNetCore" Version="8.0.0"/>
         <PackageVersion Include="Serilog.Enrichers.Environment" Version="2.3.0"/>
         <PackageVersion Include="Serilog.Sinks.Elasticsearch" Version="9.0.3"/>
         <PackageVersion Include="Serilog.Sinks.Email" Version="2.4.0"/>
         <PackageVersion Include="Serilog.Sinks.File" Version="5.0.0"/>
         <PackageVersion Include="StackExchange.Redis" Version="2.7.4"/>
         <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0"/>
-        <PackageVersion Include="System.Collections.Immutable" Version="7.0.0"/>
+        <PackageVersion Include="System.Collections.Immutable" Version="8.0.0"/>
         <PackageVersion Include="System.Configuration.ConfigurationManager" Version="7.0.0"/>
         <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0"/>
         <PackageVersion Include="System.Interactive" Version="6.0.1"/>
-        <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="7.0.0"/>
+        <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="8.0.0"/>
         <PackageVersion Include="System.Reactive" Version="6.0.0"/>
-        <PackageVersion Include="System.Runtime.Caching" Version="7.0.0"/>
+        <PackageVersion Include="System.Runtime.Caching" Version="8.0.0"/>
         <PackageVersion Include="System.Runtime.Loader" Version="4.3.0"/>
-        <PackageVersion Include="System.Text.Json" Version="7.0.3"/>
+        <PackageVersion Include="System.Text.Json" Version="8.0.0"/>
         <PackageVersion Include="Winton.Extensions.Configuration.Consul" Version="3.2.0"/>
         <PackageVersion Include="ZooKeeperNetEx" Version="3.4.12.4"/>
     </ItemGroup>
     <!-- Microsoft.Extensions -->
     <ItemGroup>
-        <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0"/>
-        <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0"/>
-        <PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0"/>
-        <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0"/>
-        <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0"/>
-        <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0"/>
-        <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0"/>
-        <PackageVersion Include="Microsoft.Extensions.Hosting" Version="7.0.1"/>
-        <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0"/>
-        <PackageVersion Include="Microsoft.Extensions.Http" Version="7.0.0"/>
-        <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1"/>
-        <PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.1"/>
-        <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0"/>
+        <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0"/>
+        <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0"/>
+        <PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0"/>
+        <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0"/>
+        <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0"/>
+        <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0"/>
+        <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0"/>
+        <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0"/>
+        <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0"/>
+        <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0"/>
+        <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0"/>
+        <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.0"/>
+        <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0"/>
     </ItemGroup>
     <!-- Microsoft.EntityFrameworkCore -->
-    <ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)'!='net8.0'">
         <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(MicrosoftPackageVersion7)"/>
         <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftPackageVersion7)"/>
         <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftPackageVersion7)"/>
@@ -80,10 +81,20 @@
         </PackageVersion>
         <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftPackageVersion7)"/>
     </ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
+        <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(MicrosoftPackageVersion8)"/>
+        <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftPackageVersion8)"/>
+        <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftPackageVersion8)"/>
+        <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="$(MicrosoftPackageVersion8)">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageVersion>
+        <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftPackageVersion8)"/>
+    </ItemGroup>
     <!-- Microsoft.AspNetCore -->
     <ItemGroup>
-        <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="$(MicrosoftPackageVersion7)"/>
-        <PackageVersion Include="Microsoft.AspNetCore.Connections.Abstractions" Version="$(MicrosoftPackageVersion7)"/>
+        <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="$(MicrosoftPackageVersion8)"/>
+        <PackageVersion Include="Microsoft.AspNetCore.Connections.Abstractions" Version="$(MicrosoftPackageVersion8)"/>
     </ItemGroup>
     <ItemGroup Condition="$(TargetFramework.Contains('netstandard'))">
     </ItemGroup>
@@ -96,10 +107,15 @@
         <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftPackageVersion7)"/>
         <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftPackageVersion7)"/>
     </ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
+        <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="$(MicrosoftPackageVersion8)"/>
+        <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftPackageVersion8)"/>
+        <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftPackageVersion8)"/>
+    </ItemGroup>
     <!-- Grpc -->
     <ItemGroup>
         <PackageVersion Include="Google.Api.CommonProtos" Version="2.12.0"/>
-        <PackageVersion Include="Google.Protobuf" Version="3.25.0"/>
+        <PackageVersion Include="Google.Protobuf" Version="3.25.1"/>
         <PackageVersion Include="Grpc" Version="2.46.6"/>
         <PackageVersion Include="Grpc.AspNetCore" Version="$(GrpcAspNetCoreVersion)"/>
         <PackageVersion Include="Grpc.AspNetCore.HealthChecks" Version="$(GrpcAspNetCoreVersion)"/>
@@ -114,8 +130,8 @@
     <ItemGroup>
         <PackageVersion Include="BenchmarkDotNet" Version="0.13.4"/>
         <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
-        <PackageVersion Include="xunit" Version="2.6.1"/>
-        <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3">
+        <PackageVersion Include="xunit" Version="2.6.2"/>
+        <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.4">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageVersion>
@@ -125,6 +141,6 @@
         </PackageVersion>
         <PackageVersion Include="Xunit.DependencyInjection" Version="8.9.0"/>
         <PackageVersion Include="Xunit.DependencyInjection.Logging" Version="8.0.1"/>
-        <PackageVersion Include="Moq" Version="4.20.69"/>
+        <PackageVersion Include="Moq" Version="4.20.70"/>
     </ItemGroup>
 </Project>
diff --git a/Samples/common.props b/Samples/common.props
@@ -1,8 +1,8 @@
 <Project>
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
 		<RootNamespace>Nerosoft.Euonia.Sample</RootNamespace>
-        <Version>7.6.0</Version>
+        <Version>8.0.0</Version>
         <Authors>damon</Authors>
         <Company>Nerosoft Co., Ltd.</Company>
         <Product>Euonia</Product>

diff --git a/Source/Euonia.Application/Euonia.Application.csproj b/Source/Euonia.Application/Euonia.Application.csproj
@@ -3,7 +3,6 @@
     <Import Project="..\common.props" />
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
         <Nullable>disable</Nullable>
     </PropertyGroup>
 

diff --git a/Source/Euonia.Bus.Abstract/Euonia.Bus.Abstract.csproj b/Source/Euonia.Bus.Abstract/Euonia.Bus.Abstract.csproj
@@ -11,21 +11,6 @@
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
     </ItemGroup>
 
-    <ItemGroup>
-        <Compile Update="Properties\Resources.Designer.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>Resources.resx</DependentUpon>
-        </Compile>
-    </ItemGroup>
-
-    <ItemGroup>
-        <EmbeddedResource Update="Properties\Resources.resx">
-            <Generator>ResXFileCodeGenerator</Generator>
-            <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-        </EmbeddedResource>
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\Euonia.Core\Euonia.Core.csproj" />
     </ItemGroup>

diff --git a/Source/Euonia.Bus.Abstract/MessageRegistration.cs b/Source/Euonia.Bus.Abstract/MessageRegistration.cs
@@ -5,32 +5,40 @@ namespace Nerosoft.Euonia.Bus;
 /// <summary>
 /// The message subscription.
 /// </summary>
-/// <remarks>
-/// Initializes a new instance of the <see cref="MessageRegistration"/> class.
-/// </remarks>
-/// <param name="channel"></param>
-/// <param name="messageType"></param>
-/// <param name="handlerType"></param>
-/// <param name="method"></param>
-public class MessageRegistration(string channel, Type messageType, Type handlerType, MethodInfo method)
+public class MessageRegistration
 {
+	/// <summary>
+	/// Initializes a new instance of the &lt;see cref="MessageRegistration"/&gt; class.
+	/// </summary>
+	/// <param name="channel"></param>
+	/// <param name="messageType"></param>
+	/// <param name="handlerType"></param>
+	/// <param name="method"></param>
+	public MessageRegistration(string channel, Type messageType, Type handlerType, MethodInfo method)
+	{
+		Channel = channel;
+		MessageType = messageType;
+		HandlerType = handlerType;
+		Method = method;
+	}
+
 	/// <summary>
 	/// Gets or sets the message name.
 	/// </summary>
-	public string Channel { get; set; } = channel;
+	public string Channel { get; }
 
 	/// <summary>
 	/// Gets or sets the message type.
 	/// </summary>
-	public Type MessageType { get; set; } = messageType;
+	public Type MessageType { get; }
 
 	/// <summary>
 	/// Gets or sets the handler type.
 	/// </summary>
-	public Type HandlerType { get; set; } = handlerType;
+	public Type HandlerType { get; } 
 
 	/// <summary>
 	/// Gets or sets the handler method.
 	/// </summary>
-	public MethodInfo Method { get; set; } = method;
+	public MethodInfo Method { get; }
 }
diff --git a/Source/Euonia.Bus.Abstract/Properties/AssemblyInfo.cs b/Source/Euonia.Bus.Abstract/Properties/AssemblyInfo.cs
@@ -1,3 +1,6 @@
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Euonia.Bus")]
+[assembly: InternalsVisibleTo("Euonia.Bus")]
+
+
+namespace Nerosoft.Euonia.Bus.Properties;
diff --git a/Source/Euonia.Bus.Abstract/Properties/Resources.resx b/Source/Euonia.Bus.Abstract/Properties/Resources.resx
diff --git a/Source/Euonia.Bus.Abstract/Recipients/IRecipientRegistrar.cs b/Source/Euonia.Bus.Abstract/Recipients/IRecipientRegistrar.cs
@@ -11,5 +11,5 @@ public interface IRecipientRegistrar
 	/// <param name="registrations"></param>
 	/// <param name="cancellationToken"></param>
 	/// <returns></returns>
-	Task RegisterAsync(IReadOnlyList<MessageRegistration> registrations, CancellationToken cancellationToken = default);
+	Task RegisterAsync(IEnumerable<MessageRegistration> registrations, CancellationToken cancellationToken = default);
 }
diff --git a/Source/Euonia.Bus.ActiveMq/Euonia.Bus.ActiveMq.csproj b/Source/Euonia.Bus.ActiveMq/Euonia.Bus.ActiveMq.csproj
@@ -4,6 +4,7 @@
 
     <PropertyGroup>
         <Nullable>disable</Nullable>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/Source/Euonia.Bus.InMemory/InMemoryRecipientRegistrar.cs b/Source/Euonia.Bus.InMemory/InMemoryRecipientRegistrar.cs
@@ -29,7 +29,7 @@ public InMemoryRecipientRegistrar(IMessenger messenger, IMessageConvention conve
 	}
 
 	/// <inheritdoc/>
-	public async Task RegisterAsync(IReadOnlyList<MessageRegistration> registrations, CancellationToken cancellationToken = default)
+	public async Task RegisterAsync(IEnumerable<MessageRegistration> registrations, CancellationToken cancellationToken = default)
 	{
 		if (_options.MultipleSubscriberInstance)
 		{