Upgrade to Orleans 3.0.2

OrleansContrib · Dec 21, 2019 · f9db92c · f9db92c
1 parent e114ad7
commit f9db92c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 15 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -45,11 +45,11 @@
     <PropertyGroup>
 
         <!-- Orleans packages -->
-        <MicrosoftOrleansClientVersion>2.4.4</MicrosoftOrleansClientVersion>
-        <MicrosoftOrleansServerVersion>2.4.4</MicrosoftOrleansServerVersion>
-        <MicrosoftOrleansCodeGeneratorVersion>2.4.4</MicrosoftOrleansCodeGeneratorVersion>
-        <MicrosoftOrleansRuntimeVersion>2.4.4</MicrosoftOrleansRuntimeVersion>
-        <MicrosoftOrleansStreamingAzureStorageVersion>2.4.4</MicrosoftOrleansStreamingAzureStorageVersion>
+        <MicrosoftOrleansClientVersion>3.0.2</MicrosoftOrleansClientVersion>
+        <MicrosoftOrleansServerVersion>3.0.2</MicrosoftOrleansServerVersion>
+        <MicrosoftOrleansCodeGeneratorVersion>3.0.2</MicrosoftOrleansCodeGeneratorVersion>
+        <MicrosoftOrleansRuntimeVersion>3.0.2</MicrosoftOrleansRuntimeVersion>
+        <MicrosoftOrleansStreamingAzureStorageVersion>3.0.2</MicrosoftOrleansStreamingAzureStorageVersion>
 
         <!-- Microsoft extensions -->
         <MicrosoftExtensionsLoggingVersion>2.1.1</MicrosoftExtensionsLoggingVersion>

diff --git a/Source/Orleans.Internals/Orleans.Internals.csproj b/Source/Orleans.Internals/Orleans.Internals.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <AssemblyName>OrleansManager</AssemblyName>
+    <AssemblyName>TesterInternal</AssemblyName>
     <PackageId>Orleankka.Runtime.Legacy.Support</PackageId>
     <Title>Supporting package for Orleankka.Runtime.Legacy</Title>
     <Description>Do not reference this package directly, instead reference Orleankka.Runtime.Legacy</Description>

diff --git a/Tests/Orleankka.Tests/Features/Reminders_idempotency.cs b/Tests/Orleankka.Tests/Features/Reminders_idempotency.cs
@@ -89,8 +89,8 @@ static async Task CleanRemindersTable()
             {
                 var getGrainGeneric = typeof(IGrainFactory).GetMethod("GetGrain", new[]{typeof(long), typeof(string)});
                 var getGrain = getGrainGeneric.MakeGenericMethod(typeof(IReminderTable).Assembly.GetType("Orleans.IReminderTableGrain"));
-                var grain = (IReminderTable)getGrain.Invoke(TestActorSystem.Client, new object[]{12345, null});
-                await grain.TestOnlyClearTable();
+                var grain = getGrain.Invoke(TestActorSystem.Client, new object[]{12345, null});
+                await (Task) grain.GetType().GetMethod("TestOnlyClearTable").Invoke(grain, new object[0]);
             }
         }
     }

diff --git a/Tests/Orleankka.Tests/Features/Stream_subscriptions.cs b/Tests/Orleankka.Tests/Features/Stream_subscriptions.cs
@@ -60,6 +60,7 @@ public override async Task<object> Receive(object message)
         }
 
         [TestFixture] 
+        [RequiresSilo]
         class Tests
         {
             static readonly TimeSpan timeout = TimeSpan.FromMilliseconds(100);

diff --git a/Tests/Orleankka.Tests/Testing/TestActions.cs b/Tests/Orleankka.Tests/Testing/TestActions.cs
@@ -2,9 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-
+using Microsoft.Azure.Storage;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.WindowsAzure.Storage;
 
 using NUnit.Framework;
 using NUnit.Framework.Interfaces;
@@ -19,9 +18,6 @@
 using Orleankka.Features.Intercepting_requests;
 using Orleankka.Legacy.Cluster;
 
-using Orleans.Providers.Streams.AzureQueue;
-using Orleans.Streaming;
-
 [assembly: TeardownSilo]
 
 namespace Orleankka.Testing
@@ -63,9 +59,8 @@ public override void BeforeTest(ITest test)
                 .AddMemoryGrainStorageAsDefault()
                 .AddMemoryGrainStorage("PubSubStore")
                 .UseInMemoryReminderService()
-                .AddAzureQueueStreams("aqp", (SiloAzureQueueStreamConfigurator<AzureQueueDataAdapterV2> x) =>
+                .AddAzureQueueStreams("aqp", x =>
                 {
-                    x.ConfigureCache(1024);
                     x.ConfigureAzureQueue(b => b.Configure(options =>
                     {
                         options.ConnectionString = CloudStorageAccount.DevelopmentStorageAccount.ToString();