Upgrade OrleansTestKit to Orleans 10.0.0 and version 10.0.0

Author: jacoblu

src/OrleansTestKit/OrleansTestKit.csproj

@@ -15,7 +15,7 @@
     <PackageTags>Orleans Cloud-Computing Actor-Model Actors Distributed-Systems C# .NET Test Testing</PackageTags>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Version>9.0.0</Version>
+    <Version>10.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -27,9 +27,9 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Orleans.Reminders" Version="9.2.1" />
-    <PackageReference Include="Microsoft.Orleans.Streaming" Version="9.2.1" />
-    <PackageReference Include="Microsoft.Orleans.Runtime" Version="9.2.1" />
+    <PackageReference Include="Microsoft.Orleans.Reminders" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Streaming" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Orleans.Runtime" Version="10.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

src/OrleansTestKit/TestGrainActivationContext.cs

@@ -1,10 +1,6 @@
-using Orleans.Runtime;
+namespace Orleans.TestKit;
 
-namespace Orleans.TestKit;
-
-/// <summary>
-/// Grain context used for tests.
-/// </summary>
+/// <summary>Grain context used for tests.</summary>
 public sealed class TestGrainActivationContext : IGrainContext
 {
     /// <inheritdoc/>
@@ -27,14 +23,10 @@ public sealed class TestGrainActivationContext : IGrainContext
     /// <inheritdoc/>
     public object GrainInstance { get; set; } = default!;
 
-    public void Migrate(Dictionary<string, object>? requestContext, CancellationToken cancellationToken = new CancellationToken()) => throw new NotImplementedException();
-
     /// <inheritdoc/>
     public GrainReference GrainReference { get; set; } = default!;
 
-    /// <summary>
-    /// Gets or sets the grain type used for this test context.
-    /// </summary>
+    /// <summary>Gets or sets the grain type used for this test context.</summary>
     public Type GrainType { get; set; } = default!;
 
     /// <inheritdoc/>
@@ -46,28 +38,36 @@ public sealed class TestGrainActivationContext : IGrainContext
     /// <inheritdoc/>
     public void Activate(Dictionary<string, object> requestContext, CancellationToken? cancellationToken = null) => throw new NotImplementedException();
 
+    public void Activate(Dictionary<string, object>? requestContext, CancellationToken cancellationToken = new CancellationToken()) => throw new NotImplementedException();
+
     /// <inheritdoc/>
     public void Deactivate(DeactivationReason deactivationReason, CancellationToken? cancellationToken = null) => throw new NotImplementedException();
 
+    public void Deactivate(DeactivationReason deactivationReason, CancellationToken cancellationToken = new CancellationToken()) => throw new NotImplementedException();
+
     /// <inheritdoc/>
     public bool Equals(IGrainContext? other) => ReferenceEquals(this, other);
 
     /// <inheritdoc/>
     public TComponent GetComponent<TComponent>() where TComponent : class => throw new NotImplementedException();
 
+    /// <inheritdoc/>
+    public object? GetComponent(Type componentType) => throw new NotImplementedException();
+
     /// <inheritdoc/>
     public TTarget GetTarget<TTarget>() where TTarget : class => throw new NotImplementedException();
 
+    /// <inheritdoc/>
+    public object? GetTarget() => throw new NotImplementedException();
+
+    public void Migrate(Dictionary<string, object>? requestContext, CancellationToken cancellationToken = new CancellationToken()) => throw new NotImplementedException();
+
     /// <inheritdoc/>
     public void Migrate(Dictionary<string, object> requestContext, CancellationToken? cancellationToken = null) => throw new NotImplementedException();
 
     /// <inheritdoc/>
     public void ReceiveMessage(object message) => throw new NotImplementedException();
 
-    public void Activate(Dictionary<string, object>? requestContext, CancellationToken cancellationToken = new CancellationToken()) => throw new NotImplementedException();
-
-    public void Deactivate(DeactivationReason deactivationReason, CancellationToken cancellationToken = new CancellationToken()) => throw new NotImplementedException();
-
     /// <inheritdoc/>
     public void Rehydrate(IRehydrationContext context) => throw new NotImplementedException();
 

src/OrleansTestKit/TestGrainFactory.cs

@@ -1,5 +1,4 @@
 using Moq;
-using Orleans.Runtime;
 
 namespace Orleans.TestKit;
 
@@ -70,8 +69,14 @@ public IGrain GetGrain(Type grainInterfaceType, Guid grainPrimaryKey, string key
     public IGrain GetGrain(Type grainInterfaceType, long grainPrimaryKey, string keyExtension) =>
         GetProbe(grainInterfaceType, GrainIdKeyExtensions.CreateIntegerKey(grainPrimaryKey, keyExtension), null);
 
+    public IAddressable GetGrain(Type interfaceType, IdSpan grainKey, string grainClassNamePrefix) =>
+        GetProbe(interfaceType, grainKey, grainClassNamePrefix);
+
+    public IAddressable GetGrain(Type interfaceType, IdSpan grainKey) =>
+        GetProbe(interfaceType, grainKey, null);
+
     internal Mock<T> AddProbe<T>(IdSpan identity, string? grainClassNamePrefix = null)
-        where T : class, IGrain
+                where T : class, IGrain
     {
         var key = GetKey(identity, typeof(T), grainClassNamePrefix);
         var mock = new Mock<T>();

test/OrleansTestKit.Tests/OrleansTestKit.Tests.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="FluentAssertions" Version="7.2.0" />
     <PackageReference Include="Microsoft.CodeCoverage" Version="17.14.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="Microsoft.Orleans.Sdk" Version="9.2.1" />
+    <PackageReference Include="Microsoft.Orleans.Sdk" Version="10.0.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.10" />