From a72c67ee6f51c0c4301df65e0d1c9ef42cc24756 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 12:16:22 +0000 Subject: [PATCH 1/2] Bump the orleans group with 4 updates Bumps the orleans group with 6 updates: | Package | From | To | | --- | --- | --- | | [Microsoft.Orleans.Runtime](https://github.com/dotnet/orleans) | `7.2.1` | `7.2.6` | | [Microsoft.Orleans.Serialization.Abstractions](https://github.com/dotnet/orleans) | `7.2.1` | `7.2.6` | | [Microsoft.Orleans.Serialization.Abstractions](https://github.com/dotnet/orleans) | `7.2.1` | `8.1.0` | | [Microsoft.Orleans.Client](https://github.com/dotnet/orleans) | `7.2.1` | `8.1.0` | | [Microsoft.Orleans.TestingHost](https://github.com/dotnet/orleans) | `7.2.1` | `8.1.0` | | [Microsoft.Orleans.Runtime](https://github.com/dotnet/orleans) | `7.2.1` | `8.1.0` | Updates `Microsoft.Orleans.Runtime` from 7.2.1 to 7.2.6 - [Release notes](https://github.com/dotnet/orleans/releases) - [Commits](https://github.com/dotnet/orleans/compare/v7.2.1...v7.2.6) Updates `Microsoft.Orleans.Serialization.Abstractions` from 7.2.1 to 7.2.6 - [Release notes](https://github.com/dotnet/orleans/releases) - [Commits](https://github.com/dotnet/orleans/compare/v7.2.1...v7.2.6) Updates `Microsoft.Orleans.Serialization.Abstractions` from 7.2.1 to 8.1.0 - [Release notes](https://github.com/dotnet/orleans/releases) - [Commits](https://github.com/dotnet/orleans/compare/v7.2.1...v7.2.6) Updates `Microsoft.Orleans.Client` from 7.2.1 to 8.1.0 - [Release notes](https://github.com/dotnet/orleans/releases) - [Commits](https://github.com/dotnet/orleans/compare/v7.2.1...v8.1.0) Updates `Microsoft.Orleans.Serialization.Abstractions` from 7.2.1 to 8.1.0 - [Release notes](https://github.com/dotnet/orleans/releases) - [Commits](https://github.com/dotnet/orleans/compare/v7.2.1...v7.2.6) Updates `Microsoft.Orleans.TestingHost` from 7.2.1 to 8.1.0 - [Release notes](https://github.com/dotnet/orleans/releases) - [Commits](https://github.com/dotnet/orleans/compare/v7.2.1...v8.1.0) Updates `Microsoft.Orleans.Runtime` from 7.2.1 to 8.1.0 - [Release notes](https://github.com/dotnet/orleans/releases) - [Commits](https://github.com/dotnet/orleans/compare/v7.2.1...v7.2.6) Updates `Microsoft.Orleans.Serialization.Abstractions` from 7.2.1 to 8.1.0 - [Release notes](https://github.com/dotnet/orleans/releases) - [Commits](https://github.com/dotnet/orleans/compare/v7.2.1...v7.2.6) --- updated-dependencies: - dependency-name: Microsoft.Orleans.Runtime dependency-type: direct:production update-type: version-update:semver-patch dependency-group: orleans - dependency-name: Microsoft.Orleans.Serialization.Abstractions dependency-type: direct:production update-type: version-update:semver-patch dependency-group: orleans - dependency-name: Microsoft.Orleans.Serialization.Abstractions dependency-type: direct:production update-type: version-update:semver-major dependency-group: orleans - dependency-name: Microsoft.Orleans.Client dependency-type: direct:production update-type: version-update:semver-major dependency-group: orleans - dependency-name: Microsoft.Orleans.Serialization.Abstractions dependency-type: direct:production update-type: version-update:semver-major dependency-group: orleans - dependency-name: Microsoft.Orleans.TestingHost dependency-type: direct:production update-type: version-update:semver-major dependency-group: orleans - dependency-name: Microsoft.Orleans.Runtime dependency-type: direct:production update-type: version-update:semver-major dependency-group: orleans - dependency-name: Microsoft.Orleans.Serialization.Abstractions dependency-type: direct:production update-type: version-update:semver-major dependency-group: orleans ... Signed-off-by: dependabot[bot] --- src/CloudActors.Streamstone/CloudActors.Streamstone.csproj | 2 +- src/CloudActors/CloudActors.csproj | 2 +- src/Tests/Tests.csproj | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CloudActors.Streamstone/CloudActors.Streamstone.csproj b/src/CloudActors.Streamstone/CloudActors.Streamstone.csproj index e02322e..ce5514f 100644 --- a/src/CloudActors.Streamstone/CloudActors.Streamstone.csproj +++ b/src/CloudActors.Streamstone/CloudActors.Streamstone.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/CloudActors/CloudActors.csproj b/src/CloudActors/CloudActors.csproj index 9fea2f2..00a6a7e 100644 --- a/src/CloudActors/CloudActors.csproj +++ b/src/CloudActors/CloudActors.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj index a9dc590..608f534 100644 --- a/src/Tests/Tests.csproj +++ b/src/Tests/Tests.csproj @@ -8,12 +8,12 @@ - + - + From 4ac72135b77af719cf5beb3a1508282e5417d576 Mon Sep 17 00:00:00 2001 From: Daniel Cazzulino Date: Fri, 14 Jun 2024 09:37:39 -0300 Subject: [PATCH 2/2] 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 @@ Devlooped.CloudActors.Orleans - net7.0 + net8.0 - + 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 @@ dotnet orleans actor - + 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 @@ - + - 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(name).Configure(configure); - if (string.Equals(name, ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME, StringComparison.Ordinal)) - { - services.TryAddSingleton(sp => sp.GetServiceByName(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME)); - } - - return services.AddSingletonNamedService(name, (sp, name) => + return services.AddGrainStorage(name, (sp, name) => { var snapshot = sp.GetRequiredService>(); return new StreamstoneStorage(sp.GetRequiredService(), 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 @@ - 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 memory = new(); - public MemoryStorage() - { - - } - public Task ClearStateAsync(string stateName, GrainId grainId, IGrainState 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 @@ - + net8.0 @@ -13,8 +13,7 @@ - - +