Skip to content
This repository was archived by the owner on Aug 20, 2024. It is now read-only.

Commit f8665d7

Browse files
ArkatufusArkatufus
authored
Update solution to latest (#88)
* Update solution to latest * Fix package mapping
1 parent cf7fa53 commit f8665d7

19 files changed

+211
-210
lines changed

‎NuGet.config

+12-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,19 @@
44
<add key="disableSourceControlIntegration" value="true" />
55
</solution>
66
<packageSources>
7-
<clear />
87
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
98
<add key="akka-nightly" value="https://f.feedz.io/akkadotnet/akka/nuget/index.json" />
109
</packageSources>
10+
11+
<packageSourceMapping>
12+
<packageSource key="nuget.org">
13+
<package pattern="*"/>
14+
</packageSource>
15+
<packageSource key="akka-nightly">
16+
<package pattern="*"/>
17+
</packageSource>
18+
<packageSource key="Phobos">
19+
<package pattern="Phobos.*"/>
20+
</packageSource>
21+
</packageSourceMapping>
1122
</configuration>

‎build/Build.CI.GitHubActions.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
OnPullRequestBranches = new[] { "master", "dev" },
1818
InvokedTargets = new[] { nameof(All) },
1919
PublishArtifacts = true,
20-
EnableGitHubContext = true)
20+
EnableGitHubToken = true)
2121
]
2222

2323
[CustomGitHubActions("Docker_build",
@@ -28,7 +28,7 @@
2828
InvokedTargets = new[] { nameof(Docker) },
2929
ImportSecrets = new [] { "Docker_Username", "Docker_Password" },
3030
PublishArtifacts = true,
31-
EnableGitHubContext = true)
31+
EnableGitHubToken = true)
3232
]
3333
[CustomGitHubActions("Windows_release",
3434
GitHubActionsImage.WindowsLatest,
@@ -37,7 +37,7 @@
3737
InvokedTargets = new[] { nameof(Nuget) },
3838
ImportSecrets = new[] { "Nuget_Key", "GITHUB_TOKEN" },
3939
PublishArtifacts = true,
40-
EnableGitHubContext = true)
40+
EnableGitHubToken = true)
4141
]
4242

4343
partial class Build

‎build/Build.cs

+5-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
using Octokit;
2727
using Nuke.Common.Utilities;
2828

29-
[CheckBuildProjectConfigurations]
3029
[ShutdownDotNetAfterServerBuild]
3130
partial class Build : NukeBuild
3231
{
@@ -311,11 +310,14 @@ partial class Build : NukeBuild
311310
.DependsOn(Compile)
312311
.Executes(() =>
313312
{
314-
var projects = Solution.GetProjects("*.Tests");
313+
var projects = Solution.GetAllProjects("*.Tests");
315314
foreach (var project in projects)
316315
{
316+
var frameworks = project.GetTargetFrameworks();
317+
if(frameworks is null)
318+
continue;
317319
Information($"Running tests from {project}");
318-
foreach (var fw in project.GetTargetFrameworks())
320+
foreach (var fw in frameworks)
319321
{
320322
Information($"Running for {project} ({fw}) ...");
321323
DotNetTest(c => c

‎build/_build.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="docfx.console" Version="2.59.2" ExcludeAssets="build"/>
15-
<PackageReference Include="Nuke.Common" Version="6.0.1" />
14+
<PackageReference Include="docfx.console" Version="2.59.4" ExcludeAssets="build" />
15+
<PackageReference Include="Nuke.Common" Version="7.0.5" />
1616
<PackageDownload Include="SignClient" Version="[1.3.155]" />
1717
</ItemGroup>
1818
</Project>

‎k8s/local/environment/configs/configs.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ data:
88
ASPNETCORE_ENVIRONMENT: Production
99

1010
# standard Akka.NET ports for all services
11-
StressOptions__AkkaClusterOptions__ManagementPort: "9221"
1211
StressOptions__AkkaClusterOptions__ManagementPort: "9228"
1312
StressOptions__AkkaClusterOptions__UseKubernetesLease: "true"
1413

‎k8s/local/environment/jaeger.all-in-one.yaml

+10-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ items:
4747
image: jaegertracing/all-in-one
4848
name: jaeger
4949
ports:
50-
- containerPort: 5775
51-
protocol: UDP
5250
- containerPort: 6831
5351
protocol: UDP
5452
- containerPort: 6832
@@ -57,6 +55,16 @@ items:
5755
protocol: TCP
5856
- containerPort: 16686
5957
protocol: TCP
58+
- containerPort: 4317
59+
protocol: TCP
60+
- containerPort: 4318
61+
protocol: TCP
62+
- containerPort: 14250
63+
protocol: TCP
64+
- containerPort: 14268
65+
protocol: TCP
66+
- containerPort: 14269
67+
protocol: TCP
6068
- containerPort: 9411
6169
protocol: TCP
6270
readinessProbe:

‎k8s/local/services/local-services.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ spec:
7878
emptyDir: {}
7979
containers:
8080
- name: frontend
81-
image: akkadotnet.frontend:0.6.2
81+
image: akkadotnet.frontend:0.6.4
8282
env:
8383
- name: POD_NAME
8484
valueFrom:

‎src/Directory.Build.props

+5-11
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,10 @@
1717
</ItemGroup>
1818
<PropertyGroup>
1919
<NetCoreFramework>net6.0</NetCoreFramework>
20-
<NBenchVersion>1.2.2</NBenchVersion>
21-
<XunitVersion>2.4.1</XunitVersion>
22-
<TestSdkVersion>17.1.0</TestSdkVersion>
23-
<AkkaVersion>1.4.48</AkkaVersion>
24-
<PbmVersion>1.0.2</PbmVersion>
25-
<AkkaHostingVersion>1.0.1</AkkaHostingVersion>
26-
<AkkaManagementVerison>1.0.0-beta2</AkkaManagementVerison>
27-
<FluentAssertionsVersion>6.6.0</FluentAssertionsVersion>
28-
<OTelVersion>1.2.0-rc5</OTelVersion>
29-
<OTelInstrumentationVersion>1.0.0-rc9.2</OTelInstrumentationVersion>
30-
<AkkaBootstrapDockerVersion>0.5.3</AkkaBootstrapDockerVersion>
20+
<AkkaVersion>1.5.12</AkkaVersion>
21+
<PbmVersion>1.3.2</PbmVersion>
22+
<AkkaHostingVersion>1.5.12.1</AkkaHostingVersion>
23+
<AkkaManagementVersion>1.5.7</AkkaManagementVersion>
24+
<OTelInstrumentationVersion>1.5.1-beta.1</OTelInstrumentationVersion>
3125
</PropertyGroup>
3226
</Project>

‎src/Directory.Packages.props

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<!-- Akka.NET Package Versions -->
6+
<ItemGroup>
7+
<PackageVersion Include="Akka" Version="$(AkkaVersion)" />
8+
<PackageVersion Include="Akka.Cluster.Hosting" Version="$(AkkaHostingVersion)" />
9+
<PackageVersion Include="Akka.Cluster.Sharding" Version="$(AkkaVersion)" />
10+
<PackageVersion Include="Akka.Coordination.KubernetesApi" Version="$(AkkaManagementVersion)" />
11+
<PackageVersion Include="Akka.Discovery" Version="$(AkkaVersion)" />
12+
<PackageVersion Include="Akka.Discovery.KubernetesApi" Version="$(AkkaManagementVersion)" />
13+
<PackageVersion Include="Akka.HealthCheck.Hosting.Web" Version="1.5.9" />
14+
<PackageVersion Include="Akka.Logger.Serilog" Version="1.5.12" />
15+
<PackageVersion Include="Akka.Management" Version="$(AkkaManagementVersion)" />
16+
<PackageVersion Include="Akka.Persistence.Azure" Version="1.5.1" />
17+
</ItemGroup>
18+
<!-- Phobos -->
19+
<ItemGroup>
20+
<PackageVersion Include="Phobos.Hosting" Version="2.4.1" />
21+
</ItemGroup>
22+
<!-- Petabridge.Cmd -->
23+
<ItemGroup>
24+
<PackageVersion Include="Petabridge.Cmd.Cluster" Version="$(PbmVersion)" />
25+
<PackageVersion Include="Petabridge.Cmd.Cluster.Sharding" Version="$(PbmVersion)" />
26+
<PackageVersion Include="Petabridge.Cmd.Remote" Version="$(PbmVersion)" />
27+
</ItemGroup>
28+
<!-- Serilog -->
29+
<ItemGroup>
30+
<PackageVersion Include="Serilog.Extensions.Hosting" Version="7.0.0" />
31+
<PackageVersion Include="Serilog.Sinks.Console" Version="4.1.0" />
32+
<PackageVersion Include="Serilog.Sinks.Seq" Version="5.2.2" />
33+
</ItemGroup>
34+
<!-- OpenTelemetry -->
35+
<ItemGroup>
36+
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.6.0" />
37+
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.6.0" />
38+
<PackageVersion Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.6.0-rc.1" />
39+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.6.0" />
40+
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="$(OTelInstrumentationVersion)" />
41+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="$(OTelInstrumentationVersion)" />
42+
</ItemGroup>
43+
<!-- Ms.Ext.Hosting -->
44+
<ItemGroup>
45+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
46+
</ItemGroup>
47+
<!-- Test infrastructure -->
48+
<ItemGroup>
49+
<PackageVersion Include="Akka.TestKit.XUnit2" Version="$(AkkaVersion)" />
50+
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
51+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
52+
<PackageVersion Include="xunit" Version="2.5.0" />
53+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
54+
</ItemGroup>
55+
</Project>

‎src/backend/AkkaDotNet.BackEnd/AkkaDotNet.BackEnd.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Serilog.Extensions.Hosting" Version="4.2.0" />
15+
<PackageReference Include="Serilog.Extensions.Hosting" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/backend/AkkaDotNet.BackEnd/Program.cs

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using System;
21
using Akka.Actor;
32
using Akka.Cluster.Hosting;
43
using Akka.Cluster.Sharding;
@@ -13,18 +12,14 @@
1312
using AkkaDotNet.Infrastructure.Sharding;
1413
using AkkaDotNet.Messages;
1514
using AkkaDotNet.Messages.Commands;
16-
using Microsoft.AspNetCore.Builder;
17-
using Microsoft.AspNetCore.Http;
18-
using Microsoft.Extensions.Configuration;
19-
using Microsoft.Extensions.Logging;
2015
using Serilog;
2116

2217
var builder = WebApplication.CreateBuilder(args);
2318
builder.Configuration.AddEnvironmentVariables();
2419

2520
builder.Logging.ClearProviders().AddConsole().AddSerilog().AddFilter(null, LogLevel.Warning);
2621

27-
var akkaConfiguration = builder.Configuration.GetRequiredSection(nameof(StressOptions)).Get<StressOptions>();
22+
var akkaConfiguration = builder.Configuration.GetRequiredSection(nameof(StressOptions)).Get<StressOptions>() ?? new StressOptions();
2823

2924
builder.Services.AddAkka(ActorSystemConstants.ActorSystemName, configurationBuilder =>
3025
{
@@ -58,8 +53,7 @@
5853

5954
}
6055
});
61-
62-
builder.Services.AddOpenTelemetry();
56+
builder.Services.WithOpenTelemetry();
6357

6458
var app = builder.Build();
6559

‎src/backend/AkkaDotNet.BackEnd/appsettings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"DispatcherConfig": "ChannelExecutor64",
2828
"PersistenceOptions": {
2929
"Enabled": false
30-
},
30+
}
3131
},
3232

3333
"Logging": {

‎src/frontend/AkkaDotNet.FrontEnd.Tests/AkkaDotNet.FrontEnd.Tests.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
9-
<PackageReference Include="xunit" Version="$(XunitVersion)" />
10-
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
11-
<PackageReference Include="Akka.TestKit.XUnit2" Version="$(AkkaVersion)" />
12-
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
9+
<PackageReference Include="xunit" />
10+
<PackageReference Include="xunit.runner.visualstudio" />
11+
<PackageReference Include="Akka.TestKit.XUnit2" />
12+
<PackageReference Include="FluentAssertions" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎src/frontend/AkkaDotNet.FrontEnd/AkkaDotNet.FrontEnd.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
13-
<PackageReference Include="Serilog.Extensions.Hosting" Version="4.2.0" />
12+
<PackageReference Include="Microsoft.Extensions.Hosting" />
13+
<PackageReference Include="Serilog.Extensions.Hosting" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎src/frontend/AkkaDotNet.FrontEnd/Program.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
var builder = WebApplication.CreateBuilder(args);
1212
builder.Configuration.AddEnvironmentVariables();
1313

14-
builder.Logging.ClearProviders().AddConsole().AddSerilog().AddFilter(null, LogLevel.Warning);;
14+
builder.Logging.ClearProviders().AddConsole().AddSerilog().AddFilter(null, LogLevel.Warning);
1515

16-
var akkaConfiguration = builder.Configuration.GetRequiredSection(nameof(StressOptions)).Get<StressOptions>();
16+
var akkaConfiguration = builder.Configuration.GetRequiredSection(nameof(StressOptions)).Get<StressOptions>() ?? new StressOptions();
1717

1818
builder.Services.AddAkka(ActorSystemConstants.ActorSystemName, configurationBuilder =>
1919
{
@@ -34,7 +34,7 @@
3434
}
3535
});
3636

37-
builder.Services.AddOpenTelemetry();
37+
builder.Services.WithOpenTelemetry();
3838

3939
var app = builder.Build();
4040

‎src/shared/AkkaDotNet.Infrastructure/AkkaDotNet.Infrastructure.csproj

+31-19
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,41 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Akka.Cluster.Hosting" Version="$(AkkaHostingVersion)" />
11-
<PackageReference Include="Akka.Cluster.Sharding" Version="$(AkkaVersion)" />
12-
<PackageReference Include="Akka.Discovery" Version="$(AkkaVersion)" />
13-
<PackageReference Include="Akka.Management" Version="$(AkkaManagementVerison)" />
14-
<PackageReference Include="Akka.Discovery.KubernetesApi" Version="$(AkkaManagementVerison)" />
15-
<PackageReference Include="Akka.Coordination.KubernetesApi" Version="$(AkkaManagementVerison)" />
16-
<PackageReference Include="Akka.Logger.Serilog" Version="1.4.42" />
17-
<PackageReference Include="Akka.Persistence.Azure" Version="0.8.3" />
18-
<PackageReference Include="Petabridge.Cmd.Cluster" Version="$(PbmVersion)" />
19-
<PackageReference Include="Petabridge.Cmd.Cluster.Sharding" Version="$(PbmVersion)" />
20-
<PackageReference Include="Petabridge.Cmd.Remote" Version="$(PbmVersion)" />
21-
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
22-
<PackageReference Include="Serilog.Sinks.Seq" Version="5.1.1" />
23-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="$(OTelInstrumentationVersion)" />
24-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="$(OTelInstrumentationVersion)" />
25-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="$(OTelInstrumentationVersion)" />
26-
<PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="$(OTelVersion)" />
27-
<PackageReference Include="OpenTelemetry.Exporter.Prometheus" Version="$(OTelVersion)" />
28-
<PackageReference Include="Phobos.Hosting" Version="2.1.0" />
10+
<PackageReference Include="Akka.Cluster.Hosting" />
11+
<PackageReference Include="Akka.Cluster.Sharding" />
12+
<PackageReference Include="Akka.Discovery" />
13+
<PackageReference Include="Akka.Management" />
14+
<PackageReference Include="Akka.Discovery.KubernetesApi" />
15+
<PackageReference Include="Akka.Coordination.KubernetesApi" />
16+
<PackageReference Include="Akka.Logger.Serilog" />
17+
<PackageReference Include="Akka.Persistence.Azure" />
18+
19+
<PackageReference Include="Petabridge.Cmd.Cluster" />
20+
<PackageReference Include="Petabridge.Cmd.Cluster.Sharding" />
21+
<PackageReference Include="Petabridge.Cmd.Remote" />
22+
23+
<PackageReference Include="Serilog.Sinks.Console" />
24+
<PackageReference Include="Serilog.Sinks.Seq" />
25+
26+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
27+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
28+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" />
29+
<PackageReference Include="OpenTelemetry.Exporter.Console" />
30+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
31+
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" />
32+
33+
<PackageReference Include="Phobos.Hosting" />
34+
35+
<PackageReference Include="Microsoft.Extensions.Hosting" />
2936
</ItemGroup>
3037

3138
<ItemGroup>
3239
<ProjectReference Include="..\AkkaDotNet.Messages\AkkaDotNet.Messages.csproj" />
3340
</ItemGroup>
41+
42+
<ItemGroup>
43+
<PackageVersion Update="Akka.Discovery" Version="1.5.12" />
44+
<PackageVersion Update="OpenTelemetry.Exporter.Console" Version="1.6.0" />
45+
</ItemGroup>
3446

3547
</Project>

0 commit comments

Comments
 (0)