Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Phobos integration #11

Merged
merged 22 commits into from
May 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f4c6c43
Added build configuration support for Phobos
Aaronontheweb May 23, 2019
7191786
added Phobos to PR validation
Aaronontheweb May 23, 2019
44b697b
fixed nuget restore
Aaronontheweb May 23, 2019
64fdfde
Revert "Added build configuration support for Phobos"
Aaronontheweb May 23, 2019
1cece2b
removed Phobos changes from .SLN
Aaronontheweb May 23, 2019
8722949
changing build script
Aaronontheweb May 23, 2019
3f50461
added solution configurations for Phobos
Aaronontheweb May 23, 2019
83fdc99
fixed dotnet publish stage
Aaronontheweb May 23, 2019
78e6337
added Phobos integration
Aaronontheweb May 23, 2019
9e7d1b6
fixed compilation error
Aaronontheweb May 23, 2019
6c7e43f
working on XML POKE strategy
Aaronontheweb May 23, 2019
2dd0589
fixed XPATH
Aaronontheweb May 24, 2019
f515965
fixed issue with build script
Aaronontheweb May 24, 2019
0cf5670
added Phobos configuration to Subscriptions.Tests
Aaronontheweb May 24, 2019
e20f78b
copy build output to correct folder for Dockerfile support
Aaronontheweb May 24, 2019
f9fee52
added Akka.CQRS.Subscriptions.Tests back to the solution file
Aaronontheweb May 24, 2019
a1e584c
fixed outstanding issues with unit tests
Aaronontheweb May 24, 2019
8680d34
got Phobos docker builds to work
Aaronontheweb May 24, 2019
2a51d17
fixed dotnet publish
Aaronontheweb May 24, 2019
e594d02
removed Docker stage from windows build pipeline
Aaronontheweb May 24, 2019
453af80
added docker-compose with tracing and monitoring systems
Aaronontheweb May 24, 2019
9e341ef
completed bug-fixing Phobos integration
Aaronontheweb May 24, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 43 additions & 8 deletions Akka.CQRS.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.CQRS", "src\Akka.CQRS\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.CQRS.Tests", "src\Akka.CQRS.Tests\Akka.CQRS.Tests.csproj", "{0F9B9BC6-9F86-40E8-BA9B-D27BF3AC7970}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.CQRS.Tests.Performance", "src\Akka.CQRS.Tests.Performance\Akka.CQRS.Tests.Performance.csproj", "{CAE7CA7C-0D0C-4FDA-BDE9-BE16A27343EF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{79D71264-186B-4F62-8930-35DD9ECCAF3B}"
ProjectSection(SolutionItems) = preProject
build.cmd = build.cmd
Expand Down Expand Up @@ -49,90 +47,126 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.CQRS.Infrastructure.Te
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.CQRS.Pricing.Subscriptions", "src\Akka.CQRS.Pricing.Subscriptions\Akka.CQRS.Pricing.Subscriptions.csproj", "{2E24DA6E-348E-41FE-8A2B-F379AA6E7F1D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.CQRS.Pricing.Web", "src\Akka.CQRS.Pricing.Web\Akka.CQRS.Pricing.Web.csproj", "{2137ADE9-E36F-4CB9-8384-FB41E3B27FFD}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.CQRS.Pricing.Web", "src\Akka.CQRS.Pricing.Web\Akka.CQRS.Pricing.Web.csproj", "{2137ADE9-E36F-4CB9-8384-FB41E3B27FFD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.CQRS.Subscriptions.Tests", "src\Akka.CQRS.Subscriptions.Tests\Akka.CQRS.Subscriptions.Tests.csproj", "{ACE53C1C-CCFC-4A0E-B924-3CA4435FF986}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Phobos|Any CPU = Phobos|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E945AABA-2779-41E8-9B43-8898FFD64F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E945AABA-2779-41E8-9B43-8898FFD64F22}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E945AABA-2779-41E8-9B43-8898FFD64F22}.Phobos|Any CPU.ActiveCfg = Phobos|Any CPU
{E945AABA-2779-41E8-9B43-8898FFD64F22}.Phobos|Any CPU.Build.0 = Phobos|Any CPU
{E945AABA-2779-41E8-9B43-8898FFD64F22}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E945AABA-2779-41E8-9B43-8898FFD64F22}.Release|Any CPU.Build.0 = Release|Any CPU
{0F9B9BC6-9F86-40E8-BA9B-D27BF3AC7970}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0F9B9BC6-9F86-40E8-BA9B-D27BF3AC7970}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0F9B9BC6-9F86-40E8-BA9B-D27BF3AC7970}.Phobos|Any CPU.ActiveCfg = Phobos|Any CPU
{0F9B9BC6-9F86-40E8-BA9B-D27BF3AC7970}.Phobos|Any CPU.Build.0 = Phobos|Any CPU
{0F9B9BC6-9F86-40E8-BA9B-D27BF3AC7970}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0F9B9BC6-9F86-40E8-BA9B-D27BF3AC7970}.Release|Any CPU.Build.0 = Release|Any CPU
{CAE7CA7C-0D0C-4FDA-BDE9-BE16A27343EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CAE7CA7C-0D0C-4FDA-BDE9-BE16A27343EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CAE7CA7C-0D0C-4FDA-BDE9-BE16A27343EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CAE7CA7C-0D0C-4FDA-BDE9-BE16A27343EF}.Release|Any CPU.Build.0 = Release|Any CPU
{F6F74FCA-8E53-4620-90C7-9A91278A3521}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F6F74FCA-8E53-4620-90C7-9A91278A3521}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F6F74FCA-8E53-4620-90C7-9A91278A3521}.Phobos|Any CPU.ActiveCfg = Phobos|Any CPU
{F6F74FCA-8E53-4620-90C7-9A91278A3521}.Phobos|Any CPU.Build.0 = Phobos|Any CPU
{F6F74FCA-8E53-4620-90C7-9A91278A3521}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F6F74FCA-8E53-4620-90C7-9A91278A3521}.Release|Any CPU.Build.0 = Release|Any CPU
{F1EFDCB9-FD61-4782-A12A-108C73DB368E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F1EFDCB9-FD61-4782-A12A-108C73DB368E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F1EFDCB9-FD61-4782-A12A-108C73DB368E}.Phobos|Any CPU.ActiveCfg = Phobos|Any CPU
{F1EFDCB9-FD61-4782-A12A-108C73DB368E}.Phobos|Any CPU.Build.0 = Phobos|Any CPU
{F1EFDCB9-FD61-4782-A12A-108C73DB368E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F1EFDCB9-FD61-4782-A12A-108C73DB368E}.Release|Any CPU.Build.0 = Release|Any CPU
{5EB6F2C5-FEF1-402A-AB76-3A9F62B2EFDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5EB6F2C5-FEF1-402A-AB76-3A9F62B2EFDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5EB6F2C5-FEF1-402A-AB76-3A9F62B2EFDE}.Phobos|Any CPU.ActiveCfg = Phobos|Any CPU
{5EB6F2C5-FEF1-402A-AB76-3A9F62B2EFDE}.Phobos|Any CPU.Build.0 = Phobos|Any CPU
{5EB6F2C5-FEF1-402A-AB76-3A9F62B2EFDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5EB6F2C5-FEF1-402A-AB76-3A9F62B2EFDE}.Release|Any CPU.Build.0 = Release|Any CPU
{733BA8FC-C198-4C83-BA57-FE3672CBB307}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{733BA8FC-C198-4C83-BA57-FE3672CBB307}.Debug|Any CPU.Build.0 = Debug|Any CPU
{733BA8FC-C198-4C83-BA57-FE3672CBB307}.Phobos|Any CPU.ActiveCfg = Phobos|Any CPU
{733BA8FC-C198-4C83-BA57-FE3672CBB307}.Phobos|Any CPU.Build.0 = Phobos|Any CPU
{733BA8FC-C198-4C83-BA57-FE3672CBB307}.Release|Any CPU.ActiveCfg = Release|Any CPU
{733BA8FC-C198-4C83-BA57-FE3672CBB307}.Release|Any CPU.Build.0 = Release|Any CPU
{53895A69-5516-4598-8D76-32F9F2C67F0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{53895A69-5516-4598-8D76-32F9F2C67F0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{53895A69-5516-4598-8D76-32F9F2C67F0E}.Phobos|Any CPU.ActiveCfg = Phobos|Any CPU
{53895A69-5516-4598-8D76-32F9F2C67F0E}.Phobos|Any CPU.Build.0 = Phobos|Any CPU
{53895A69-5516-4598-8D76-32F9F2C67F0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{53895A69-5516-4598-8D76-32F9F2C67F0E}.Release|Any CPU.Build.0 = Release|Any CPU
{290432CA-71FE-4045-9503-D294CC2586C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{290432CA-71FE-4045-9503-D294CC2586C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{290432CA-71FE-4045-9503-D294CC2586C4}.Phobos|Any CPU.ActiveCfg = Phobos|Any CPU
{290432CA-71FE-4045-9503-D294CC2586C4}.Phobos|Any CPU.Build.0 = Phobos|Any CPU
{290432CA-71FE-4045-9503-D294CC2586C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{290432CA-71FE-4045-9503-D294CC2586C4}.Release|Any CPU.Build.0 = Release|Any CPU
{BD6F0E08-1A18-44CE-A121-4AD09D63C0B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BD6F0E08-1A18-44CE-A121-4AD09D63C0B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BD6F0E08-1A18-44CE-A121-4AD09D63C0B0}.Phobos|Any CPU.ActiveCfg = Phobos|Any CPU
{BD6F0E08-1A18-44CE-A121-4AD09D63C0B0}.Phobos|Any CPU.Build.0 = Phobos|Any CPU
{BD6F0E08-1A18-44CE-A121-4AD09D63C0B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BD6F0E08-1A18-44CE-A121-4AD09D63C0B0}.Release|Any CPU.Build.0 = Release|Any CPU
{A14AB205-AEF1-47ED-9836-D241D69889C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A14AB205-AEF1-47ED-9836-D241D69889C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A14AB205-AEF1-47ED-9836-D241D69889C4}.Phobos|Any CPU.ActiveCfg = Phobos|Any CPU
{A14AB205-AEF1-47ED-9836-D241D69889C4}.Phobos|Any CPU.Build.0 = Phobos|Any CPU
{A14AB205-AEF1-47ED-9836-D241D69889C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A14AB205-AEF1-47ED-9836-D241D69889C4}.Release|Any CPU.Build.0 = Release|Any CPU
{F6F32FB5-332F-48C1-8EC4-3FBD313BA411}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F6F32FB5-332F-48C1-8EC4-3FBD313BA411}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F6F32FB5-332F-48C1-8EC4-3FBD313BA411}.Phobos|Any CPU.ActiveCfg = Phobos|Any CPU
{F6F32FB5-332F-48C1-8EC4-3FBD313BA411}.Phobos|Any CPU.Build.0 = Phobos|Any CPU
{F6F32FB5-332F-48C1-8EC4-3FBD313BA411}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F6F32FB5-332F-48C1-8EC4-3FBD313BA411}.Release|Any CPU.Build.0 = Release|Any CPU
{ABB3AA71-9C0E-4455-9631-5D59031A8885}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ABB3AA71-9C0E-4455-9631-5D59031A8885}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ABB3AA71-9C0E-4455-9631-5D59031A8885}.Phobos|Any CPU.ActiveCfg = Phobos|Any CPU
{ABB3AA71-9C0E-4455-9631-5D59031A8885}.Phobos|Any CPU.Build.0 = Phobos|Any CPU
{ABB3AA71-9C0E-4455-9631-5D59031A8885}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ABB3AA71-9C0E-4455-9631-5D59031A8885}.Release|Any CPU.Build.0 = Release|Any CPU
{333F7F76-8429-487D-BEC8-1AE57ABC7D49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{333F7F76-8429-487D-BEC8-1AE57ABC7D49}.Debug|Any CPU.Build.0 = Debug|Any CPU
{333F7F76-8429-487D-BEC8-1AE57ABC7D49}.Phobos|Any CPU.ActiveCfg = Phobos|Any CPU
{333F7F76-8429-487D-BEC8-1AE57ABC7D49}.Phobos|Any CPU.Build.0 = Phobos|Any CPU
{333F7F76-8429-487D-BEC8-1AE57ABC7D49}.Release|Any CPU.ActiveCfg = Release|Any CPU
{333F7F76-8429-487D-BEC8-1AE57ABC7D49}.Release|Any CPU.Build.0 = Release|Any CPU
{73E9BD37-D311-42FF-80E5-3E6C38835910}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{73E9BD37-D311-42FF-80E5-3E6C38835910}.Debug|Any CPU.Build.0 = Debug|Any CPU
{73E9BD37-D311-42FF-80E5-3E6C38835910}.Phobos|Any CPU.ActiveCfg = Phobos|Any CPU
{73E9BD37-D311-42FF-80E5-3E6C38835910}.Phobos|Any CPU.Build.0 = Phobos|Any CPU
{73E9BD37-D311-42FF-80E5-3E6C38835910}.Release|Any CPU.ActiveCfg = Release|Any CPU
{73E9BD37-D311-42FF-80E5-3E6C38835910}.Release|Any CPU.Build.0 = Release|Any CPU
{2E24DA6E-348E-41FE-8A2B-F379AA6E7F1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2E24DA6E-348E-41FE-8A2B-F379AA6E7F1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2E24DA6E-348E-41FE-8A2B-F379AA6E7F1D}.Phobos|Any CPU.ActiveCfg = Phobos|Any CPU
{2E24DA6E-348E-41FE-8A2B-F379AA6E7F1D}.Phobos|Any CPU.Build.0 = Phobos|Any CPU
{2E24DA6E-348E-41FE-8A2B-F379AA6E7F1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2E24DA6E-348E-41FE-8A2B-F379AA6E7F1D}.Release|Any CPU.Build.0 = Release|Any CPU
{2137ADE9-E36F-4CB9-8384-FB41E3B27FFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2137ADE9-E36F-4CB9-8384-FB41E3B27FFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2137ADE9-E36F-4CB9-8384-FB41E3B27FFD}.Phobos|Any CPU.ActiveCfg = Phobos|Any CPU
{2137ADE9-E36F-4CB9-8384-FB41E3B27FFD}.Phobos|Any CPU.Build.0 = Phobos|Any CPU
{2137ADE9-E36F-4CB9-8384-FB41E3B27FFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2137ADE9-E36F-4CB9-8384-FB41E3B27FFD}.Release|Any CPU.Build.0 = Release|Any CPU
{ACE53C1C-CCFC-4A0E-B924-3CA4435FF986}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ACE53C1C-CCFC-4A0E-B924-3CA4435FF986}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ACE53C1C-CCFC-4A0E-B924-3CA4435FF986}.Phobos|Any CPU.ActiveCfg = Phobos|Any CPU
{ACE53C1C-CCFC-4A0E-B924-3CA4435FF986}.Phobos|Any CPU.Build.0 = Phobos|Any CPU
{ACE53C1C-CCFC-4A0E-B924-3CA4435FF986}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ACE53C1C-CCFC-4A0E-B924-3CA4435FF986}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{E945AABA-2779-41E8-9B43-8898FFD64F22} = {08DA7279-F347-4F54-95B6-7335F52746A6}
{0F9B9BC6-9F86-40E8-BA9B-D27BF3AC7970} = {08DA7279-F347-4F54-95B6-7335F52746A6}
{CAE7CA7C-0D0C-4FDA-BDE9-BE16A27343EF} = {08DA7279-F347-4F54-95B6-7335F52746A6}
{F6F74FCA-8E53-4620-90C7-9A91278A3521} = {08DA7279-F347-4F54-95B6-7335F52746A6}
{F1EFDCB9-FD61-4782-A12A-108C73DB368E} = {08DA7279-F347-4F54-95B6-7335F52746A6}
{5EB6F2C5-FEF1-402A-AB76-3A9F62B2EFDE} = {E1C0B656-C8EA-4F93-8855-798548B72B13}
Expand All @@ -147,6 +181,7 @@ Global
{73E9BD37-D311-42FF-80E5-3E6C38835910} = {08DA7279-F347-4F54-95B6-7335F52746A6}
{2E24DA6E-348E-41FE-8A2B-F379AA6E7F1D} = {C60F4548-6FFD-4D0E-B8C3-6CD6BC8FBC2C}
{2137ADE9-E36F-4CB9-8384-FB41E3B27FFD} = {C60F4548-6FFD-4D0E-B8C3-6CD6BC8FBC2C}
{ACE53C1C-CCFC-4A0E-B924-3CA4435FF986} = {08DA7279-F347-4F54-95B6-7335F52746A6}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B99E6BB8-642A-4A68-86DF-69567CBA700A}
Expand Down
11 changes: 11 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<solution>
<add key="disableSourceControlIntegration" value="true" />
</solution>
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="phobos" value="" />
</packageSources>
</configuration>
2 changes: 1 addition & 1 deletion build-system/linux-pr-validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ jobs:
name: Ubuntu
vmImage: 'ubuntu-16.04'
scriptFileName: ./build.sh
scriptArgs: all
scriptArgs: 'all phobos customNuGetSource=$(phobosNuGet)'
5 changes: 4 additions & 1 deletion build-system/windows-pr-validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@ pr:

name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)

variables:
- group: phobosKeys

jobs:
- template: azure-pipeline.template.yaml
parameters:
name: Windows
vmImage: 'vs2017-win2016'
scriptFileName: build.cmd
scriptArgs: all
scriptArgs: 'RunTests phobos customNuGetSource=$(phobosNuGet)'
31 changes: 20 additions & 11 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ open Fake.DocFxHelper

// Information about the project for Nuget and Assembly info files
let product = "Akka.CQRS"
let configuration = "Release"
let configuration = if hasBuildParam "phobos" then "Phobos" else "Release"

// Metadata used when signing packages and DLLs
let signingName = "My Library"
Expand Down Expand Up @@ -54,12 +54,20 @@ Target "AssemblyInfo" (fun _ ->
XmlPokeInnerText "./src/common.props" "//Project/PropertyGroup/PackageReleaseNotes" (releaseNotes.Notes |> String.concat "\n")
)

Target "Build" (fun _ ->
DotNetCli.Build
(fun p ->
{ p with
Project = solutionFile
Configuration = configuration }) // "Rebuild"
Target "RestorePackages" (fun _ ->
let customSource = getBuildParamOrDefault "customNuGetSource" ""

if(hasBuildParam "customNuGetSource") then
XmlPokeInnerText "./NuGet.config" "//add[@key='phobos']/@value" customSource
)


Target "Build" (fun _ ->
DotNetCli.Build
(fun p ->
{ p with
Project = solutionFile
Configuration = configuration }) // "Rebuild"
)


Expand Down Expand Up @@ -93,8 +101,8 @@ Target "RunTests" (fun _ ->
let runSingleProject project =
let arguments =
match (hasTeamCity) with
| true -> (sprintf "test -c Release --no-build --logger:trx --logger:\"console;verbosity=normal\" --results-directory %s -- -parallel none -teamcity" (outputTests))
| false -> (sprintf "test -c Release --no-build --logger:trx --logger:\"console;verbosity=normal\" --results-directory %s -- -parallel none" (outputTests))
| true -> (sprintf "test -c %s --no-build --logger:trx --logger:\"console;verbosity=normal\" --results-directory %s -- -parallel none -teamcity" configuration outputTests)
| false -> (sprintf "test -c %s --no-build --logger:trx --logger:\"console;verbosity=normal\" --results-directory %s -- -parallel none" configuration outputTests)

let result = ExecProcess(fun info ->
info.FileName <- "dotnet"
Expand Down Expand Up @@ -276,6 +284,7 @@ Target "PublishCode" (fun _ ->
Project = project
Configuration = configuration
VersionSuffix = overrideVersionSuffix project
AdditionalArgs = ["--no-restore --output bin/Release/netcoreapp2.1/publish"] // would be ideal to change publish dir via MSBuild
})

projects |> Seq.iter (runSingleProject)
Expand Down Expand Up @@ -398,7 +407,7 @@ Target "Docker" DoNothing
Target "Nuget" DoNothing

// build dependencies
"Clean" ==> "AssemblyInfo" ==> "Build" ==> "BuildRelease"
"Clean" ==> "AssemblyInfo" ==> "RestorePackages" ==> "Build" ==> "BuildRelease"

// tests dependencies
"Build" ==> "RunTests"
Expand All @@ -417,6 +426,6 @@ Target "Nuget" DoNothing
"BuildRelease" ==> "All"
"RunTests" ==> "All"
"NBench" ==> "All"
"Nuget" ==> "All"
"Docker" ==> "All"

RunTargetOrDefault "Help"
47 changes: 45 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,35 @@ services:
image: mongo-express
restart: always
ports:
- 8031:8081
- '8031:8081'
depends_on:
- "mongo"

graphite:
image: graphiteapp/graphite-statsd
hostname: graphite
container_name: graphite
restart: always
ports:
- "0:80"

grafana:
image: grafana/grafana
restart: always
ports:
- '3000:3000'
links:
- graphite
environment:
- GF_SECURITY_ADMIN_PASSWORD=password

jaeger:
image: jaegertracing/all-in-one:1.6
hostname: jaeger
restart: always
ports:
- '16686:16686'

lighthouse:
image: petabridge/lighthouse:latest
hostname: lighthouse
Expand All @@ -27,6 +52,9 @@ services:
CLUSTER_PORT: 4053
CLUSTER_IP: "lighthouse"
CLUSTER_SEEDS: "akka.tcp://AkkaTrader@lighthouse:4053"
STATSD_PORT: 8125
STATSD_URL: "graphite"
JAEGER_AGENT_HOST: "jaeger"

tradeprocessor:
image: akka.cqrs.tradeprocessor
Expand All @@ -36,6 +64,9 @@ services:
CLUSTER_SEEDS: "akka.tcp://AkkaTrader@lighthouse:4053"
CLUSTER_PORT: 5110
MONGO_CONNECTION_STR: "mongodb://mongo:27017/akkaTrader"
STATSD_PORT: 8125
STATSD_URL: "graphite"
JAEGER_AGENT_HOST: "jaeger"
restart: on-failure
depends_on:
- "mongo"
Expand All @@ -48,6 +79,9 @@ services:
environment:
CLUSTER_SEEDS: "akka.tcp://AkkaTrader@lighthouse:4053"
CLUSTER_PORT: 5110
STATSD_PORT: 8125
STATSD_URL: "graphite"
JAEGER_AGENT_HOST: "jaeger"
restart: on-failure
depends_on:
- "lighthouse"
Expand All @@ -62,6 +96,9 @@ services:
CLUSTER_PORT: 6055
CLUSTER_IP: "pricing-root"
MONGO_CONNECTION_STR: "mongodb://mongo:27017/akkaTrader"
STATSD_PORT: 8125
STATSD_URL: "graphite"
JAEGER_AGENT_HOST: "jaeger"
restart: on-failure
depends_on:
- "mongo"
Expand All @@ -75,6 +112,9 @@ services:
CLUSTER_SEEDS: "akka.tcp://AkkaTrader@lighthouse:4053"
CLUSTER_PORT: 6055
MONGO_CONNECTION_STR: "mongodb://mongo:27017/akkaTrader"
STATSD_PORT: 8125
STATSD_URL: "graphite"
JAEGER_AGENT_HOST: "jaeger"
restart: on-failure
depends_on:
- "mongo"
Expand All @@ -87,6 +127,9 @@ services:
environment:
CLUSTER_SEEDS: "akka.tcp://AkkaTrader@pricing-root:6055"
CLUSTER_PORT: 16666
STATSD_PORT: 8125
STATSD_URL: "graphite"
JAEGER_AGENT_HOST: "jaeger"
restart: on-failure
depends_on:
- "pricing-engine"
- "pricing-engine"
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<TargetFramework>$(NetCoreVersion)</TargetFramework>

<IsPackable>false</IsPackable>

<Configurations>Debug;Release;Phobos</Configurations>
</PropertyGroup>

<ItemGroup>
Expand Down
11 changes: 11 additions & 0 deletions src/Akka.CQRS.Infrastructure/Akka.CQRS.Infrastructure.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,15 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Description>Shared, non-domain-specific infrastructure used by various Akka.CQRS services.</Description>
<Configurations>Debug;Release;Phobos</Configurations>
</PropertyGroup>
<ItemGroup>
<None Remove="Ops\phobos.conf" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="Ops\ops.conf" />
<EmbeddedResource Include="Ops\phobos.conf" />
</ItemGroup>

<ItemGroup>
Expand All @@ -15,6 +20,12 @@
<PackageReference Include="Akka.Bootstrap.Docker" Version="$(AkkaBootstrapVersion)" />
</ItemGroup>

<ItemGroup Condition="'$(Configuration)' == 'Phobos'">
<PackageReference Include="Phobos.Actor.Cluster" Version="$(PhobosVersion)" />
<PackageReference Include="Phobos.Tracing.Jaeger" Version="$(PhobosTracingVersion)" />
<PackageReference Include="Phobos.Monitoring.StatsD" Version="$(PhobosMonitoringVersion)" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Akka.CQRS\Akka.CQRS.csproj" />
</ItemGroup>
Expand Down
Loading