net9-update-refactorings #1

Merged
michael merged 17 commits from net9-update-refactorings into master 2025-01-30 06:33:51 +00:00
18 changed files with 20 additions and 36 deletions
Showing only changes of commit b3035f5a1f - Show all commits

View File

@ -14,7 +14,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Provider\Provider.csproj" /> <ProjectReference Include="..\Provider\Universley.OrleansContrib.StreamsProvider.Redis.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -2,9 +2,8 @@
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Orleans.Configuration; using Orleans.Configuration;
using Orleans.Runtime;
using Provider;
using StackExchange.Redis; using StackExchange.Redis;
using Universley.OrleansContrib.StreamsProvider.Redis;
using IHost host = new HostBuilder() using IHost host = new HostBuilder()
.UseOrleansClient(clientBuilder => .UseOrleansClient(clientBuilder =>

View File

@ -1,10 +1,9 @@
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Orleans.Runtime;
using Orleans.Streams; using Orleans.Streams;
using StackExchange.Redis; using StackExchange.Redis;
using System.Text.Json; using System.Text.Json;
namespace Provider namespace Universley.OrleansContrib.StreamsProvider.Redis
{ {
public class RedisStreamAdapter : IQueueAdapter public class RedisStreamAdapter : IQueueAdapter
{ {

View File

@ -1,9 +1,8 @@
using Orleans.Runtime; using Orleans.Streams;
using Orleans.Streams;
using StackExchange.Redis; using StackExchange.Redis;
using System.Text.Json; using System.Text.Json;
namespace Provider namespace Universley.OrleansContrib.StreamsProvider.Redis
{ {
public class RedisStreamBatchContainer : IBatchContainer public class RedisStreamBatchContainer : IBatchContainer
{ {

View File

@ -5,7 +5,7 @@ using Orleans.Providers.Streams.Common;
using Orleans.Streams; using Orleans.Streams;
using StackExchange.Redis; using StackExchange.Redis;
namespace Provider namespace Universley.OrleansContrib.StreamsProvider.Redis
{ {
public class RedisStreamFactory : IQueueAdapterFactory public class RedisStreamFactory : IQueueAdapterFactory
{ {

View File

@ -1,8 +1,7 @@
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Orleans.Runtime;
using Orleans.Streams; using Orleans.Streams;
namespace Provider namespace Universley.OrleansContrib.StreamsProvider.Redis
{ {
public class RedisStreamFailureHandler : IStreamFailureHandler public class RedisStreamFailureHandler : IStreamFailureHandler
{ {

View File

@ -3,7 +3,7 @@ using Orleans.Streams;
using StackExchange.Redis; using StackExchange.Redis;
namespace Provider namespace Universley.OrleansContrib.StreamsProvider.Redis
{ {
public class RedisStreamReceiver : IQueueAdapterReceiver public class RedisStreamReceiver : IQueueAdapterReceiver
{ {

View File

@ -1,7 +1,7 @@
using Orleans.Streams; using Orleans.Streams;
using StackExchange.Redis; using StackExchange.Redis;
namespace Provider namespace Universley.OrleansContrib.StreamsProvider.Redis
{ {
[GenerateSerializer] [GenerateSerializer]
public class RedisStreamSequenceToken : StreamSequenceToken public class RedisStreamSequenceToken : StreamSequenceToken

View File

@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\Server.csp
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "Client\Client.csproj", "{B7477618-DE9C-4586-98D2-46CFF1CB0C74}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "Client\Client.csproj", "{B7477618-DE9C-4586-98D2-46CFF1CB0C74}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Provider", "Provider\Provider.csproj", "{70F8E685-F662-4225-A60C-D318E0C6ED18}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Universley.OrleansContrib.StreamsProvider.Redis", "Provider\Universley.OrleansContrib.StreamsProvider.Redis.csproj", "{70F8E685-F662-4225-A60C-D318E0C6ED18}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedisStreamsProvider.UnitTests", "RedisStreamsProvider.UnitTests\RedisStreamsProvider.UnitTests.csproj", "{DF927C2B-A141-4476-86CF-3B4DC8ECB4DE}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedisStreamsProvider.UnitTests", "RedisStreamsProvider.UnitTests\RedisStreamsProvider.UnitTests.csproj", "{DF927C2B-A141-4476-86CF-3B4DC8ECB4DE}"
EndProject EndProject

View File

@ -2,11 +2,8 @@ using Moq;
using StackExchange.Redis; using StackExchange.Redis;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Orleans.Streams; using Orleans.Streams;
using Xunit;
using Provider;
using System.Collections.Generic;
using System.Threading.Tasks;
using Orleans.Configuration; using Orleans.Configuration;
using Universley.OrleansContrib.StreamsProvider.Redis;
namespace RedisStreamsProvider.UnitTests namespace RedisStreamsProvider.UnitTests
{ {

View File

@ -1,7 +1,6 @@
using Provider;
using StackExchange.Redis; using StackExchange.Redis;
using System.Text.Json; using System.Text.Json;
using Xunit; using Universley.OrleansContrib.StreamsProvider.Redis;
namespace RedisStreamsProvider.UnitTests namespace RedisStreamsProvider.UnitTests
{ {

View File

@ -1,12 +1,10 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Moq; using Moq;
using Orleans.Configuration; using Orleans.Configuration;
using Orleans.Providers.Streams.Common; using Orleans.Providers.Streams.Common;
using Orleans.Streams; using Orleans.Streams;
using Provider;
using StackExchange.Redis; using StackExchange.Redis;
using Xunit; using Universley.OrleansContrib.StreamsProvider.Redis;
namespace RedisStreamsProvider.UnitTests namespace RedisStreamsProvider.UnitTests
{ {

View File

@ -1,12 +1,8 @@
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Moq; using Moq;
using Orleans.Streams; using Orleans.Streams;
using Provider;
using StackExchange.Redis; using StackExchange.Redis;
using System; using Universley.OrleansContrib.StreamsProvider.Redis;
using System.Collections.Generic;
using System.Threading.Tasks;
using Xunit;
namespace RedisStreamsProvider.UnitTests namespace RedisStreamsProvider.UnitTests
{ {

View File

@ -1,9 +1,7 @@
using Xunit; using StackExchange.Redis;
using StackExchange.Redis;
using Provider;
using Orleans.Streams; using Orleans.Streams;
using System;
using Moq; using Moq;
using Universley.OrleansContrib.StreamsProvider.Redis;
namespace Provider.Tests namespace Provider.Tests
{ {

View File

@ -16,7 +16,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Provider\Provider.csproj" /> <ProjectReference Include="..\Provider\Universley.OrleansContrib.StreamsProvider.Redis.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -2,9 +2,9 @@
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Orleans.Configuration; using Orleans.Configuration;
using Orleans.Runtime;
using Orleans.Streams; using Orleans.Streams;
using StackExchange.Redis; using StackExchange.Redis;
using Universley.OrleansContrib.StreamsProvider.Redis;
var builder = new HostBuilder() var builder = new HostBuilder()
.UseOrleans(silo => .UseOrleans(silo =>
@ -16,7 +16,7 @@ var builder = new HostBuilder()
}); });
silo.ConfigureLogging(logging => logging.AddConsole()); silo.ConfigureLogging(logging => logging.AddConsole());
silo.AddMemoryGrainStorage("PubSubStore"); silo.AddMemoryGrainStorage("PubSubStore");
silo.AddPersistentStreams("RedisStream", Provider.RedisStreamFactory.Create, null); silo.AddPersistentStreams("RedisStream", RedisStreamFactory.Create, null);
silo.AddMemoryGrainStorageAsDefault(); silo.AddMemoryGrainStorageAsDefault();
}).UseConsoleLifetime(); }).UseConsoleLifetime();
builder.ConfigureServices(services => builder.ConfigureServices(services =>

View File

@ -14,7 +14,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Provider\Provider.csproj" /> <ProjectReference Include="..\Provider\Universley.OrleansContrib.StreamsProvider.Redis.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>