From 1cb7ed56a9477742186bf6ad89d03c8ab31c33a9 Mon Sep 17 00:00:00 2001
From: damon <zhaorong@outlook.com>
Date: Mon, 19 Feb 2024 17:00:55 +0800
Subject: [PATCH] Bump nuget to latest version. Remove .net6 from Repository &
 Automapper.

---
 Directory.Packages.props                      | 37 +++++++++----------
 .../InMemoryTopicSubscriber.cs                |  3 --
 .../RabbitMqTopicSubscriber.cs                |  3 --
 .../Euonia.Mapping.Automapper.csproj          |  1 -
 .../EfCoreRepository.cs                       |  1 -
 .../MongoRepository.cs                        |  1 -
 .../Abstracts/IRepository.cs                  |  1 -
 Source/Euonia.Repository/Core/Repository.cs   |  2 -
 Source/common.props                           |  2 +-
 Tests/common.props                            |  2 +-
 project.props                                 |  2 +-
 11 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index a20ab0e..3ded4c8 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -2,17 +2,18 @@
     <PropertyGroup>
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
         <EnablePackageVersionOverride>true</EnablePackageVersionOverride>
-        <MicrosoftPackageVersion6>6.0.24</MicrosoftPackageVersion6>
-        <MicrosoftPackageVersion7>7.0.15</MicrosoftPackageVersion7>
-        <MicrosoftPackageVersion8>8.0.1</MicrosoftPackageVersion8>
+        <MicrosoftPackageVersion6>6.0.27</MicrosoftPackageVersion6>
+        <MicrosoftPackageVersion7>7.0.16</MicrosoftPackageVersion7>
+        <MicrosoftPackageVersion8>8.0.2</MicrosoftPackageVersion8>
         <GrpcAspNetCoreVersion>2.60.0</GrpcAspNetCoreVersion>
+        <QuartzVersion>3.8.1</QuartzVersion>
     </PropertyGroup>
     <ItemGroup>
         <PackageVersion Include="Apache.NMS.ActiveMQ" Version="2.1.0" />
         <PackageVersion Include="Autofac" Version="8.0.0" />
         <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
         <PackageVersion Include="Autofac.Extras.DynamicProxy" Version="7.1.0" />
-        <PackageVersion Include="AutoMapper" Version="12.0.1" />
+        <PackageVersion Include="AutoMapper" Version="13.0.1" />
         <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" />
@@ -25,17 +26,17 @@
         <PackageVersion Include="MediatR.Contracts" Version="2.0.1" />
         <PackageVersion Include="mongocsharpdriver" Version="2.23.1" />
         <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageVersion Include="Polly" Version="8.2.1" />
+        <PackageVersion Include="Polly" Version="8.3.0" />
         <PackageVersion Include="protobuf-net" Version="3.1.33" />
-        <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="Quartz" Version="$(QuartzVersion)" />
+        <PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="$(QuartzVersion)" />
+        <PackageVersion Include="Quartz.Extensions.Hosting" Version="$(QuartzVersion)" />
         <PackageVersion Include="RabbitMQ.Client" Version="6.8.1" />
         <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="8.0.0" />
+        <PackageVersion Include="Serilog.AspNetCore" Version="8.0.1" />
         <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" />
@@ -50,7 +51,7 @@
         <PackageVersion Include="System.Reactive" Version="6.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="8.0.1" />
+        <PackageVersion Include="System.Text.Json" Version="8.0.2" />
         <PackageVersion Include="Winton.Extensions.Configuration.Consul" Version="3.2.0" />
         <PackageVersion Include="ZooKeeperNetEx" Version="3.4.12.4" />
     </ItemGroup>
@@ -67,11 +68,11 @@
         <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.1" />
+        <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
         <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
     </ItemGroup>
     <!-- Microsoft.EntityFrameworkCore -->
-    <ItemGroup Condition="'$(TargetFramework)'!='net8.0'">
+    <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
         <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(MicrosoftPackageVersion7)" />
         <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftPackageVersion7)" />
         <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftPackageVersion7)" />
@@ -98,10 +99,6 @@
     </ItemGroup>
     <ItemGroup Condition="$(TargetFramework.Contains('netstandard'))">
     </ItemGroup>
-    <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-        <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftPackageVersion6)" />
-        <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftPackageVersion6)" />
-    </ItemGroup>
     <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
         <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="$(MicrosoftPackageVersion7)" />
         <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftPackageVersion7)" />
@@ -115,7 +112,7 @@
     <!-- Grpc -->
     <ItemGroup>
         <PackageVersion Include="Google.Api.CommonProtos" Version="2.12.0" />
-        <PackageVersion Include="Google.Protobuf" Version="3.25.2" />
+        <PackageVersion Include="Google.Protobuf" Version="3.25.3" />
         <PackageVersion Include="Grpc" Version="2.46.6" />
         <PackageVersion Include="Grpc.AspNetCore" Version="$(GrpcAspNetCoreVersion)" />
         <PackageVersion Include="Grpc.AspNetCore.HealthChecks" Version="$(GrpcAspNetCoreVersion)" />
@@ -129,9 +126,9 @@
     <!-- Tests -->
     <ItemGroup>
         <PackageVersion Include="BenchmarkDotNet" Version="0.13.4" />
-        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-        <PackageVersion Include="xunit" Version="2.6.6" />
-        <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6">
+        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+        <PackageVersion Include="xunit" Version="2.7.0" />
+        <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageVersion>
diff --git a/Source/Euonia.Bus.InMemory/InMemoryTopicSubscriber.cs b/Source/Euonia.Bus.InMemory/InMemoryTopicSubscriber.cs
index e27bb2a..55f9185 100644
--- a/Source/Euonia.Bus.InMemory/InMemoryTopicSubscriber.cs
+++ b/Source/Euonia.Bus.InMemory/InMemoryTopicSubscriber.cs
@@ -36,8 +36,5 @@ protected override async Task HandleAsync(string channel, object message, Messag
 		{
 			_logger.LogError(exception, "Message '{Id}' Handle Error: {Message}", context.MessageId, exception.Message);
 		}
-		finally
-		{
-		}
 	}
 }
\ No newline at end of file
diff --git a/Source/Euonia.Bus.RabbitMq/RabbitMqTopicSubscriber.cs b/Source/Euonia.Bus.RabbitMq/RabbitMqTopicSubscriber.cs
index 2d4697e..02e6964 100644
--- a/Source/Euonia.Bus.RabbitMq/RabbitMqTopicSubscriber.cs
+++ b/Source/Euonia.Bus.RabbitMq/RabbitMqTopicSubscriber.cs
@@ -114,9 +114,6 @@ protected override async Task HandleAsync(string channel, object message, Messag
 		{
 			_logger.LogError(exception, "Message '{Id}' Handle Error: {Message}", context.MessageId, exception.Message);
 		}
-		finally
-		{
-		}
 	}
 
 	/// <inheritdoc />
diff --git a/Source/Euonia.Mapping.Automapper/Euonia.Mapping.Automapper.csproj b/Source/Euonia.Mapping.Automapper/Euonia.Mapping.Automapper.csproj
index a7bb56a..09134fc 100644
--- a/Source/Euonia.Mapping.Automapper/Euonia.Mapping.Automapper.csproj
+++ b/Source/Euonia.Mapping.Automapper/Euonia.Mapping.Automapper.csproj
@@ -4,7 +4,6 @@
     <Import Project="..\resource.props" />
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.1;$(TargetFrameworks)</TargetFrameworks>
         <Nullable>disable</Nullable>
     </PropertyGroup>
 
diff --git a/Source/Euonia.Repository.EfCore/EfCoreRepository.cs b/Source/Euonia.Repository.EfCore/EfCoreRepository.cs
index 362c905..4ac14f3 100644
--- a/Source/Euonia.Repository.EfCore/EfCoreRepository.cs
+++ b/Source/Euonia.Repository.EfCore/EfCoreRepository.cs
@@ -1,7 +1,6 @@
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore;
 using Nerosoft.Euonia.Domain;
-using Nerosoft.Euonia.Linq;
 
 namespace Nerosoft.Euonia.Repository.EfCore;
 
diff --git a/Source/Euonia.Repository.Mongo/MongoRepository.cs b/Source/Euonia.Repository.Mongo/MongoRepository.cs
index 65cf576..5ceb3ac 100644
--- a/Source/Euonia.Repository.Mongo/MongoRepository.cs
+++ b/Source/Euonia.Repository.Mongo/MongoRepository.cs
@@ -3,7 +3,6 @@
 using MongoDB.Driver;
 using MongoDB.Driver.Linq;
 using Nerosoft.Euonia.Domain;
-using Nerosoft.Euonia.Linq;
 
 namespace Nerosoft.Euonia.Repository.Mongo;
 
diff --git a/Source/Euonia.Repository/Abstracts/IRepository.cs b/Source/Euonia.Repository/Abstracts/IRepository.cs
index cbfc201..44e5dd5 100644
--- a/Source/Euonia.Repository/Abstracts/IRepository.cs
+++ b/Source/Euonia.Repository/Abstracts/IRepository.cs
@@ -1,5 +1,4 @@
 using System.Linq.Expressions;
-using Nerosoft.Euonia.Collections;
 using Nerosoft.Euonia.Domain;
 using Nerosoft.Euonia.Linq;
 
diff --git a/Source/Euonia.Repository/Core/Repository.cs b/Source/Euonia.Repository/Core/Repository.cs
index 0506f0a..01470e5 100644
--- a/Source/Euonia.Repository/Core/Repository.cs
+++ b/Source/Euonia.Repository/Core/Repository.cs
@@ -1,7 +1,5 @@
 using System.Linq.Expressions;
-using Nerosoft.Euonia.Collections;
 using Nerosoft.Euonia.Domain;
-using Nerosoft.Euonia.Linq;
 
 namespace Nerosoft.Euonia.Repository;
 
diff --git a/Source/common.props b/Source/common.props
index 4aa445f..f6056a8 100644
--- a/Source/common.props
+++ b/Source/common.props
@@ -2,7 +2,7 @@
     <Import Project="..\project.props" />
     
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
         <RootNamespace>Nerosoft.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
         <Description>Euonia development framework and toolkit library for .NET application/service. Powered by Nerosoft.</Description>
         <PackageProjectUrl>https://github.com/NerosoftDev/Euonia/</PackageProjectUrl>
diff --git a/Tests/common.props b/Tests/common.props
index e97cab6..a57ee7a 100644
--- a/Tests/common.props
+++ b/Tests/common.props
@@ -2,7 +2,7 @@
     <Import Project="..\project.props" />
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
 		<RootNamespace>Nerosoft.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
 		<IsPackable>false</IsPackable>
     </PropertyGroup>
diff --git a/project.props b/project.props
index a3d5392..2036657 100644
--- a/project.props
+++ b/project.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <Version>8.1.21</Version>
+        <Version>8.1.22</Version>
         <Authors>damon</Authors>
         <Company>Nerosoft Ltd.</Company>
         <Product>Euonia</Product>