Skip to content

Commit 2dc919d

Browse files
authored
Merge pull request #2687 from Cratis:fix/references
Getting rid of DotNET.InProcess - as we don't support it in the form it was in anyways. WIll be brought back later
2 parents 6795564 + 4996fce commit 2dc919d

15 files changed

+95
-286
lines changed

Chronicle.slnx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
<Project Path="Source/Clients/DotNET/DotNET.csproj" />
99
<Project Path="Source/Clients/DotNET.CodeAnalysis/DotNET.CodeAnalysis.csproj" />
1010
<Project Path="Source/Clients/DotNET.CodeAnalysis.Specs/DotNET.CodeAnalysis.Specs.csproj" />
11-
<Project Path="Source/Clients/DotNET.InProcess/DotNET.InProcess.csproj" />
12-
<Project Path="Source/Clients/DotNET.InProcess.Specs/DotNET.InProcess.Specs.csproj" />
1311
<Project Path="Source/Clients/DotNET.Specs/DotNET.Specs.csproj" />
1412
<Project Path="Source/Clients/Testing/Testing.csproj" />
1513
<Project Path="Source/Clients/Workbench/Workbench.csproj" />

Integration/DotNET.InProcess/DotNET.InProcess.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<ItemGroup>
99
<ProjectReference Include="../../Source/Clients/AspNetCore/AspNetCore.csproj" />
1010
<ProjectReference Include="../../Source/Clients/Connections/Connections.csproj" />
11-
<ProjectReference Include="../../Source/Clients/DotNET.InProcess/DotNET.InProcess.csproj" />
1211
<ProjectReference Include="../../Source/Kernel/Storage.MongoDB/Storage.MongoDB.csproj" />
1312
<ProjectReference Include="../../Source/Kernel/Core/Core.csproj" />
1413
<ProjectReference Include="../../Source/Kernel/Concepts/Concepts.csproj" />

Source/Clients/DotNET.InProcess.Specs/DotNET.InProcess.Specs.csproj

Lines changed: 0 additions & 16 deletions
This file was deleted.

Source/Clients/DotNET.InProcess/ChronicleClientSiloBuilderExtensions.cs

Lines changed: 0 additions & 153 deletions
This file was deleted.

Source/Clients/DotNET.InProcess/ChronicleOrleansInProcessOptions.cs

Lines changed: 0 additions & 29 deletions
This file was deleted.

Source/Clients/DotNET.InProcess/DotNET.InProcess.csproj

Lines changed: 0 additions & 58 deletions
This file was deleted.

Source/Clients/DotNET.InProcess/ChronicleConnection.cs renamed to Source/Clients/XUnit.Integration/ChronicleConnection.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
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+
extern alias KernelCore;
5+
46
using System.Diagnostics;
57
using Cratis.Chronicle.Connections;
68
using Cratis.Chronicle.Contracts;
79
using Cratis.Chronicle.Contracts.Clients;
810
using Microsoft.Extensions.Logging;
11+
using ConnectionService = KernelCore::Cratis.Chronicle.Services.Clients.ConnectionService;
912

10-
namespace Cratis.Chronicle.InProcess;
13+
namespace Cratis.Chronicle.XUnit.Integration;
1114

1215
/// <summary>
1316
/// Represents an implementation of <see cref="IChronicleConnection"/> for Orleans in-process.
@@ -24,7 +27,7 @@ internal class ChronicleConnection(
2427
ILoggerFactory loggerFactory) : IChronicleConnection, IChronicleServicesAccessor
2528
{
2629
IServices? _services;
27-
Services.Clients.ConnectionService? _connectionService;
30+
ConnectionService? _connectionService;
2831

2932
/// <inheritdoc/>
3033
IConnectionLifecycle IChronicleConnection.Lifecycle => lifecycle;
@@ -67,7 +70,7 @@ async Task ConnectIfNotConnected()
6770

6871
async Task Connect()
6972
{
70-
_connectionService = new Services.Clients.ConnectionService(grainFactory, loggerFactory.CreateLogger<Services.Clients.ConnectionService>());
73+
_connectionService = new ConnectionService(grainFactory, loggerFactory.CreateLogger<ConnectionService>());
7174
_connectionService.Connect(new()
7275
{
7376
ConnectionId = lifecycle.ConnectionId,

0 commit comments

Comments
 (0)