diff --git a/Cap.sln b/Cap.sln index 590b1b0..ae04418 100644 --- a/Cap.sln +++ b/Cap.sln @@ -34,6 +34,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cap.Consistency.Kafka", "sr EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cap.Consistency.RabbitMQ", "src\Cap.Consistency.RabbitMQ\Cap.Consistency.RabbitMQ.csproj", "{9961B80E-0718-4280-B2A0-271B003DE26B}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{10C0818D-9160-4B80-BB86-DDE925B64D43}" + ProjectSection(SolutionItems) = preProject + build.cake = build.cake + build.ps1 = build.ps1 + build.sh = build.sh + build\common.props = build\common.props + build\index.cake = build\index.cake + build\util.cake = build\util.cake + build\version.cake = build\version.cake + build\version.props = build\version.props + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/appveyor.yml b/appveyor.yml index 72b4040..34b1d71 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,20 +3,20 @@ os: Visual Studio 2015 environment: BUILDING_ON_PLATFORM: win BuildEnvironment: appveyor - Jobs_SqlServer_ConnectionStringTemplate: Server=.\SQL2012SP1;Database={0};User ID=sa;Password=Password12! +# Jobs_SqlServer_ConnectionStringTemplate: Server=.\SQL2012SP1;Database={0};User ID=sa;Password=Password12! services: - mssql2012sp1 build_script: -- ps: ./ConfigureMSDTC.ps1 +#- ps: ./ConfigureMSDTC.ps1 - ps: ./build.ps1 test: off artifacts: - path: artifacts/packages/*.nupkg -deploy: - provider: NuGet - on: - appveyor_repo_tag: true - api_key: - secure: PWCeOQ12fgAhPiBjgkBAqHbvaPQArarsO2sI+8KCeXjBjE+AHaMIMW8b7efmDzQ6 - skip_symbols: true - artifact: /artifacts\/packages\/.+\.nupkg/ +#deploy: +# provider: NuGet +# on: +# appveyor_repo_tag: true +# api_key: +# secure: PWCeOQ12fgAhPiBjgkBAqHbvaPQArarsO2sI+8KCeXjBjE+AHaMIMW8b7efmDzQ6 +# skip_symbols: true +# artifact: /artifacts\/packages\/.+\.nupkg/ diff --git a/build/version.props b/build/version.props index 15a038f..3e9fc0c 100644 --- a/build/version.props +++ b/build/version.props @@ -1,8 +1,8 @@ 0 - 7 - 2 + 1 + 0 $(VersionMajor).$(VersionMinor).$(VersionPatch) diff --git a/src/Cap.Consistency/Consumer/ConsumerHandler.cs b/src/Cap.Consistency/Consumer/ConsumerHandler.cs index 5f2f650..9a981ed 100644 --- a/src/Cap.Consistency/Consumer/ConsumerHandler.cs +++ b/src/Cap.Consistency/Consumer/ConsumerHandler.cs @@ -84,7 +84,7 @@ namespace Cap.Consistency.Consumer _logger.LogInformation("message receieved message topic name: " + consistencyMessage.Id); - _messageManager.CreateAsync(consistencyMessage); + _messageManager.CreateAsync(consistencyMessage).Wait(); try { var executeDescriptor = _selector.GetTopicExector(message.MessageKey); @@ -95,7 +95,7 @@ namespace Cap.Consistency.Consumer invoker.InvokeAsync(); - _messageManager.UpdateAsync(consistencyMessage); + _messageManager.UpdateAsync(consistencyMessage).Wait(); } catch (Exception ex) { diff --git a/src/Cap.Consistency/Store/ConsistencyMessageManager.cs b/src/Cap.Consistency/Store/ConsistencyMessageManager.cs index 4092201..e6d8bb7 100644 --- a/src/Cap.Consistency/Store/ConsistencyMessageManager.cs +++ b/src/Cap.Consistency/Store/ConsistencyMessageManager.cs @@ -65,9 +65,6 @@ namespace Cap.Consistency.Store ThrowIfDisposed(); //todo: validation message fileds is correct - - - return Store.CreateAsync(message, CancellationToken); }