From 5a77675396add91347e2d67d6217e3c6e2770587 Mon Sep 17 00:00:00 2001
From: Daniel Cazzulino <daniel@cazzulino.com>
Date: Fri, 14 Jun 2024 09:37:39 -0300
Subject: [PATCH] Consolidate on Orleans 8.1.0

---
 src/CloudActors.Orleans/CloudActors.Orleans.csproj        | 4 ++--
 src/CloudActors.Package/CloudActors.Package.msbuildproj   | 2 +-
 .../CloudActors.Streamstone.csproj                        | 3 +--
 .../StreamstoneSiloBuilderExtensions.cs                   | 8 ++------
 src/CloudActors/CloudActors.csproj                        | 1 -
 src/Tests/OrleansTest.cs                                  | 5 -----
 src/Tests/Tests.csproj                                    | 5 ++---
 7 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/CloudActors.Orleans/CloudActors.Orleans.csproj b/src/CloudActors.Orleans/CloudActors.Orleans.csproj
index b296ade..b927ee4 100644
--- a/src/CloudActors.Orleans/CloudActors.Orleans.csproj
+++ b/src/CloudActors.Orleans/CloudActors.Orleans.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <AssemblyName>Devlooped.CloudActors.Orleans</AssemblyName>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="NuGetizer" Version="1.2.2" />
-    <PackageReference Include="Microsoft.Orleans.Server" Version="7.2.6" />
+    <PackageReference Include="Microsoft.Orleans.Server" Version="8.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/CloudActors.Package/CloudActors.Package.msbuildproj b/src/CloudActors.Package/CloudActors.Package.msbuildproj
index acd4825..127a3b0 100644
--- a/src/CloudActors.Package/CloudActors.Package.msbuildproj
+++ b/src/CloudActors.Package/CloudActors.Package.msbuildproj
@@ -6,7 +6,7 @@
     <PackageTags>dotnet orleans actor</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NuGetizer" Version="1.2.0" />
+    <PackageReference Include="NuGetizer" Version="1.2.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CloudActors.CodeAnaysis\CloudActors.CodeAnaysis.csproj" />
diff --git a/src/CloudActors.Streamstone/CloudActors.Streamstone.csproj b/src/CloudActors.Streamstone/CloudActors.Streamstone.csproj
index ce5514f..d9ec9b5 100644
--- a/src/CloudActors.Streamstone/CloudActors.Streamstone.csproj
+++ b/src/CloudActors.Streamstone/CloudActors.Streamstone.csproj
@@ -10,14 +10,13 @@
 
   <ItemGroup>
     <PackageReference Include="Devlooped.CloudStorageAccount" Version="1.2.0" />
-    <PackageReference Include="Microsoft.Orleans.Runtime" Version="7.2.6" />
+    <PackageReference Include="Microsoft.Orleans.Runtime" Version="8.1.0" />
     <PackageReference Include="NuGetizer" Version="1.2.2" />
     <PackageReference Include="Streamstone" Version="3.0.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\CloudActors.Package\CloudActors.Package.msbuildproj" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\CloudActors.Streamstone.CodeAnalysis\CloudActors.Streamstone.CodeAnalysis.csproj" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\CloudActors\CloudActors.csproj" Pack="false" />
   </ItemGroup>
 
diff --git a/src/CloudActors.Streamstone/StreamstoneSiloBuilderExtensions.cs b/src/CloudActors.Streamstone/StreamstoneSiloBuilderExtensions.cs
index d722a71..2028693 100644
--- a/src/CloudActors.Streamstone/StreamstoneSiloBuilderExtensions.cs
+++ b/src/CloudActors.Streamstone/StreamstoneSiloBuilderExtensions.cs
@@ -7,6 +7,7 @@
 using Microsoft.Extensions.Options;
 using Orleans.Providers;
 using Orleans.Runtime;
+using Orleans.Runtime.Hosting;
 using Orleans.Storage;
 
 namespace Orleans.Hosting;
@@ -49,12 +50,7 @@ internal static IServiceCollection AddStreamstoneActorStorage(
         if (configure is not null)
             services.AddOptions<StreamstoneOptions>(name).Configure(configure);
 
-        if (string.Equals(name, ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME, StringComparison.Ordinal))
-        {
-            services.TryAddSingleton(sp => sp.GetServiceByName<IGrainStorage>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME));
-        }
-
-        return services.AddSingletonNamedService<IGrainStorage>(name, (sp, name) =>
+        return services.AddGrainStorage(name, (sp, name) =>
         {
             var snapshot = sp.GetRequiredService<IOptionsMonitor<StreamstoneOptions>>();
             return new StreamstoneStorage(sp.GetRequiredService<CloudStorageAccount>(), snapshot.Get(name));
diff --git a/src/CloudActors/CloudActors.csproj b/src/CloudActors/CloudActors.csproj
index 00a6a7e..7ca07c7 100644
--- a/src/CloudActors/CloudActors.csproj
+++ b/src/CloudActors/CloudActors.csproj
@@ -7,7 +7,6 @@
 
   <ItemGroup>
     <PackageReference Include="NuGetizer" Version="1.2.2" />
-    <PackageReference Include="Microsoft.Orleans.Serialization.Abstractions" Version="8.1.0" />
     <PackageReference Include="PolySharp" PrivateAssets="All" Version="1.14.1" />
   </ItemGroup>
 
diff --git a/src/Tests/OrleansTest.cs b/src/Tests/OrleansTest.cs
index 1c3d0aa..2e78a2b 100644
--- a/src/Tests/OrleansTest.cs
+++ b/src/Tests/OrleansTest.cs
@@ -70,11 +70,6 @@ class MemoryStorage : IGrainStorage
     {
         ConcurrentDictionary<GrainId, object> memory = new();
 
-        public MemoryStorage()
-        {
-
-        }
-
         public Task ClearStateAsync<T>(string stateName, GrainId grainId, IGrainState<T> grainState)
             => memory.TryRemove(grainId, out _) ? Task.CompletedTask : Task.CompletedTask;
 
diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
index 608f534..26c39ec 100644
--- a/src/Tests/Tests.csproj
+++ b/src/Tests/Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -13,8 +13,7 @@
     <PackageReference Include="xunit" Version="2.8.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.2" />
-    <PackageReference Include="Microsoft.Orleans.Client" Version="8.1.0" />
-    <PackageReference Include="Microsoft.Orleans.Server" Version="7.2.6" />
+    <PackageReference Include="Microsoft.Orleans.Server" Version="8.1.0" />
   </ItemGroup>
 
   <ItemGroup>