Skip to content

Commit 1790cbf

Browse files
rasmusrasmus
committed
Merge branch 'develop' into bdd
# Conflicts: # Source/EventFlow/Extensions/DisposableExtensions.cs
2 parents 5364830 + 784c072 commit 1790cbf

565 files changed

Lines changed: 5486 additions & 1773 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
*.png filter=lfs diff=lfs merge=lfs -text
2+
*.exe filter=lfs diff=lfs merge=lfs -text

‎.gitignore‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,6 @@ publish/
134134
*.nupkg
135135
# The packages folder can be ignored because of Package Restore
136136
**/packages/*
137-
# except build/, which is used as an MSBuild target.
138-
!**/packages/build/
139-
# If using the old MSBuild-Integrated Package Restore, uncomment this:
140-
#!**/packages/repositories.config
141137

142138
# Windows Azure Build Output
143139
csx/
@@ -192,3 +188,6 @@ FakesAssemblies/
192188
# NCrunch
193189
*.ncrunchsolution
194190
*.ncrunchproject
191+
192+
# Paket
193+
/.paket/paket.exe

‎.paket/paket.bootstrapper.exe‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:f3c6f40cd4b7cf01c6c96915ae210871f98998263dd6bc2faa11840c916b7eae
3+
size 28672

‎.paket/paket.targets‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<!-- Enable the restore command to run before builds -->
5+
<RestorePackages Condition=" '$(RestorePackages)' == '' ">true</RestorePackages>
6+
<!-- Download Paket.exe if it does not already exist -->
7+
<DownloadPaket Condition=" '$(DownloadPaket)' == '' ">true</DownloadPaket>
8+
<PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath>
9+
<PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath>
10+
<MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
11+
<MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
12+
</PropertyGroup>
13+
<PropertyGroup>
14+
<!-- Paket command -->
15+
<PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
16+
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
17+
<PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
18+
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
19+
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)" $(PaketBootStrapperCommandArgs)</PaketBootStrapperCommand>
20+
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 $(PaketBootStrapperExePath) $(PaketBootStrapperCommandArgs)</PaketBootStrapperCommand>
21+
<!-- Commands -->
22+
<PaketReferences Condition="!Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectDirectory)\paket.references</PaketReferences>
23+
<PaketReferences Condition="!Exists('$(PaketReferences)')">$(MSBuildStartupDirectory)\paket.references</PaketReferences>
24+
<PaketReferences Condition="Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectFullPath).paket.references</PaketReferences>
25+
<RestoreCommand>$(PaketCommand) restore --references-files "$(PaketReferences)"</RestoreCommand>
26+
<DownloadPaketCommand>$(PaketBootStrapperCommand)</DownloadPaketCommand>
27+
<!-- We need to ensure packages are restored prior to assembly resolve -->
28+
<BuildDependsOn Condition="$(RestorePackages) == 'true'">RestorePackages; $(BuildDependsOn);</BuildDependsOn>
29+
</PropertyGroup>
30+
<Target Name="CheckPrerequisites">
31+
<!-- Raise an error if we're unable to locate paket.exe -->
32+
<Error Condition="'$(DownloadPaket)' != 'true' AND !Exists('$(PaketExePath)')" Text="Unable to locate '$(PaketExePath)'" />
33+
<MsBuild Targets="DownloadPaket" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadPaket=$(DownloadPaket)" />
34+
</Target>
35+
<Target Name="DownloadPaket">
36+
<Exec Command="$(DownloadPaketCommand)" IgnoreStandardErrorWarningFormat="true" Condition=" '$(DownloadPaket)' == 'true' AND !Exists('$(PaketExePath)')" />
37+
</Target>
38+
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
39+
<Exec Command="$(RestoreCommand)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(PaketRootPath)" Condition="Exists('$(PaketReferences)')" ContinueOnError="true" />
40+
</Target>
41+
</Project>

‎EventFlow.sln‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
44
VisualStudioVersion = 14.0.23107.0
55
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{7387D16E-5CC4-464B-85F3-F409543D09BD}"
7+
ProjectSection(SolutionItems) = preProject
8+
paket.dependencies = paket.dependencies
9+
EndProjectSection
10+
EndProject
611
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventFlow", "Source\EventFlow\EventFlow.csproj", "{11131251-778D-4D2E-BDD1-4844A789BCA9}"
712
EndProject
813
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventFlow.EventStores.MsSql", "Source\EventFlow.EventStores.MsSql\EventFlow.EventStores.MsSql.csproj", "{0C92026E-7E6D-40B9-A4DD-A7041E23AA7D}"

‎LICENSE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2015 Rasmus Mikkelsen
4-
Copyright (c) 2015 eBay Software Foundation
3+
Copyright (c) 2015-2016 Rasmus Mikkelsen
4+
Copyright (c) 2015-2016 eBay Software Foundation
55
https://github.com/rasmus/EventFlow
66

77
Permission is hereby granted, free of charge, to any person obtaining a copy

‎README.md‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# EventFlow
22

3+
This repository uses [`git lfs`](https://git-lfs.github.com/), install it if you
4+
want to build the code.
5+
36
<table border="0" cellpadding="0" cellspacing="0">
47
<tr>
58
<td>
@@ -196,6 +199,27 @@ several areas that you could help out with.
196199
existing applications
197200
* Provide a platform for DDD discussions
198201

202+
### Integration tests
203+
EvenFlow has several tests that verify that its able to use the systems it
204+
integrates with correctly.
205+
206+
* **Elasticsearch:** Set an environment variable named `ELASTICSEARCH_URL` with
207+
the URL for the Elasticsearch instance you would like to use.
208+
* **EventStore:** EventStore is automatically downloaded and run during the
209+
EventStore integration tests from your `TEMP` directory. However, EventStore
210+
requires to be able to
211+
[listen to HTTP requests](http://docs.geteventstore.com/server/3.4.0/).
212+
If you run Visual Studio as administrator or configure it yourself up front.
213+
* **MSSQL:** Microsoft SQL Server is required to be running
214+
* **RabbitMQ:** Set an environment variable named `RABBITMQ_URL` with the URL
215+
for the RabbitMQ instance you would like to use.
216+
217+
There's a Vagrant box with both Elasticsearch and RabbitMQ you can use
218+
[here](https://github.com/rasmus/Vagrant.Boxes).
219+
220+
Alternatively you can skip the NUnit tests marked with the `integration`
221+
category.
222+
199223
## Thanks
200224

201225
* [JetBrains](https://www.jetbrains.com/resharper/): OSS licenses
@@ -206,8 +230,8 @@ several areas that you could help out with.
206230
```
207231
The MIT License (MIT)
208232
209-
Copyright (c) 2015 Rasmus Mikkelsen
210-
Copyright (c) 2015 eBay Software Foundation
233+
Copyright (c) 2015-2016 Rasmus Mikkelsen
234+
Copyright (c) 2015-2016 eBay Software Foundation
211235
https://github.com/rasmus/EventFlow
212236
213237
Permission is hereby granted, free of charge, to any person obtaining a copy

‎RELEASE_NOTES.md‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,32 @@
1-
### New in 0.23 (not released yet)
2-
1+
### New in 0.25 (not released yet)
2+
3+
* _Nothing yet_
4+
5+
### New in 0.24.1563 (released 2016-01-17)
6+
7+
* Breaking: The following NuGet references have been updated
8+
- `EventStore.Client` v3.4.0 (up from v3.0.2)
9+
- `Hangfire.Core` v1.5.3 (up from v1.4.6)
10+
- `RabbitMQ.Client` v3.6.0 (up from v3.5.4)
11+
* New: EventFlow now uses Paket to manage NuGet packages
12+
* Fixed: Incorrect use of `EventStore.Client` that caused it to throw
13+
`WrongExpectedVersionException` when committing aggregates multiple times
14+
* Fixed: Updated NuGet package titles of the following NuGet packages to
15+
contain assembly name to get a better overview when searching on
16+
[nuget.org](http://nuget.org)
17+
- `EventFlow.RabbitMQ`
18+
- `EventFlow.EventStores.EventStore`
19+
* Fixed: Updated internal NuGet reference `dbup` to v3.3.0 (up from v3.2.1)
20+
21+
### New in 0.23.1470 (released 2015-12-05)
22+
23+
* Breaking: EventFlow no longer ignores columns named `Id` in MSSQL read models.
24+
If you were dependent on this, use the `MsSqlReadModelIgnoreColumn` attribute
25+
* Fixed: Instead of using `MethodInfo.Invoke` to call methods on reflected
26+
types, e.g. when a command is published, EventFlow now compiles an expression
27+
tree instead. This has a slight initial overhead, but provides a significant
28+
performance improvement for subsequent calls
29+
* Fixed: Read model stores are only invoked if there's any read model updates
330
* Fixed: EventFlow now correctly throws an `ArgumentException` if EventFlow has
431
been incorrectly configure with known versioned types, e.g. an event
532
is emitted that hasn't been added during EventFlow initialization. EventFlow
@@ -8,7 +35,7 @@
835
be thrown as EventFlow would know which type to use. Please make sure to
936
correctly load all event, command and job types before use
1037
* Fixed: `IReadModelFactory<>.CreateAsync(...)` is now correctly used in
11-
read store mangers
38+
read store mangers
1239
* Fixed: Versioned type naming convention now allows numbers
1340

1441
### New in 0.22.1393 (released 2015-11-19)

0 commit comments

Comments
 (0)