Skip to content
This repository was archived by the owner on Dec 11, 2024. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
20b8997
refactor step
marcwittke Jun 10, 2022
3ecb8a5
(fix)tests
marcwittke Jun 13, 2022
5124396
refactor(composition root)
marcwittke Jun 13, 2022
e68d9b5
(refactor)tests
marcwittke Jun 14, 2022
9372a1a
TenantCreation vs. DataGeneration
marcwittke Jun 15, 2022
f9f9797
renaming EfCore5
marcwittke Jun 15, 2022
6a33af9
coverage
marcwittke Jun 15, 2022
4ad62fd
tests on net6.0
marcwittke Jun 15, 2022
db6744b
bumps
marcwittke Jun 15, 2022
a610749
bump nuke.build
marcwittke Jun 15, 2022
e822db1
r# greening
marcwittke Jun 15, 2022
915625e
test hardening
marcwittke Jun 15, 2022
780cd83
resurrect SimpleInjectorModule
marcwittke Jun 15, 2022
90ecaea
fix flaky test
marcwittke Jun 15, 2022
b1107f7
enforce Utc kind
marcwittke Jun 16, 2022
52b2144
fix arrayoutofrange
marcwittke Jun 16, 2022
e073b13
(fix) messagebus invocation
marcwittke Jun 16, 2022
059dbc8
Make a persistence module mandatory when adding the PersistentApplica…
marcwittke Jun 17, 2022
9dbae96
tighten clock criteria
marcwittke Jun 17, 2022
3eedb93
Prefer generic service descriptors
marcwittke Jun 17, 2022
f391a88
late configuration of Simple Injector container
marcwittke Jun 17, 2022
b08c11d
r# greening
marcwittke Jun 17, 2022
1d5b1aa
injection of IDbConnectionFactory required
marcwittke Jun 17, 2022
79f9bfd
Settings feature switchable
marcwittke Jun 17, 2022
4e57954
auto register authorization
marcwittke Jun 17, 2022
efc1bf7
InMem Persistence Module
marcwittke Jun 17, 2022
2e80cad
fix: raising messages after operation completion
marcwittke Jun 17, 2022
fc97eec
Organization of Features
marcwittke Jul 4, 2022
8f9123f
remove dynamic linq dependency
marcwittke Jul 4, 2022
4c07653
checkpoint
marcwittke Sep 22, 2022
be86e09
tests(BackendFx): checkpoint
marcwittke Sep 28, 2022
4fafe2b
refactor(messagebus): tests
marcwittke Sep 30, 2022
482fb31
feat(EfCore6Persistence): implemented & tested
marcwittke Oct 2, 2022
9bc4995
fix(warnings)
marcwittke Oct 2, 2022
a542165
feat(IdGeneration): int, long and guid supported
marcwittke Oct 3, 2022
e4ffbe2
feat(ConfigSettings): more serializers, all noda time types supported
marcwittke Oct 3, 2022
6719b30
refactor: removed AggregateQueryable<TAggregateRoot>, replaced with p…
marcwittke Oct 3, 2022
48470e1
feat(EfCorePersistence): multi tenancy
marcwittke Oct 4, 2022
c5a53d3
(chore): r# green, build script
marcwittke Oct 7, 2022
3f3268a
chore(deps): build dependencies bumped
marcwittke Oct 7, 2022
17263f1
chore(build): avoid docker pull messages as errors
marcwittke Oct 7, 2022
d3ea9b9
+semver: major
marcwittke Oct 7, 2022
b058d7d
fix(authorization): removed unnecessary generic type parameter
marcwittke Oct 7, 2022
39465ec
fix(DomainEventHandling): async implementation
marcwittke Oct 7, 2022
e72e248
fix(IdGeneration): make it easier to base an app on a non generic IMy…
marcwittke Oct 7, 2022
ad1570f
fix(idgeneration): string ids possible
marcwittke Oct 7, 2022
8ec8cb8
fix(efcorepersistence): extension point to inject custom repositories
marcwittke Oct 8, 2022
0bccb39
fix(domaineventhandling): async cancellation support
marcwittke Oct 8, 2022
da9c249
fir(Errors): Serialization
marcwittke Jan 1, 2023
e1dd12c
fix(Logging): no static fields any more
marcwittke Jan 1, 2023
999f2c1
feat(MicrosoftDI): possibility to hook into existing DI container
marcwittke Jan 2, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,7 @@ _ReSharper*/

# JetBrains Rider
.idea/
*.sln.iml
*.sln.iml

#nuke.build
.nuke/temp
1 change: 0 additions & 1 deletion .nuke

This file was deleted.

120 changes: 120 additions & 0 deletions .nuke/build.schema.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Build Schema",
"$ref": "#/definitions/build",
"definitions": {
"build": {
"type": "object",
"properties": {
"Configuration": {
"type": "string",
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
"enum": [
"Debug",
"Release"
]
},
"Continue": {
"type": "boolean",
"description": "Indicates to continue a previously failed build attempt"
},
"Help": {
"type": "boolean",
"description": "Shows the help text for this build assembly"
},
"Host": {
"type": "string",
"description": "Host for execution. Default is 'automatic'",
"enum": [
"AppVeyor",
"AzurePipelines",
"Bamboo",
"Bitbucket",
"Bitrise",
"GitHubActions",
"GitLab",
"Jenkins",
"Rider",
"SpaceAutomation",
"TeamCity",
"Terminal",
"TravisCI",
"VisualStudio",
"VSCode"
]
},
"NoLogo": {
"type": "boolean",
"description": "Disables displaying the NUKE logo"
},
"Partition": {
"type": "string",
"description": "Partition to use on CI"
},
"Plan": {
"type": "boolean",
"description": "Shows the execution plan (HTML)"
},
"Profile": {
"type": "array",
"description": "Defines the profiles to load",
"items": {
"type": "string"
}
},
"Root": {
"type": "string",
"description": "Root directory during build execution"
},
"Skip": {
"type": "array",
"description": "List of targets to be skipped. Empty list skips all dependencies",
"items": {
"type": "string",
"enum": [
"Clean",
"Compile",
"Pack",
"Publish",
"Restore",
"StartDependencies",
"StopDependencies",
"Test"
]
}
},
"Solution": {
"type": "string",
"description": "Path to a solution file that is automatically loaded"
},
"Target": {
"type": "array",
"description": "List of targets to be invoked. Default is '{default_target}'",
"items": {
"type": "string",
"enum": [
"Clean",
"Compile",
"Pack",
"Publish",
"Restore",
"StartDependencies",
"StopDependencies",
"Test"
]
}
},
"Verbosity": {
"type": "string",
"description": "Logging verbosity during build execution. Default is 'Normal'",
"enum": [
"Minimal",
"Normal",
"Quiet",
"Verbose"
]
}
}
}
}
}
4 changes: 4 additions & 0 deletions .nuke/parameters.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"$schema": "./build.schema.json",
"Solution": "Backend.Fx.sln"
}
7 changes: 0 additions & 7 deletions .tmp/build-attempt.log

This file was deleted.

49 changes: 14 additions & 35 deletions Backend.Fx.sln
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C7885592
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Backend.Fx.Tests", "tests\Backend.Fx.Tests\Backend.Fx.Tests.csproj", "{3706F748-43F6-41BD-8875-81FA679220C7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Backend.Fx.EfCorePersistence.Tests", "tests\Backend.Fx.EfCorePersistence.Tests\Backend.Fx.EfCorePersistence.Tests.csproj", "{4BB72B85-61F2-4C7F-9079-EA43492FCD44}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "abstractions", "{A742F814-725A-44ED-95E6-98E142738E9D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "environments", "environments", "{56ACAE69-F7F0-4FF2-BEE6-4B079481CF9A}"
Expand All @@ -25,22 +23,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "implementations", "implemen
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Backend.Fx", "src\abstractions\Backend.Fx\Backend.Fx.csproj", "{581DCC00-9246-4A2E-AE31-206742B2746A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Backend.Fx.EfCorePersistence", "src\implementations\Backend.Fx.EfCorePersistence\Backend.Fx.EfCorePersistence.csproj", "{A60B7952-D92C-403D-9710-65BE13963C7E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Backend.Fx.RabbitMq", "src\implementations\Backend.Fx.RabbitMq\Backend.Fx.RabbitMq.csproj", "{2C826FC0-443A-4874-B213-C35BFDEA200A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Backend.Fx.SimpleInjectorDependencyInjection", "src\implementations\Backend.Fx.SimpleInjetorDependencyInjection\Backend.Fx.SimpleInjectorDependencyInjection.csproj", "{FF042FB5-BA44-4655-8903-2644FE549810}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Backend.Fx.AspNetCore", "src\environments\Backend.Fx.AspNetCore\Backend.Fx.AspNetCore.csproj", "{25746028-5116-4600-A0C4-35DE0C468A8F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Backend.Fx.SimpleInjectorDependencyInjection.Tests", "tests\Backend.Fx.SimpleInjectorDependencyInjection.Tests\Backend.Fx.SimpleInjectorDependencyInjection.Tests.csproj", "{D98AED23-ABB8-4130-9612-54AEFE9D2272}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Backend.Fx.InMemoryPersistence", "src\implementations\Backend.Fx.InMemoryPersistence\Backend.Fx.InMemoryPersistence.csproj", "{0B8F13CA-1347-4655-9D41-AED21B1AFAC4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Backend.Fx.RabbitMq.Tests", "tests\Backend.Fx.RabbitMq.Tests\Backend.Fx.RabbitMq.Tests.csproj", "{6D0A5E9D-2FA5-4CC9-96B0-C2C871335E3A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Backend.Fx.AspNetCore.Tests", "tests\Backend.Fx.AspNetCore.Tests\Backend.Fx.AspNetCore.Tests.csproj", "{DF40E1E8-FB19-455E-9CED-212C544AA8BC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{16EBBF6D-EA66-4E14-BE2D-1900CBC747F7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{FD21EC43-FC48-433A-8C4F-5CCFC1A2B35E}"
Expand All @@ -58,6 +48,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Backend.Fx.EfCore6Persisten
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Backend.Fx.EfCore6Persistence.Tests", "tests\Backend.Fx.EfCore6Persistence.Tests\Backend.Fx.EfCore6Persistence.Tests.csproj", "{E50D7E8D-D012-4683-BA05-C877BAA25230}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Backend.Fx.MicrosoftDependencyInjection", "src\implementations\Backend.Fx.MicrosoftDependencyInjection\Backend.Fx.MicrosoftDependencyInjection.csproj", "{B4791DB0-F8DD-4248-86CB-407E46F55B13}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Backend.Fx.TestUtil", "tests\Backend.Fx.TestUtil\Backend.Fx.TestUtil.csproj", "{3AD4F223-DC1D-40B7-9DB9-DC88FDD0178D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -71,18 +65,10 @@ Global
{3706F748-43F6-41BD-8875-81FA679220C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3706F748-43F6-41BD-8875-81FA679220C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3706F748-43F6-41BD-8875-81FA679220C7}.Release|Any CPU.Build.0 = Release|Any CPU
{4BB72B85-61F2-4C7F-9079-EA43492FCD44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4BB72B85-61F2-4C7F-9079-EA43492FCD44}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4BB72B85-61F2-4C7F-9079-EA43492FCD44}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4BB72B85-61F2-4C7F-9079-EA43492FCD44}.Release|Any CPU.Build.0 = Release|Any CPU
{581DCC00-9246-4A2E-AE31-206742B2746A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{581DCC00-9246-4A2E-AE31-206742B2746A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{581DCC00-9246-4A2E-AE31-206742B2746A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{581DCC00-9246-4A2E-AE31-206742B2746A}.Release|Any CPU.Build.0 = Release|Any CPU
{A60B7952-D92C-403D-9710-65BE13963C7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A60B7952-D92C-403D-9710-65BE13963C7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A60B7952-D92C-403D-9710-65BE13963C7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A60B7952-D92C-403D-9710-65BE13963C7E}.Release|Any CPU.Build.0 = Release|Any CPU
{2C826FC0-443A-4874-B213-C35BFDEA200A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2C826FC0-443A-4874-B213-C35BFDEA200A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2C826FC0-443A-4874-B213-C35BFDEA200A}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -95,22 +81,10 @@ Global
{25746028-5116-4600-A0C4-35DE0C468A8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{25746028-5116-4600-A0C4-35DE0C468A8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{25746028-5116-4600-A0C4-35DE0C468A8F}.Release|Any CPU.Build.0 = Release|Any CPU
{D98AED23-ABB8-4130-9612-54AEFE9D2272}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D98AED23-ABB8-4130-9612-54AEFE9D2272}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D98AED23-ABB8-4130-9612-54AEFE9D2272}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D98AED23-ABB8-4130-9612-54AEFE9D2272}.Release|Any CPU.Build.0 = Release|Any CPU
{0B8F13CA-1347-4655-9D41-AED21B1AFAC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0B8F13CA-1347-4655-9D41-AED21B1AFAC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0B8F13CA-1347-4655-9D41-AED21B1AFAC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0B8F13CA-1347-4655-9D41-AED21B1AFAC4}.Release|Any CPU.Build.0 = Release|Any CPU
{6D0A5E9D-2FA5-4CC9-96B0-C2C871335E3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6D0A5E9D-2FA5-4CC9-96B0-C2C871335E3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6D0A5E9D-2FA5-4CC9-96B0-C2C871335E3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6D0A5E9D-2FA5-4CC9-96B0-C2C871335E3A}.Release|Any CPU.Build.0 = Release|Any CPU
{DF40E1E8-FB19-455E-9CED-212C544AA8BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DF40E1E8-FB19-455E-9CED-212C544AA8BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DF40E1E8-FB19-455E-9CED-212C544AA8BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DF40E1E8-FB19-455E-9CED-212C544AA8BC}.Release|Any CPU.Build.0 = Release|Any CPU
{38034961-CE3B-4286-A9EB-496DECA39632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{38034961-CE3B-4286-A9EB-496DECA39632}.Debug|Any CPU.Build.0 = Debug|Any CPU
{38034961-CE3B-4286-A9EB-496DECA39632}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -119,32 +93,37 @@ Global
{E50D7E8D-D012-4683-BA05-C877BAA25230}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E50D7E8D-D012-4683-BA05-C877BAA25230}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E50D7E8D-D012-4683-BA05-C877BAA25230}.Release|Any CPU.Build.0 = Release|Any CPU
{B4791DB0-F8DD-4248-86CB-407E46F55B13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4791DB0-F8DD-4248-86CB-407E46F55B13}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4791DB0-F8DD-4248-86CB-407E46F55B13}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B4791DB0-F8DD-4248-86CB-407E46F55B13}.Release|Any CPU.Build.0 = Release|Any CPU
{3AD4F223-DC1D-40B7-9DB9-DC88FDD0178D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3AD4F223-DC1D-40B7-9DB9-DC88FDD0178D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3AD4F223-DC1D-40B7-9DB9-DC88FDD0178D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3AD4F223-DC1D-40B7-9DB9-DC88FDD0178D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{3706F748-43F6-41BD-8875-81FA679220C7} = {C7885592-A4B8-4BA8-8D3A-1EDA4025D17A}
{4BB72B85-61F2-4C7F-9079-EA43492FCD44} = {C7885592-A4B8-4BA8-8D3A-1EDA4025D17A}
{A742F814-725A-44ED-95E6-98E142738E9D} = {53D4501E-953C-4A7C-97C4-1F9DE04BD092}
{56ACAE69-F7F0-4FF2-BEE6-4B079481CF9A} = {53D4501E-953C-4A7C-97C4-1F9DE04BD092}
{739A7296-579F-4D9A-BC73-DCECD260D7A0} = {53D4501E-953C-4A7C-97C4-1F9DE04BD092}
{581DCC00-9246-4A2E-AE31-206742B2746A} = {A742F814-725A-44ED-95E6-98E142738E9D}
{25746028-5116-4600-A0C4-35DE0C468A8F} = {56ACAE69-F7F0-4FF2-BEE6-4B079481CF9A}
{D98AED23-ABB8-4130-9612-54AEFE9D2272} = {C7885592-A4B8-4BA8-8D3A-1EDA4025D17A}
{6D0A5E9D-2FA5-4CC9-96B0-C2C871335E3A} = {C7885592-A4B8-4BA8-8D3A-1EDA4025D17A}
{DF40E1E8-FB19-455E-9CED-212C544AA8BC} = {C7885592-A4B8-4BA8-8D3A-1EDA4025D17A}
{16EBBF6D-EA66-4E14-BE2D-1900CBC747F7} = {6B64354E-D95B-4711-BAF6-B32049C90CD9}
{FD21EC43-FC48-433A-8C4F-5CCFC1A2B35E} = {16EBBF6D-EA66-4E14-BE2D-1900CBC747F7}
{ADC35CAD-F5B1-42B6-A0CC-B96974C11F11} = {739A7296-579F-4D9A-BC73-DCECD260D7A0}
{A60B7952-D92C-403D-9710-65BE13963C7E} = {ADC35CAD-F5B1-42B6-A0CC-B96974C11F11}
{0B8F13CA-1347-4655-9D41-AED21B1AFAC4} = {ADC35CAD-F5B1-42B6-A0CC-B96974C11F11}
{8BC1C02F-0785-4161-BC37-7D462BD6F42D} = {739A7296-579F-4D9A-BC73-DCECD260D7A0}
{2C826FC0-443A-4874-B213-C35BFDEA200A} = {8BC1C02F-0785-4161-BC37-7D462BD6F42D}
{22E4DE95-C3E5-49E6-83BF-BF30905A746B} = {739A7296-579F-4D9A-BC73-DCECD260D7A0}
{FF042FB5-BA44-4655-8903-2644FE549810} = {22E4DE95-C3E5-49E6-83BF-BF30905A746B}
{38034961-CE3B-4286-A9EB-496DECA39632} = {ADC35CAD-F5B1-42B6-A0CC-B96974C11F11}
{E50D7E8D-D012-4683-BA05-C877BAA25230} = {C7885592-A4B8-4BA8-8D3A-1EDA4025D17A}
{B4791DB0-F8DD-4248-86CB-407E46F55B13} = {22E4DE95-C3E5-49E6-83BF-BF30905A746B}
{3AD4F223-DC1D-40B7-9DB9-DC88FDD0178D} = {C7885592-A4B8-4BA8-8D3A-1EDA4025D17A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {45648557-C751-44AD-9C87-0F12EB673969}
Expand Down
3 changes: 3 additions & 0 deletions Backend.Fx.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DI/@EntryIndexedValue">DI</s:String>
<s:Boolean x:Key="/Default/UserDictionary/Words/=atislav_0022_002C/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=bratislav/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=getapplock/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=lustige/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Metulsky/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Myget/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Noda/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=nupkg/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
2 changes: 1 addition & 1 deletion build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
:; exit $?

@ECHO OFF
powershell -ExecutionPolicy ByPass -NoProfile "%~dp0build.ps1" %*
powershell -ExecutionPolicy ByPass -NoProfile -File "%~dp0build.ps1" %*
8 changes: 4 additions & 4 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
###########################################################################

$BuildProjectFile = "$PSScriptRoot\build\_build.csproj"
$TempDirectory = "$PSScriptRoot\\.tmp"
$TempDirectory = "$PSScriptRoot\\.nuke\temp"

$DotNetGlobalFile = "$PSScriptRoot\\global.json"
$DotNetInstallUrl = "https://dot.net/v1/dotnet-install.ps1"
Expand Down Expand Up @@ -56,14 +56,14 @@ else {
# Install by channel or version
$DotNetDirectory = "$TempDirectory\dotnet-win"
if (!(Test-Path variable:DotNetVersion)) {
ExecSafe { & $DotNetInstallFile -InstallDir $DotNetDirectory -Channel $DotNetChannel -NoPath }
ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Channel $DotNetChannel -NoPath }
} else {
ExecSafe { & $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
}
$env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe"
}

Write-Output "Microsoft (R) .NET Core SDK version $(& $env:DOTNET_EXE --version)"
Write-Output "Microsoft (R) .NET SDK version $(& $env:DOTNET_EXE --version)"

ExecSafe { & $env:DOTNET_EXE build $BuildProjectFile /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet }
ExecSafe { & $env:DOTNET_EXE run --project $BuildProjectFile --no-build -- $BuildArguments }
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
###########################################################################

BUILD_PROJECT_FILE="$SCRIPT_DIR/build/_build.csproj"
TEMP_DIRECTORY="$SCRIPT_DIR//.tmp"
TEMP_DIRECTORY="$SCRIPT_DIR//.nuke/temp"

DOTNET_GLOBAL_FILE="$SCRIPT_DIR//global.json"
DOTNET_INSTALL_URL="https://dot.net/v1/dotnet-install.sh"
Expand Down Expand Up @@ -56,7 +56,7 @@ else
export DOTNET_EXE="$DOTNET_DIRECTORY/dotnet"
fi

echo "Microsoft (R) .NET Core SDK version $("$DOTNET_EXE" --version)"
echo "Microsoft (R) .NET SDK version $("$DOTNET_EXE" --version)"

"$DOTNET_EXE" build "$BUILD_PROJECT_FILE" /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet
"$DOTNET_EXE" run --project "$BUILD_PROJECT_FILE" --no-build -- "$@"
11 changes: 6 additions & 5 deletions build/Build.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using Nuke.Common;
using Nuke.Common.CI;
using Nuke.Common.Execution;
using Nuke.Common.Git;
using Nuke.Common.IO;
using Nuke.Common.ProjectModel;
Expand All @@ -11,9 +10,8 @@
using static Nuke.Common.IO.FileSystemTasks;
using static Nuke.Common.Tools.DotNet.DotNetTasks;

[CheckBuildProjectConfigurations]
[ShutdownDotNetAfterServerBuild]
class Build : NukeBuild
partial class Build : NukeBuild
{
public static int Main() => Execute<Build>(x => x.Publish);

Expand Down Expand Up @@ -53,6 +51,7 @@ class Build : NukeBuild
.DependsOn(Restore)
.Executes(() =>
{
Serilog.Log.Information("Version {Version}", GitVersion?.SemVer ?? "no version!");
DotNetBuild(s => s
.SetProjectFile(Solution)
.SetConfiguration(Configuration)
Expand All @@ -63,14 +62,16 @@ class Build : NukeBuild
});

Target Test => _ => _
.DependsOn(Compile)
.DependsOn(Compile, StartDependencies)
.Executes(() =>
{
DotNetTest(s => s
.SetProjectFile(Solution)
.SetConfiguration(Configuration)
.EnableNoRestore());
});
})
.ProceedAfterFailure()
.Triggers(StopDependencies);

Target Pack => _ => _
.DependsOn(Test)
Expand Down
Loading