diff --git a/build/version.props b/build/version.props index c6f1c59..a113332 100644 --- a/build/version.props +++ b/build/version.props @@ -1,7 +1,7 @@ - 5 - 2 + 6 + 0 0 $(VersionMajor).$(VersionMinor).$(VersionPatch) diff --git a/samples/Sample.AmazonSQS.InMemory/Sample.AmazonSQS.InMemory.csproj b/samples/Sample.AmazonSQS.InMemory/Sample.AmazonSQS.InMemory.csproj index 7acd5c7..88f9828 100644 --- a/samples/Sample.AmazonSQS.InMemory/Sample.AmazonSQS.InMemory.csproj +++ b/samples/Sample.AmazonSQS.InMemory/Sample.AmazonSQS.InMemory.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 diff --git a/samples/Sample.ConsoleApp/Sample.ConsoleApp.csproj b/samples/Sample.ConsoleApp/Sample.ConsoleApp.csproj index cd8736f..b465370 100644 --- a/samples/Sample.ConsoleApp/Sample.ConsoleApp.csproj +++ b/samples/Sample.ConsoleApp/Sample.ConsoleApp.csproj @@ -1,12 +1,12 @@  - net5.0 + net6.0 Exe - + diff --git a/samples/Sample.Dashboard.Auth/Sample.Dashboard.Auth.csproj b/samples/Sample.Dashboard.Auth/Sample.Dashboard.Auth.csproj index 363fb40..1ce7e4e 100644 --- a/samples/Sample.Dashboard.Auth/Sample.Dashboard.Auth.csproj +++ b/samples/Sample.Dashboard.Auth/Sample.Dashboard.Auth.csproj @@ -1,18 +1,17 @@  - net5.0 + net6.0 - - + diff --git a/samples/Sample.Kafka.PostgreSql/Sample.Kafka.PostgreSql.csproj b/samples/Sample.Kafka.PostgreSql/Sample.Kafka.PostgreSql.csproj index 89f3ff3..e362676 100644 --- a/samples/Sample.Kafka.PostgreSql/Sample.Kafka.PostgreSql.csproj +++ b/samples/Sample.Kafka.PostgreSql/Sample.Kafka.PostgreSql.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 NU1701 NU1701 diff --git a/samples/Sample.Pulsar.InMemory/Sample.Pulsar.InMemory.csproj b/samples/Sample.Pulsar.InMemory/Sample.Pulsar.InMemory.csproj index b330ff5..137029e 100644 --- a/samples/Sample.Pulsar.InMemory/Sample.Pulsar.InMemory.csproj +++ b/samples/Sample.Pulsar.InMemory/Sample.Pulsar.InMemory.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 diff --git a/samples/Sample.RabbitMQ.MongoDB/Sample.RabbitMQ.MongoDB.csproj b/samples/Sample.RabbitMQ.MongoDB/Sample.RabbitMQ.MongoDB.csproj index 3b31902..e2e7722 100644 --- a/samples/Sample.RabbitMQ.MongoDB/Sample.RabbitMQ.MongoDB.csproj +++ b/samples/Sample.RabbitMQ.MongoDB/Sample.RabbitMQ.MongoDB.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 diff --git a/samples/Sample.RabbitMQ.MySql/AppDbContext.cs b/samples/Sample.RabbitMQ.MySql/AppDbContext.cs index 9d01707..785750e 100644 --- a/samples/Sample.RabbitMQ.MySql/AppDbContext.cs +++ b/samples/Sample.RabbitMQ.MySql/AppDbContext.cs @@ -13,17 +13,8 @@ namespace Sample.RabbitMQ.MySql return $"Name:{Name}, Id:{Id}"; } } - public class Person2 - { - public int Id { get; set; } - public string Name { get; set; } - public override string ToString() - { - return $"Name:{Name}, Id:{Id}"; - } - } public class AppDbContext : DbContext { public const string ConnectionString = ""; @@ -32,7 +23,7 @@ namespace Sample.RabbitMQ.MySql protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { - optionsBuilder.UseMySql(ConnectionString, ServerVersion.FromString("mysql")); + optionsBuilder.UseMySql(ConnectionString, new MariaDbServerVersion(ServerVersion.AutoDetect(ConnectionString))); } } } diff --git a/samples/Sample.RabbitMQ.MySql/Sample.RabbitMQ.MySql.csproj b/samples/Sample.RabbitMQ.MySql/Sample.RabbitMQ.MySql.csproj index 7326bf6..5e55e38 100644 --- a/samples/Sample.RabbitMQ.MySql/Sample.RabbitMQ.MySql.csproj +++ b/samples/Sample.RabbitMQ.MySql/Sample.RabbitMQ.MySql.csproj @@ -1,12 +1,16 @@  - net5.0 + net6.0 - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/samples/Sample.RabbitMQ.SqlServer.DispatcherPerGroup/Sample.RabbitMQ.SqlServer.DispatcherPerGroup.csproj b/samples/Sample.RabbitMQ.SqlServer.DispatcherPerGroup/Sample.RabbitMQ.SqlServer.DispatcherPerGroup.csproj index 759ad6d..7c2c25f 100644 --- a/samples/Sample.RabbitMQ.SqlServer.DispatcherPerGroup/Sample.RabbitMQ.SqlServer.DispatcherPerGroup.csproj +++ b/samples/Sample.RabbitMQ.SqlServer.DispatcherPerGroup/Sample.RabbitMQ.SqlServer.DispatcherPerGroup.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 latest OutOfProcess diff --git a/samples/Sample.RabbitMQ.SqlServer/Sample.RabbitMQ.SqlServer.csproj b/samples/Sample.RabbitMQ.SqlServer/Sample.RabbitMQ.SqlServer.csproj index 64029d5..b453f25 100644 --- a/samples/Sample.RabbitMQ.SqlServer/Sample.RabbitMQ.SqlServer.csproj +++ b/samples/Sample.RabbitMQ.SqlServer/Sample.RabbitMQ.SqlServer.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 diff --git a/samples/Samples.Redis.SqlServer/Samples.Redis.SqlServer.csproj b/samples/Samples.Redis.SqlServer/Samples.Redis.SqlServer.csproj index e8ffe9f..6600b40 100644 --- a/samples/Samples.Redis.SqlServer/Samples.Redis.SqlServer.csproj +++ b/samples/Samples.Redis.SqlServer/Samples.Redis.SqlServer.csproj @@ -1,14 +1,12 @@  - net5.0 + net6.0 - - diff --git a/samples/Samples.Redis.SqlServer/Startup.cs b/samples/Samples.Redis.SqlServer/Startup.cs index adad4ab..317cc0b 100644 --- a/samples/Samples.Redis.SqlServer/Startup.cs +++ b/samples/Samples.Redis.SqlServer/Startup.cs @@ -1,7 +1,6 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.OpenApi.Models; namespace Samples.Redis.SqlServer { @@ -17,13 +16,7 @@ namespace Samples.Redis.SqlServer public void ConfigureServices(IServiceCollection services) { services.AddControllers(); - - services.AddSwaggerGen(c => - { - c.SwaggerDoc("v1", new OpenApiInfo { Title = "Samples.Redis.SqlServer", Version = "v1" }); - }); - - + services.AddCap(options => { options.UseRedis("redis-node-0:6379,password=cap"); @@ -34,9 +27,6 @@ namespace Samples.Redis.SqlServer public void Configure(IApplicationBuilder app) { - app.UseSwagger(); - app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "Samples.Redis.SqlServer v1")); - app.UseRouting(); app.UseEndpoints(endpoints => { diff --git a/src/Directory.Build.props b/src/Directory.Build.props index c5ed51e..ac6678f 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -4,7 +4,7 @@ CAP - 8 + 10 ncc;savorboard https://github.com/dotnetcore/CAP git diff --git a/src/DotNetCore.CAP/Processor/IProcessor.NeedRetry.cs b/src/DotNetCore.CAP/Processor/IProcessor.NeedRetry.cs index cb08a62..0862dd0 100644 --- a/src/DotNetCore.CAP/Processor/IProcessor.NeedRetry.cs +++ b/src/DotNetCore.CAP/Processor/IProcessor.NeedRetry.cs @@ -84,7 +84,7 @@ namespace DotNetCore.CAP.Processor } catch (Exception ex) { - _logger.LogWarning(1, ex, "Get messages of type '{messageType}' failed. Retrying...", typeof(T).Name); + _logger.LogWarning(1, ex, "Get messages from storage failed. Retrying...", typeof(T).Name); return Enumerable.Empty(); } diff --git a/test/DotNetCore.CAP.MultiModuleSubscriberTests/DotNetCore.CAP.MultiModuleSubscriberTests.csproj b/test/DotNetCore.CAP.MultiModuleSubscriberTests/DotNetCore.CAP.MultiModuleSubscriberTests.csproj index f208d30..dbc1517 100644 --- a/test/DotNetCore.CAP.MultiModuleSubscriberTests/DotNetCore.CAP.MultiModuleSubscriberTests.csproj +++ b/test/DotNetCore.CAP.MultiModuleSubscriberTests/DotNetCore.CAP.MultiModuleSubscriberTests.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 diff --git a/test/DotNetCore.CAP.MySql.Test/DotNetCore.CAP.MySql.Test.csproj b/test/DotNetCore.CAP.MySql.Test/DotNetCore.CAP.MySql.Test.csproj index 16a8182..d44b7f6 100644 --- a/test/DotNetCore.CAP.MySql.Test/DotNetCore.CAP.MySql.Test.csproj +++ b/test/DotNetCore.CAP.MySql.Test/DotNetCore.CAP.MySql.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 false diff --git a/test/DotNetCore.CAP.Test/DotNetCore.CAP.Test.csproj b/test/DotNetCore.CAP.Test/DotNetCore.CAP.Test.csproj index 5abdbe1..54fbaf9 100644 --- a/test/DotNetCore.CAP.Test/DotNetCore.CAP.Test.csproj +++ b/test/DotNetCore.CAP.Test/DotNetCore.CAP.Test.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 false @@ -10,9 +10,9 @@ - - - + + +