Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump the orleans group with 4 updates #53

Merged
merged 2 commits into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/CloudActors.Orleans/CloudActors.Orleans.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/CloudActors.Package/CloudActors.Package.msbuildproj
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
3 changes: 1 addition & 2 deletions src/CloudActors.Streamstone/CloudActors.Streamstone.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@

<ItemGroup>
<PackageReference Include="Devlooped.CloudStorageAccount" Version="1.2.0" />
<PackageReference Include="Microsoft.Orleans.Runtime" Version="7.2.1" />
<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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Microsoft.Extensions.Options;
using Orleans.Providers;
using Orleans.Runtime;
using Orleans.Runtime.Hosting;
using Orleans.Storage;

namespace Orleans.Hosting;
Expand Down Expand Up @@ -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));
Expand Down
1 change: 0 additions & 1 deletion src/CloudActors/CloudActors.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

<ItemGroup>
<PackageReference Include="NuGetizer" Version="1.2.2" />
<PackageReference Include="Microsoft.Orleans.Serialization.Abstractions" Version="7.2.1" />
<PackageReference Include="PolySharp" PrivateAssets="All" Version="1.14.1" />
</ItemGroup>

Expand Down
5 changes: 0 additions & 5 deletions src/Tests/OrleansTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
7 changes: 3 additions & 4 deletions src/Tests/Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
Expand All @@ -8,13 +8,12 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Microsoft.Orleans.TestingHost" Version="7.2.1" />
<PackageReference Include="Microsoft.Orleans.TestingHost" Version="8.1.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<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="7.2.1" />
<PackageReference Include="Microsoft.Orleans.Server" Version="7.2.6" />
<PackageReference Include="Microsoft.Orleans.Server" Version="8.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading