# Conflicts: # src/DotNetCore.CAP/Abstractions/CapPublisherBase.csmaster
@@ -4,7 +4,7 @@ environment: | |||||
BUILDING_ON_PLATFORM: win | BUILDING_ON_PLATFORM: win | ||||
BuildEnvironment: appveyor | BuildEnvironment: appveyor | ||||
Cap_SqlServer_ConnectionStringTemplate: Server=(local)\SQL2014;Database={0};User ID=sa;Password=Password12! | Cap_SqlServer_ConnectionStringTemplate: Server=(local)\SQL2014;Database={0};User ID=sa;Password=Password12! | ||||
Cap_MySql_ConnectionStringTemplate: Server=localhost;Database={0};Uid=root;Pwd=Password12!;Allow User Variables=True | |||||
Cap_MySql_ConnectionStringTemplate: Server=localhost;Database={0};Uid=root;Pwd=Password12!;Allow User Variables=True;SslMode=none | |||||
Cap_PostgreSql_ConnectionStringTemplate: Server=localhost;Database={0};UserId=postgres;Password=Password12! | Cap_PostgreSql_ConnectionStringTemplate: Server=localhost;Database={0};UserId=postgres;Password=Password12! | ||||
services: | services: | ||||
- mssql2014 | - mssql2014 | ||||
@@ -9,7 +9,6 @@ | |||||
<ItemGroup> | <ItemGroup> | ||||
<PackageReference Include="Microsoft.AspNetCore.App" /> | <PackageReference Include="Microsoft.AspNetCore.App" /> | ||||
<PackageReference Include="MySqlConnector" Version="0.40.4" /> | |||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
<ProjectReference Include="..\..\src\DotNetCore.CAP.Kafka\DotNetCore.CAP.Kafka.csproj" /> | <ProjectReference Include="..\..\src\DotNetCore.CAP.Kafka\DotNetCore.CAP.Kafka.csproj" /> | ||||
@@ -1,13 +1,8 @@ | |||||
<Project Sdk="Microsoft.NET.Sdk.Web"> | |||||
<Project Sdk="Microsoft.NET.Sdk.Web"> | |||||
<PropertyGroup> | <PropertyGroup> | ||||
<TargetFramework>netcoreapp2.1</TargetFramework> | <TargetFramework>netcoreapp2.1</TargetFramework> | ||||
</PropertyGroup> | </PropertyGroup> | ||||
<ItemGroup> | |||||
<Folder Include="wwwroot\" /> | |||||
</ItemGroup> | |||||
<ItemGroup> | <ItemGroup> | ||||
<PackageReference Include="Microsoft.AspNetCore.App" /> | <PackageReference Include="Microsoft.AspNetCore.App" /> | ||||
</ItemGroup> | </ItemGroup> | ||||
@@ -6,7 +6,7 @@ | |||||
<ItemGroup> | <ItemGroup> | ||||
<PackageReference Include="Microsoft.AspNetCore.App" /> | <PackageReference Include="Microsoft.AspNetCore.App" /> | ||||
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.0-rc1-final" /> | |||||
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.0" /> | |||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
<ProjectReference Include="..\..\src\DotNetCore.CAP.MySql\DotNetCore.CAP.MySql.csproj" /> | <ProjectReference Include="..\..\src\DotNetCore.CAP.MySql\DotNetCore.CAP.MySql.csproj" /> | ||||
@@ -13,7 +13,7 @@ | |||||
</PropertyGroup> | </PropertyGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
<PackageReference Include="Confluent.Kafka" Version="0.11.4" /> | |||||
<PackageReference Include="Confluent.Kafka" Version="0.11.5" /> | |||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
@@ -15,7 +15,7 @@ | |||||
<PackageReference Include="Dapper" Version="1.50.5" /> | <PackageReference Include="Dapper" Version="1.50.5" /> | ||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.0" /> | <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.0" /> | ||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.1.0" /> | <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.1.0" /> | ||||
<PackageReference Include="MySqlConnector" Version="0.40.4" /> | |||||
<PackageReference Include="MySqlConnector" Version="0.43.0" /> | |||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
@@ -15,7 +15,7 @@ | |||||
<PackageReference Include="Dapper" Version="1.50.5" /> | <PackageReference Include="Dapper" Version="1.50.5" /> | ||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.0" /> | <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.0" /> | ||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.1.0" /> | <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.1.0" /> | ||||
<PackageReference Include="Npgsql" Version="4.0.0" /> | |||||
<PackageReference Include="Npgsql" Version="4.0.2" /> | |||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
@@ -12,7 +12,7 @@ | |||||
</PropertyGroup> | </PropertyGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
<PackageReference Include="RabbitMQ.Client" Version="5.0.1" /> | |||||
<PackageReference Include="RabbitMQ.Client" Version="5.1.0" /> | |||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
@@ -31,7 +31,7 @@ | |||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
<PackageReference Include="Consul" Version="0.7.2.4" /> | |||||
<PackageReference Include="Consul" Version="0.7.2.6" /> | |||||
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.1.0" /> | <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.1.0" /> | ||||
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.0" /> | <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.0" /> | ||||
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.0" /> | <PackageReference Include="Microsoft.Extensions.Options" Version="2.1.0" /> | ||||
@@ -6,10 +6,10 @@ | |||||
</PropertyGroup> | </PropertyGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" /> | |||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" /> | |||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" /> | |||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0" /> | |||||
<PackageReference Include="FluentAssertions" Version="5.4.1" /> | <PackageReference Include="FluentAssertions" Version="5.4.1" /> | ||||
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" /> | |||||
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0" /> | |||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" /> | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" /> | ||||
<PackageReference Include="xunit" Version="2.3.1" /> | <PackageReference Include="xunit" Version="2.3.1" /> | ||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" /> | <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" /> | ||||
@@ -12,7 +12,7 @@ namespace DotNetCore.CAP.MySql.Test | |||||
private const string DefaultDatabaseName = @"DotNetCore.CAP.MySql.Test"; | private const string DefaultDatabaseName = @"DotNetCore.CAP.MySql.Test"; | ||||
private const string DefaultConnectionStringTemplate = | private const string DefaultConnectionStringTemplate = | ||||
@"Server=localhost;Database={0};Uid=root;Pwd=123123;Allow User Variables=True;"; | |||||
@"Server=localhost;Database={0};Uid=root;Pwd=123123;Allow User Variables=True;SslMode=none;"; | |||||
public static string GetDatabaseName() | public static string GetDatabaseName() | ||||
{ | { | ||||
@@ -13,12 +13,11 @@ | |||||
<ItemGroup> | <ItemGroup> | ||||
<PackageReference Include="Dapper" Version="1.50.5" /> | <PackageReference Include="Dapper" Version="1.50.5" /> | ||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" /> | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" /> | ||||
<PackageReference Include="MySqlConnector" Version="0.40.4" /> | |||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" /> | <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" /> | ||||
<PackageReference Include="xunit" Version="2.3.1" /> | <PackageReference Include="xunit" Version="2.3.1" /> | ||||
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.0" /> | <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.0" /> | ||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" /> | <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" /> | ||||
<PackageReference Include="Moq" Version="4.8.2" /> | |||||
<PackageReference Include="Moq" Version="4.9.0" /> | |||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0" /> | <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0" /> | ||||
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.0" /> | <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.0" /> | ||||
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.0" /> | <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.0" /> | ||||
@@ -8,7 +8,7 @@ | |||||
<ItemGroup> | <ItemGroup> | ||||
<PackageReference Include="Dapper" Version="1.50.5" /> | <PackageReference Include="Dapper" Version="1.50.5" /> | ||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" /> | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" /> | ||||
<PackageReference Include="Npgsql" Version="4.0.0" /> | |||||
<PackageReference Include="Npgsql" Version="4.0.2" /> | |||||
<PackageReference Include="xunit" Version="2.3.1" /> | <PackageReference Include="xunit" Version="2.3.1" /> | ||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" /> | <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" /> | ||||
</ItemGroup> | </ItemGroup> | ||||
@@ -18,7 +18,7 @@ | |||||
<PackageReference Include="xunit" Version="2.3.1" /> | <PackageReference Include="xunit" Version="2.3.1" /> | ||||
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.0" /> | <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.0" /> | ||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" /> | <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" /> | ||||
<PackageReference Include="Moq" Version="4.8.2" /> | |||||
<PackageReference Include="Moq" Version="4.9.0" /> | |||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0" /> | <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0" /> | ||||
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.0" /> | <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.0" /> | ||||
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.0" /> | <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.0" /> | ||||
@@ -12,7 +12,7 @@ | |||||
<PackageReference Include="xunit" Version="2.3.1" /> | <PackageReference Include="xunit" Version="2.3.1" /> | ||||
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.0" /> | <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.0" /> | ||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" /> | <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" /> | ||||
<PackageReference Include="Moq" Version="4.8.2" /> | |||||
<PackageReference Include="Moq" Version="4.9.0" /> | |||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0" /> | <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0" /> | ||||
</ItemGroup> | </ItemGroup> | ||||