diff --git a/build/common.props b/build/common.props index aa53f57..80c2d79 100644 --- a/build/common.props +++ b/build/common.props @@ -2,10 +2,6 @@ - - netstandard1.6 - - CAP savorboard;dotnetcore @@ -14,7 +10,7 @@ https://avatars2.githubusercontent.com/u/19404084 https://github.com/dotnetcore/CAP https://github.com/dotnetcore/CAP/blob/master/LICENSE.txt - eventbus;rabbitmq;kafka;cap;transaction; + CAP;EventBus;Distributed Transaction EventBus and eventually consistency in distributed architectures. diff --git a/build/version.props b/build/version.props index 7a220b4..2480b9f 100644 --- a/build/version.props +++ b/build/version.props @@ -2,7 +2,7 @@ 1 1 - 0 + 1 $(VersionMajor).$(VersionMinor).$(VersionPatch) diff --git a/src/DotNetCore.CAP.Kafka/DotNetCore.CAP.Kafka.csproj b/src/DotNetCore.CAP.Kafka/DotNetCore.CAP.Kafka.csproj index 0a8fe64..89bd201 100644 --- a/src/DotNetCore.CAP.Kafka/DotNetCore.CAP.Kafka.csproj +++ b/src/DotNetCore.CAP.Kafka/DotNetCore.CAP.Kafka.csproj @@ -3,14 +3,9 @@ - netstandard1.6 - 1.6.1 + netstandard1.6; DotNetCore.CAP.Kafka - DotNetCore.CAP.Kafka - $(PackageTargetFallback);dnxcore50 - false - false - false + $(PackageTags);Kafka diff --git a/src/DotNetCore.CAP.MySql/CAP.MySqlCapOptionsExtension.cs b/src/DotNetCore.CAP.MySql/CAP.MySqlCapOptionsExtension.cs index 5682e38..aa825a2 100644 --- a/src/DotNetCore.CAP.MySql/CAP.MySqlCapOptionsExtension.cs +++ b/src/DotNetCore.CAP.MySql/CAP.MySqlCapOptionsExtension.cs @@ -36,9 +36,16 @@ namespace DotNetCore.CAP services.AddSingleton(mysqlOptions); } +#if NETSTANDARD1_6 private IServiceProvider TempBuildService(IServiceCollection services) { return services.BuildServiceProvider(); } +#else + private ServiceProvider TempBuildService(IServiceCollection services) + { + return services.BuildServiceProvider(); + } +#endif } } \ No newline at end of file diff --git a/src/DotNetCore.CAP.MySql/DotNetCore.CAP.MySql.csproj b/src/DotNetCore.CAP.MySql/DotNetCore.CAP.MySql.csproj index f9f2c51..d750aaf 100644 --- a/src/DotNetCore.CAP.MySql/DotNetCore.CAP.MySql.csproj +++ b/src/DotNetCore.CAP.MySql/DotNetCore.CAP.MySql.csproj @@ -3,21 +3,20 @@ - netstandard1.6 + netstandard1.6;netstandard2.0; DotNetCore.CAP.MySql - DotNetCore.CAP.MySql - 1.6.1 - $(PackageTargetFallback);dnxcore50 - false - false - false + $(PackageTags);MySQL + + + + TRACE;DEBUG - + diff --git a/src/DotNetCore.CAP.RabbitMQ/DotNetCore.CAP.RabbitMQ.csproj b/src/DotNetCore.CAP.RabbitMQ/DotNetCore.CAP.RabbitMQ.csproj index 3a758b2..52e7844 100644 --- a/src/DotNetCore.CAP.RabbitMQ/DotNetCore.CAP.RabbitMQ.csproj +++ b/src/DotNetCore.CAP.RabbitMQ/DotNetCore.CAP.RabbitMQ.csproj @@ -3,8 +3,9 @@ - netstandard1.6 - 1.6.1 + netstandard1.6; + DotNetCore.CAP.RabbitMQ + $(PackageTags);RabbitMQ diff --git a/src/DotNetCore.CAP.SqlServer/CAP.SqlServerCapOptionsExtension.cs b/src/DotNetCore.CAP.SqlServer/CAP.SqlServerCapOptionsExtension.cs index 2d1878e..f36a4bc 100644 --- a/src/DotNetCore.CAP.SqlServer/CAP.SqlServerCapOptionsExtension.cs +++ b/src/DotNetCore.CAP.SqlServer/CAP.SqlServerCapOptionsExtension.cs @@ -36,9 +36,17 @@ namespace DotNetCore.CAP services.AddSingleton(sqlServerOptions); } +#if NETSTANDARD1_6 private IServiceProvider TempBuildService(IServiceCollection services) { return services.BuildServiceProvider(); } +#else + private ServiceProvider TempBuildService(IServiceCollection services) + { + return services.BuildServiceProvider(); + } +#endif + } } \ No newline at end of file diff --git a/src/DotNetCore.CAP.SqlServer/DotNetCore.CAP.SqlServer.csproj b/src/DotNetCore.CAP.SqlServer/DotNetCore.CAP.SqlServer.csproj index c2b12cb..7592ae4 100644 --- a/src/DotNetCore.CAP.SqlServer/DotNetCore.CAP.SqlServer.csproj +++ b/src/DotNetCore.CAP.SqlServer/DotNetCore.CAP.SqlServer.csproj @@ -3,14 +3,13 @@ - netstandard1.6 + netstandard1.6;netstandard2.0; DotNetCore.CAP.SqlServer - DotNetCore.CAP.SqlServer - 1.6.1 - $(PackageTargetFallback);dnxcore50 - false - false - false + $(PackageTags);SQL Server + + + + TRACE;DEBUG diff --git a/src/DotNetCore.CAP/DotNetCore.CAP.csproj b/src/DotNetCore.CAP/DotNetCore.CAP.csproj index 2bf7ab4..8b9c660 100644 --- a/src/DotNetCore.CAP/DotNetCore.CAP.csproj +++ b/src/DotNetCore.CAP/DotNetCore.CAP.csproj @@ -3,26 +3,28 @@ - DotNetCore.CAP - netstandard1.6 - 1.6.1 - $(PackageTargetFallback);dnxcore50 - - - - False + netstandard1.6;netstandard2.0; + DotNetCore.CAP + $(PackageTags); - - - + + + + + + + + + +