Skip to content

Commit bb9d5e0

Browse files
einarieinari
authored
Merge pull request #2294 from Cratis:14.12.3
14.12.3
2 parents 05cb036 + 36f21c9 commit bb9d5e0

File tree

273 files changed

+3288
-811
lines changed

Some content is hidden

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

273 files changed

+3288
-811
lines changed

‎.vscode/launch.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@
5252
"type": "coreclr",
5353
"request": "launch",
5454
"preLaunchTask": "build",
55-
"program": "${workspaceFolder}/Source/Tools/InternalsVerifier/bin/Debug/net9.0/InternalsVerifier.dll",
55+
"program": "${workspaceFolder}/Source/Tools/InternalsVerifier/bin/Debug/net10.0/InternalsVerifier.dll",
5656
"args": [
57-
"${workspaceFolder}/Source/Clients/DotNET.InProcess/bin/Debug/net9.0/Cratis.Chronicle.InProcess.dll",
58-
"${workspaceFolder}/Source/Clients/DotNET.InProcess/bin/Debug/net9.0/Cratis.Chronicle.Storage.dll;${workspaceFolder}/Source/Clients/DotNET.InProcess/bin/Debug/net9.0/Cratis.Chronicle.Storage.MongoDB.dll;${workspaceFolder}/Source/Clients/DotNET.InProcess/bin/Debug/net9.0/Cratis.Chronicle.Compliance.dll;${workspaceFolder}/Source/Clients/DotNET.InProcess/bin/Debug/net9.0/Cratis.Chronicle.Grains.dll;${workspaceFolder}/Source/Clients/DotNET.InProcess/bin/Debug/net9.0/Cratis.Chronicle.Grains.Interfaces.dll;${workspaceFolder}/Source/Clients/DotNET.InProcess/bin/Debug/net9.0/Cratis.Chronicle.Projections.dll;${workspaceFolder}/Source/Clients/DotNET.InProcess/bin/Debug/net9.0/Cratis.Chronicle.Diagnostics.dll;${workspaceFolder}/Source/Clients/DotNET.InProcess/bin/Debug/net9.0/Cratis.Chronicle.Concepts.dll",
57+
"${workspaceFolder}/Source/Clients/DotNET.InProcess/bin/Debug/net10.0/Cratis.Chronicle.InProcess.dll",
58+
"${workspaceFolder}/Source/Clients/DotNET.InProcess/bin/Debug/net10.0/Cratis.Chronicle.Storage.dll;${workspaceFolder}/Source/Clients/DotNET.InProcess/bin/Debug/net10.0/Cratis.Chronicle.Storage.MongoDB.dll;${workspaceFolder}/Source/Clients/DotNET.InProcess/bin/Debug/net10.0/Cratis.Chronicle.Compliance.dll;${workspaceFolder}/Source/Clients/DotNET.InProcess/bin/Debug/net10.0/Cratis.Chronicle.Grains.dll;${workspaceFolder}/Source/Clients/DotNET.InProcess/bin/Debug/net10.0/Cratis.Chronicle.Grains.Interfaces.dll;${workspaceFolder}/Source/Clients/DotNET.InProcess/bin/Debug/net10.0/Cratis.Chronicle.Projections.dll;${workspaceFolder}/Source/Clients/DotNET.InProcess/bin/Debug/net10.0/Cratis.Chronicle.Diagnostics.dll;${workspaceFolder}/Source/Clients/DotNET.InProcess/bin/Debug/net10.0/Cratis.Chronicle.Concepts.dll",
5959
"Cratis.Chronicle.Setup.MongoDBChronicleBuilderExtensions"
6060
],
6161
"cwd": "${workspaceFolder}/Source/Tools/InternalsVerifier",
@@ -69,9 +69,9 @@
6969
"type": "coreclr",
7070
"request": "launch",
7171
"preLaunchTask": "build",
72-
"program": "${workspaceFolder}/Source/Tools/AssemblyFixer/bin/Debug/net9.0/AssemblyFixer.dll",
72+
"program": "${workspaceFolder}/Source/Tools/AssemblyFixer/bin/Debug/net10.0/AssemblyFixer.dll",
7373
"args": [
74-
"${workspaceFolder}/Source/Clients/DotNET.InProcess/bin/Release/net9.0/Cratis.Chronicle.InProcess.dll",
74+
"${workspaceFolder}/Source/Clients/DotNET.InProcess/bin/Release/net10.0/Cratis.Chronicle.InProcess.dll",
7575
"Cratis.Chronicle.Orleans;Cratis.Chronicle.Grains;Cratis.Chronicle.Grains.Interfaces"
7676
],
7777
"cwd": "${workspaceFolder}/Source/Tools/AssemblyFixer",
@@ -85,10 +85,10 @@
8585
"type": "coreclr",
8686
"request": "launch",
8787
"preLaunchTask": "build",
88-
"program": "${workspaceFolder}/Source/Tools/ResourceEmbedder/bin/Debug/net9.0/Cratis.Chronicle.ResourceEmbedder.dll",
88+
"program": "${workspaceFolder}/Source/Tools/ResourceEmbedder/bin/Debug/net10.0/Cratis.Chronicle.ResourceEmbedder.dll",
8989
"args": [
90-
"${workspaceFolder}/Source/Clients/Api/bin/Release/net9.0/Cratis.Chronicle.Api.dll",
91-
"${workspaceFolder}/Source/Clients/Api/bin/Release/net9.0/Cratis.Chronicle.Api.xml"
90+
"${workspaceFolder}/Source/Clients/Api/bin/Release/net10.0/Cratis.Chronicle.Api.dll",
91+
"${workspaceFolder}/Source/Clients/Api/bin/Release/net10.0/Cratis.Chronicle.Api.xml"
9292
],
9393
"cwd": "${workspaceFolder}/Source/Tools/ResourceEmbedder",
9494
"stopAtEntry": false,
@@ -101,9 +101,9 @@
101101
"type": "coreclr",
102102
"request": "launch",
103103
"preLaunchTask": "build",
104-
"program": "${workspaceFolder}/Source/Tools/GrpcClients/bin/Debug/net9.0/GrpcClients.dll",
104+
"program": "${workspaceFolder}/Source/Tools/GrpcClients/bin/Debug/net10.0/GrpcClients.dll",
105105
"args": [
106-
"${workspaceFolder}/Source/Clients/DotNET/bin/Release/net9.0/Cratis.Chronicle.Contracts.dll",
106+
"${workspaceFolder}/Source/Clients/DotNET/bin/Release/net10.0/Cratis.Chronicle.Contracts.dll",
107107
"Cratis.Chronicle.Contracts.Implementations"
108108
],
109109
"cwd": "${workspaceFolder}/Source/Tools/GrpcClients",
@@ -116,7 +116,7 @@
116116
"name": ".NET Core Launch (Server)",
117117
"type": "coreclr",
118118
"request": "launch",
119-
"program": "${workspaceFolder}/Source/Kernel/Server/bin/Debug/net9.0/Cratis.Chronicle.Server.dll",
119+
"program": "${workspaceFolder}/Source/Kernel/Server/bin/Debug/net10.0/Cratis.Chronicle.Server.dll",
120120
"args": [],
121121
"cwd": "${workspaceFolder}/Source/Kernel/Server",
122122
"stopAtEntry": false,

‎.vscode/projects.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
{
33
"name": "Server",
44
"path": "${workspaceFolder}/Source/Kernel/Server",
5-
"outputPath": "${workspaceFolder}/Source/Kernel/Server/bin/Debug/net9.0/Cratis.Chronicle.Server.dll"
5+
"outputPath": "${workspaceFolder}/Source/Kernel/Server/bin/Debug/net10.0/Cratis.Chronicle.Server.dll"
66
},
77
{
88
"name": "Api",
99
"path": "${workspaceFolder}/Source/Clients/Api",
10-
"outputPath": "${workspaceFolder}/Source/Clients/Api/bin/Debug/net9.0/Cratis.Chronicle.Api.dll"
10+
"outputPath": "${workspaceFolder}/Source/Clients/Api/bin/Debug/net10.0/Cratis.Chronicle.Api.dll"
1111
},
1212
{
1313
"name": "AspNetCore Sample",
1414
"path": "${workspaceFolder}/Samples/AspNetCore",
15-
"outputPath": "${workspaceFolder}/Samples/AspNetCore/bin/Debug/net9.0/AspNetCore.dll"
15+
"outputPath": "${workspaceFolder}/Samples/AspNetCore/bin/Debug/net10.0/AspNetCore.dll"
1616
},
1717
{
1818
"name": "Basic Sample",
1919
"path": "${workspaceFolder}/Samples/Basic",
20-
"outputPath": "${workspaceFolder}/Samples/Basic/bin/Debug/net9.0/Basic.dll"
20+
"outputPath": "${workspaceFolder}/Samples/Basic/bin/Debug/net10.0/Basic.dll"
2121
},
2222
{
2323
"name": "Orleans Sample",
2424
"path": "${workspaceFolder}/Samples/Orleans",
25-
"outputPath": "${workspaceFolder}/Samples/Orleans/bin/Debug/net9.0/Orleans.dll"
25+
"outputPath": "${workspaceFolder}/Samples/Orleans/bin/Debug/net10.0/Orleans.dll"
2626
},
2727
{
2828
"name": "DotNET Client",
@@ -31,21 +31,21 @@
3131
{
3232
"name": "AssemblyFixer",
3333
"path": "${workspaceFolder}/Source/Tools/AssemblyFixer",
34-
"outputPath": "${workspaceFolder}/Source/Tools/AssemblyFixer/bin/Debug/net9.0/AssemblyFixer.dll"
34+
"outputPath": "${workspaceFolder}/Source/Tools/AssemblyFixer/bin/Debug/net10.0/AssemblyFixer.dll"
3535
},
3636
{
3737
"name": "ResourceEmbedder",
3838
"path": "${workspaceFolder}/Source/Tools/ResourceEmbedder",
39-
"outputPath": "${workspaceFolder}/Source/Tools/ResourceEmbedder/bin/Debug/net9.0/ResourceEmbedder.dll"
39+
"outputPath": "${workspaceFolder}/Source/Tools/ResourceEmbedder/bin/Debug/net10.0/ResourceEmbedder.dll"
4040
},
4141
{
4242
"name": "InternalsVerifier",
4343
"path": "${workspaceFolder}/Source/Tools/InternalsVerifier",
44-
"outputPath": "${workspaceFolder}/Source/Tools/InternalsVerifier/bin/Debug/net9.0/InternalsVerifier.dll"
44+
"outputPath": "${workspaceFolder}/Source/Tools/InternalsVerifier/bin/Debug/net10.0/InternalsVerifier.dll"
4545
},
4646
{
4747
"name": "GrpcClients",
4848
"path": "${workspaceFolder}/Source/Tools/GrpcClients",
49-
"outputPath": "${workspaceFolder}/Source/Tools/GrpcClients/bin/Debug/net9.0/GrpcClients.dll"
49+
"outputPath": "${workspaceFolder}/Source/Tools/GrpcClients/bin/Debug/net10.0/GrpcClients.dll"
5050
}
5151
]

‎Directory.Packages.props‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@
1212
<!-- Cratis -->
1313
<PackageVersion Include="Cratis.Fundamentals" Version="7.2.3" />
1414
<PackageVersion Include="Cratis.Metrics.Roslyn" Version="7.2.3" />
15-
<PackageVersion Include="Cratis.Applications" Version="17.25.1" />
16-
<PackageVersion Include="Cratis.Applications.MongoDB" Version="17.25.1" />
17-
<PackageVersion Include="Cratis.Applications.Orleans" Version="17.25.1" />
18-
<PackageVersion Include="Cratis.Applications.Orleans.MongoDB" Version="17.25.1" />
19-
<PackageVersion Include="Cratis.Applications.ProxyGenerator.Build" Version="17.25.1" />
20-
<PackageVersion Include="Cratis.Applications.Swagger" Version="17.25.1" />
15+
<PackageVersion Include="Cratis.Arc" Version="18.0.3" />
16+
<PackageVersion Include="Cratis.Arc.MongoDB" Version="18.0.3" />
17+
<PackageVersion Include="Cratis.Arc.ProxyGenerator.Build" Version="18.0.3" />
18+
<PackageVersion Include="Cratis.Arc.Swagger" Version="18.0.3" />
2119
<!-- Microsoft -->
2220
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
2321
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />

‎Documentation/clients/application-model/commands.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ Command handlers should not throw exceptions for business rule violations. Inste
321321
#### Using OneOf with Validation Results
322322

323323
```csharp
324-
using Cratis.Applications.Validation;
324+
using Cratis.Arc.Validation;
325325

326326
[Command]
327327
public record TransferFunds([Key] Guid AccountId, decimal Amount, Guid ToAccountId)
@@ -351,7 +351,7 @@ public record TransferFunds([Key] Guid AccountId, decimal Amount, Guid ToAccount
351351
For commands that return single events, use `OneOf<ValidationResult, Event>`:
352352

353353
```csharp
354-
using Cratis.Applications.Validation;
354+
using Cratis.Arc.Validation;
355355

356356
[Command]
357357
public record CreateUser(string Email, string Name)
@@ -384,7 +384,7 @@ public record CreateUser(string Email, string Name)
384384
For commands that return multiple events, use `OneOf<ValidationResult, IEnumerable<object>>`:
385385

386386
```csharp
387-
using Cratis.Applications.Validation;
387+
using Cratis.Arc.Validation;
388388

389389
[Command]
390390
public record ProcessOrder([Key] Guid OrderId)

‎Documentation/clients/application-model/getting-started.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public record UserRegistered(string Email, string Name);
6464
```csharp
6565
// Commands/RegisterUserCommand.cs
6666
using System.ComponentModel.DataAnnotations;
67-
using Cratis.Applications.Commands.ModelBound;
67+
using Cratis.Arc.Commands.ModelBound;
6868
using Cratis.Chronicle.Events;
6969

7070
[Command]

‎Integration/Api/Api.csproj‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Cratis.Applications" />
17-
<PackageReference Include="Cratis.Applications.MongoDB" />
18-
<PackageReference Include="Cratis.Applications.Orleans" />
19-
<PackageReference Include="Cratis.Applications.Orleans.MongoDB" />
20-
<PackageReference Include="Cratis.Applications.Swagger" />
16+
<PackageReference Include="Cratis.Arc" />
17+
<PackageReference Include="Cratis.Arc.MongoDB" />
18+
<PackageReference Include="Cratis.Arc.Swagger" />
2119
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
2220
</ItemGroup>
2321

‎Integration/Api/Program.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
_.ValidateScopes = false;
2929
_.ValidateOnBuild = false;
3030
})
31-
.UseCratisApplicationModel();
31+
.AddCratisArc();
3232

3333
builder.WebHost.UseKestrel(options =>
3434
{
@@ -39,7 +39,7 @@
3939
var app = builder.Build();
4040
app
4141
.UseRouting()
42-
.UseCratisApplicationModel()
42+
.UseCratisArc()
4343
.UseCratisChronicle()
4444
.UseCratisChronicleApi();
4545

@@ -72,5 +72,3 @@ static void PrintExceptionInfo(Exception exception)
7272
Console.WriteLine($"Exception message: {exception.Message}");
7373
Console.WriteLine($"Stack Trace: {exception.StackTrace}");
7474
}
75-
76-
public partial class Program;

‎Integration/Api/for_EventStoreQueries/when_getting_event_stores.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Cratis. All rights reserved.
22
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
33

4-
using Cratis.Applications.Queries;
4+
using Cratis.Arc.Queries;
55
using Cratis.Chronicle.Api.EventStores;
66
using context = Cratis.Chronicle.Integration.Api.for_EventStoreQueries.when_getting_event_stores.context;
77

‎Integration/DotNET.InProcess/DotNET.InProcess.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Cratis.Applications" />
23-
<PackageReference Include="Cratis.Applications.MongoDB" />
24-
<PackageReference Include="Cratis.Applications.Orleans" />
22+
<PackageReference Include="Cratis.Arc" />
23+
<PackageReference Include="Cratis.Arc.MongoDB" />
2524
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
2625
<PackageReference Include="Microsoft.Orleans.TestingHost" />
2726
<PackageReference Include="Polly.Core" />

‎Integration/DotNET.InProcess/run-debug.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/bash
2-
dotnet test --logger "console;verbosity=normal" --configuration Debug --framework net9.0
2+
dotnet test --logger "console;verbosity=normal" --configuration Debug --framework net10.0

0 commit comments

Comments
 (0)