From 1636df4a5cb1c73bac27b49bf837361b508d22ef Mon Sep 17 00:00:00 2001
From: jeremydmiller <jeremydmiller@yahoo.com>
Date: Thu, 2 Apr 2020 13:44:31 -0500
Subject: [PATCH] v1.1 release
---
.appveyor.yml | 15 ++---------
rakefile.rb | 8 +++---
.../Jasper.AzureServiceBus.csproj | 6 ++++-
.../Jasper.JsonCommands.csproj | 5 ++++
.../Jasper.Persistence.Database.csproj | 6 +++++
...per.Persistence.EntityFrameworkCore.csproj | 25 +++++++++++++++++++
.../Jasper.Persistence.Marten.csproj | 6 +++++
.../Jasper.Persistence.Postgresql.csproj | 4 +--
.../Jasper.Persistence.SqlServer.csproj | 6 +++++
src/Jasper.RabbitMQ/Jasper.RabbitMQ.csproj | 7 +++++-
.../Jasper.TestSupport.Storyteller.csproj | 5 ++++
src/Jasper/Jasper.csproj | 9 +++++--
src/Jasper/Runtime/Handlers/HandlerGraph.cs | 4 +++
src/Samples/ExceptionHandling.cs | 2 +-
14 files changed, 84 insertions(+), 24 deletions(-)
diff --git a/.appveyor.yml b/.appveyor.yml
index 2b717bb44..aa3140db4 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,4 +1,4 @@
-version: 1.0.1.{build}
+version: 1.1.0.{build}
image: Visual Studio 2017
@@ -25,21 +25,10 @@ install:
- bundle install
- dotnet --version
-dotnet_csproj:
- patch: true
- file: '**\*.csproj'
- version: '1.0.1'
- package_version: '1.0.1'
- assembly_version: '1.0.1'
- file_version: '{version}'
- informational_version: '{version}'
-
-
-
build_script:
- cmd: >-
- rake ci version=1.0.1
+ rake ci version=1.1.0
test: off
deploy:
diff --git a/rakefile.rb b/rakefile.rb
index 0ac6cfc36..882781856 100644
--- a/rakefile.rb
+++ b/rakefile.rb
@@ -2,7 +2,7 @@
APIKEY = ENV['api_key'].nil? ? '' : ENV['api_key']
-BUILD_VERSION = ENV['version'].nil? ? '1.0.0' : ENV['version']
+BUILD_VERSION = ENV['version'].nil? ? '1.1.0' : ENV['version']
puts "Build version is #{BUILD_VERSION}"
@@ -18,11 +18,11 @@
CI = ENV["CI"].nil? ? false : true
-task :ci => [:commands, :compile, :pack, :appVeyorPush]
+task :ci => [:version, :commands, :compile, :pack, :appVeyorPush]
#task :ci => [:default, :commands, :pack, :appVeyorPush]
-task :default => [:test, :integrationtests, :commands]
+task :default => [:version, :test, :integrationtests, :commands]
task :full => [:default, :storyteller]
@@ -51,7 +51,7 @@
options = {
:description => '',
:product_name => 'JasperFx Applications',
- :copyright => 'Copyright 2019 Jeremy D. Miller, et al. All rights reserved.',
+ :copyright => 'Copyright 2020 Jeremy D. Miller, et al. All rights reserved.',
:trademark => commit,
:version => asm_version,
:file_version => build_number,
diff --git a/src/Jasper.AzureServiceBus/Jasper.AzureServiceBus.csproj b/src/Jasper.AzureServiceBus/Jasper.AzureServiceBus.csproj
index c375298e4..68d27875d 100644
--- a/src/Jasper.AzureServiceBus/Jasper.AzureServiceBus.csproj
+++ b/src/Jasper.AzureServiceBus/Jasper.AzureServiceBus.csproj
@@ -21,5 +21,9 @@
<ProjectReference Include="..\Jasper\Jasper.csproj" />
<PackageReference Include="Microsoft.Azure.ServiceBus" Version="3.2.1" />
</ItemGroup>
-
+ <ItemGroup>
+ <Compile Include="..\CommonAssemblyInfo.cs">
+ <Link>CommonAssemblyInfo.cs</Link>
+ </Compile>
+ </ItemGroup>
</Project>
diff --git a/src/Jasper.JsonCommands/Jasper.JsonCommands.csproj b/src/Jasper.JsonCommands/Jasper.JsonCommands.csproj
index a2dce0b44..fd59bbfc1 100644
--- a/src/Jasper.JsonCommands/Jasper.JsonCommands.csproj
+++ b/src/Jasper.JsonCommands/Jasper.JsonCommands.csproj
@@ -22,4 +22,9 @@
<PackageReference Include="NJsonSchema" Version="10.0.27" />
<PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="10.0.27" />
</ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\CommonAssemblyInfo.cs">
+ <Link>CommonAssemblyInfo.cs</Link>
+ </Compile>
+ </ItemGroup>
</Project>
diff --git a/src/Jasper.Persistence.Database/Jasper.Persistence.Database.csproj b/src/Jasper.Persistence.Database/Jasper.Persistence.Database.csproj
index 3366d0d0f..cd092374a 100644
--- a/src/Jasper.Persistence.Database/Jasper.Persistence.Database.csproj
+++ b/src/Jasper.Persistence.Database/Jasper.Persistence.Database.csproj
@@ -25,4 +25,10 @@
<PackageReference Include="System.Data.Common" Version="4.3.0" />
</ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\CommonAssemblyInfo.cs">
+ <Link>CommonAssemblyInfo.cs</Link>
+ </Compile>
+ </ItemGroup>
+
</Project>
diff --git a/src/Jasper.Persistence.EntityFrameworkCore/Jasper.Persistence.EntityFrameworkCore.csproj b/src/Jasper.Persistence.EntityFrameworkCore/Jasper.Persistence.EntityFrameworkCore.csproj
index 0dcb59ee8..489f2434b 100644
--- a/src/Jasper.Persistence.EntityFrameworkCore/Jasper.Persistence.EntityFrameworkCore.csproj
+++ b/src/Jasper.Persistence.EntityFrameworkCore/Jasper.Persistence.EntityFrameworkCore.csproj
@@ -2,6 +2,21 @@
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
+
+ <Description>EF Core-backed Persistence for JasperFx Applications</Description>
+ <Authors>Jeremy D. Miller, Mark Warpool</Authors>
+ <TargetFramework>netstandard2.1</TargetFramework>
+ <DebugType>portable</DebugType>
+ <AssemblyName>Jasper.Persistence.EntityFrameworkCore</AssemblyName>
+ <PackageId>Jasper.Persistence.EntityFrameworkCore</PackageId>
+ <PackageIconUrl>https://avatars2.githubusercontent.com/u/10048186?v=3&s=200</PackageIconUrl>
+ <PackageProjectUrl>http://jasperfx.github.io</PackageProjectUrl>
+ <PackageLicenseUrl>https://github.com/JasperFX/jasper/blob/master/LICENSE.txt</PackageLicenseUrl>
+ <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+ <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
+ <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+ <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+ <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
</PropertyGroup>
<ItemGroup>
@@ -14,4 +29,14 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.0.0" />
</ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\CommonAssemblyInfo.cs">
+ <Link>CommonAssemblyInfo.cs</Link>
+ </Compile>
+ </ItemGroup>
+
+ <ItemGroup>
+ <Folder Include="obj\Debug\netstandard2.1" />
+ </ItemGroup>
+
</Project>
diff --git a/src/Jasper.Persistence.Marten/Jasper.Persistence.Marten.csproj b/src/Jasper.Persistence.Marten/Jasper.Persistence.Marten.csproj
index 5511636c7..92bcffbc6 100644
--- a/src/Jasper.Persistence.Marten/Jasper.Persistence.Marten.csproj
+++ b/src/Jasper.Persistence.Marten/Jasper.Persistence.Marten.csproj
@@ -22,4 +22,10 @@
<ProjectReference Include="..\Jasper.Persistence.Postgresql\Jasper.Persistence.Postgresql.csproj" />
<ProjectReference Include="..\Jasper\Jasper.csproj" />
</ItemGroup>
+
+ <ItemGroup>
+ <Compile Include="..\CommonAssemblyInfo.cs">
+ <Link>CommonAssemblyInfo.cs</Link>
+ </Compile>
+ </ItemGroup>
</Project>
diff --git a/src/Jasper.Persistence.Postgresql/Jasper.Persistence.Postgresql.csproj b/src/Jasper.Persistence.Postgresql/Jasper.Persistence.Postgresql.csproj
index bb9ddf926..0037d6fae 100644
--- a/src/Jasper.Persistence.Postgresql/Jasper.Persistence.Postgresql.csproj
+++ b/src/Jasper.Persistence.Postgresql/Jasper.Persistence.Postgresql.csproj
@@ -5,8 +5,8 @@
<Authors>Jeremy D. Miller</Authors>
<TargetFramework>netstandard2.1</TargetFramework>
<DebugType>portable</DebugType>
- <AssemblyName>Jasper.Postgresql</AssemblyName>
- <PackageId>Jasper.Postgresql</PackageId>
+ <AssemblyName>Jasper.Persistence.Postgresql</AssemblyName>
+ <PackageId>Jasper.Persistence.Postgresql</PackageId>
<PackageIconUrl>https://avatars2.githubusercontent.com/u/10048186?v=3&s=200</PackageIconUrl>
<PackageProjectUrl>http://jasperfx.github.io</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/JasperFX/jasper/blob/master/LICENSE.txt</PackageLicenseUrl>
diff --git a/src/Jasper.Persistence.SqlServer/Jasper.Persistence.SqlServer.csproj b/src/Jasper.Persistence.SqlServer/Jasper.Persistence.SqlServer.csproj
index a66a4b5e4..5e2903265 100644
--- a/src/Jasper.Persistence.SqlServer/Jasper.Persistence.SqlServer.csproj
+++ b/src/Jasper.Persistence.SqlServer/Jasper.Persistence.SqlServer.csproj
@@ -23,4 +23,10 @@
<ProjectReference Include="..\Jasper\Jasper.csproj" />
<EmbeddedResource Include="Schema/*.sql" />
</ItemGroup>
+
+ <ItemGroup>
+ <Compile Include="..\CommonAssemblyInfo.cs">
+ <Link>CommonAssemblyInfo.cs</Link>
+ </Compile>
+ </ItemGroup>
</Project>
diff --git a/src/Jasper.RabbitMQ/Jasper.RabbitMQ.csproj b/src/Jasper.RabbitMQ/Jasper.RabbitMQ.csproj
index 55336fb63..9de054f20 100644
--- a/src/Jasper.RabbitMQ/Jasper.RabbitMQ.csproj
+++ b/src/Jasper.RabbitMQ/Jasper.RabbitMQ.csproj
@@ -6,7 +6,7 @@
<DebugType>portable</DebugType>
<AssemblyName>Jasper.RabbitMQ</AssemblyName>
<PackageId>Jasper.RabbitMQ</PackageId>
-
+
<PackageIconUrl>https://avatars2.githubusercontent.com/u/10048186?v=3&s=200</PackageIconUrl>
<PackageProjectUrl>http://jasperfx.github.io</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/JasperFX/jasper/blob/master/LICENSE.txt</PackageLicenseUrl>
@@ -22,4 +22,9 @@
<ItemGroup>
<PackageReference Include="RabbitMQ.Client" Version="5.1.0" />
</ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\CommonAssemblyInfo.cs">
+ <Link>CommonAssemblyInfo.cs</Link>
+ </Compile>
+ </ItemGroup>
</Project>
diff --git a/src/Jasper.TestSupport.Storyteller/Jasper.TestSupport.Storyteller.csproj b/src/Jasper.TestSupport.Storyteller/Jasper.TestSupport.Storyteller.csproj
index c9c1bf35c..2c5a00431 100644
--- a/src/Jasper.TestSupport.Storyteller/Jasper.TestSupport.Storyteller.csproj
+++ b/src/Jasper.TestSupport.Storyteller/Jasper.TestSupport.Storyteller.csproj
@@ -21,4 +21,9 @@
<ItemGroup>
<ProjectReference Include="..\Jasper\Jasper.csproj" />
</ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\CommonAssemblyInfo.cs">
+ <Link>CommonAssemblyInfo.cs</Link>
+ </Compile>
+ </ItemGroup>
</Project>
diff --git a/src/Jasper/Jasper.csproj b/src/Jasper/Jasper.csproj
index 519b67b41..b6295f4aa 100644
--- a/src/Jasper/Jasper.csproj
+++ b/src/Jasper/Jasper.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <Description>Alternative HTTP service and axynchronous messaging framework</Description>
- <Authors>Jeremy D. Miller, Mike Schenk, Mark Wuhrich</Authors>
+ <Description>In-memory command bus and asynchronous messaging framework</Description>
+ <Authors>Jeremy D. Miller, Mark Warpool</Authors>
<TargetFramework>netstandard2.1</TargetFramework>
<DebugType>portable</DebugType>
<AssemblyName>Jasper</AssemblyName>
@@ -37,4 +37,9 @@
<PackageReference Include="System.ComponentModel" Version="4.3.0" />
<PackageReference Include="Oakton.AspNetCore" Version="[2.1.3, 3.0.0)" />
</ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\CommonAssemblyInfo.cs">
+ <Link>CommonAssemblyInfo.cs</Link>
+ </Compile>
+ </ItemGroup>
</Project>
diff --git a/src/Jasper/Runtime/Handlers/HandlerGraph.cs b/src/Jasper/Runtime/Handlers/HandlerGraph.cs
index 21125c796..aac6bfee7 100644
--- a/src/Jasper/Runtime/Handlers/HandlerGraph.cs
+++ b/src/Jasper/Runtime/Handlers/HandlerGraph.cs
@@ -101,8 +101,11 @@ public MessageHandler HandlerFor(Type messageType)
if (_chains.TryFind(messageType, out var chain))
{
if (chain.Handler != null)
+ {
handler = chain.Handler;
+ }
else
+ {
lock (chain)
{
if (chain.Handler == null)
@@ -120,6 +123,7 @@ public MessageHandler HandlerFor(Type messageType)
handler = chain.Handler;
}
}
+ }
_handlers = _handlers.AddOrUpdate(messageType, handler);
diff --git a/src/Samples/ExceptionHandling.cs b/src/Samples/ExceptionHandling.cs
index fb5c187d7..af8c2caf5 100644
--- a/src/Samples/ExceptionHandling.cs
+++ b/src/Samples/ExceptionHandling.cs
@@ -56,7 +56,7 @@ public AppWithScriptedErrorHandling()
// On the 3rd failure, retry the message again after a configurable
// cool-off period. This schedules the message
x.RetryLater(15.Seconds());
-
+
// On the 4th failure, move the message to the dead letter queue
x.MoveToErrorQueue();