Introduce Orleankka.Client package (#169)

* Introduce Orleankka.Client * Update Directory.Build.props reverted formatting * Amended Orleankka.Client description
OrleansContrib · Oct 27, 2020 · 6fa837e · 6fa837e
1 parent a72aba7
commit 6fa837e
Show file tree

Hide file tree

Showing 19 changed files with 49 additions and 8 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -54,13 +54,16 @@
         <!-- Orleans packages -->
         <MicrosoftOrleansClientVersion>3.3.0</MicrosoftOrleansClientVersion>
         <MicrosoftOrleansServerVersion>3.3.0</MicrosoftOrleansServerVersion>
+        <MicrosoftOrleansCoreVersion>3.3.0</MicrosoftOrleansCoreVersion>
+        <MicrosoftOrleansCoreAbstractionsVersion>3.3.0</MicrosoftOrleansCoreAbstractionsVersion>
         <MicrosoftOrleansCodeGeneratorVersion>3.3.0</MicrosoftOrleansCodeGeneratorVersion>
         <MicrosoftOrleansRuntimeVersion>3.3.0</MicrosoftOrleansRuntimeVersion>
         <MicrosoftOrleansStreamingAzureStorageVersion>3.3.0</MicrosoftOrleansStreamingAzureStorageVersion>
 
         <!-- Microsoft extensions -->
         <MicrosoftExtensionsLoggingVersion>3.0.0</MicrosoftExtensionsLoggingVersion>
         <MicrosoftExtensionsLoggingConsoleVersion>3.0.0</MicrosoftExtensionsLoggingConsoleVersion>
+        <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>3.1.9</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
 
         <!-- Testing packages -->
         <NUnitVersion>3.9.0</NUnitVersion>

diff --git a/Orleankka.sln b/Orleankka.sln
@@ -72,6 +72,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleankka.Legacy.Runtime",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Legacy", "Legacy", "{A996FEF3-9B45-4C3C-9FF0-614A51F5175D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleankka.Client", "Source\Orleankka.Client\Orleankka.Client.csproj", "{E26F63B1-3747-4A63-80BB-B50951FBD52C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -174,6 +176,10 @@ Global
 		{4B6DC915-C701-402C-B3C6-E7EB0E54F670}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4B6DC915-C701-402C-B3C6-E7EB0E54F670}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4B6DC915-C701-402C-B3C6-E7EB0E54F670}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E26F63B1-3747-4A63-80BB-B50951FBD52C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E26F63B1-3747-4A63-80BB-B50951FBD52C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E26F63B1-3747-4A63-80BB-B50951FBD52C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E26F63B1-3747-4A63-80BB-B50951FBD52C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Samples/CSharp/Demo/Demo.App.Tests/Demo.App.Tests.csproj b/Samples/CSharp/Demo/Demo.App.Tests/Demo.App.Tests.csproj
@@ -15,9 +15,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Source\Orleankka\Orleankka.csproj" />
     <ProjectReference Include="..\Demo.App\Demo.App.csproj" />
     <ProjectReference Include="..\..\..\..\Source\Orleankka.TestKit\Orleankka.TestKit.csproj" />
-    <ProjectReference Include="..\..\..\..\Source\Orleankka\Orleankka.csproj" />
     <ProjectReference Include="..\..\..\..\Source\Orleankka.Runtime\Orleankka.Runtime.csproj" />
   </ItemGroup>
 

diff --git a/Samples/CSharp/Demo/Demo.App/Demo.App.csproj b/Samples/CSharp/Demo/Demo.App/Demo.App.csproj
@@ -18,6 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Source\Orleankka.Client\Orleankka.Client.csproj" />
     <ProjectReference Include="..\..\..\..\Source\Orleankka\Orleankka.csproj" />
     <ProjectReference Include="..\..\..\..\Source\Orleankka.Runtime\Orleankka.Runtime.csproj" />
   </ItemGroup>

diff --git a/Samples/CSharp/EventSourcing/Idiomatic/Idiomatic.csproj b/Samples/CSharp/EventSourcing/Idiomatic/Idiomatic.csproj
@@ -21,6 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Source\Orleankka.Client\Orleankka.Client.csproj" />
     <ProjectReference Include="..\..\..\..\Source\Orleankka\Orleankka.csproj" />
     <ProjectReference Include="..\..\..\..\Source\Orleankka.Runtime\Orleankka.Runtime.csproj" />
   </ItemGroup>

diff --git a/Samples/CSharp/EventSourcing/Persistence/GES/GES.csproj b/Samples/CSharp/EventSourcing/Persistence/GES/GES.csproj
@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\Source\Orleankka\Orleankka.csproj" />
+    <ProjectReference Include="..\..\..\..\..\Source\Orleankka.Client\Orleankka.Client.csproj" />
     <ProjectReference Include="..\..\..\..\..\Source\Orleankka.Runtime\Orleankka.Runtime.csproj" />
   </ItemGroup>
 

diff --git a/Samples/CSharp/EventSourcing/Persistence/Streamstone/Streamstone.csproj b/Samples/CSharp/EventSourcing/Persistence/Streamstone/Streamstone.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\Source\Orleankka\Orleankka.csproj" />
+    <ProjectReference Include="..\..\..\..\..\Source\Orleankka.Client\Orleankka.Client.csproj" />
     <ProjectReference Include="..\..\..\..\..\Source\Orleankka.Runtime\Orleankka.Runtime.csproj" />
   </ItemGroup>
 

diff --git a/Samples/CSharp/FSM/Lightbulb/Lightbulb.csproj b/Samples/CSharp/FSM/Lightbulb/Lightbulb.csproj
@@ -19,6 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Source\Orleankka.Client\Orleankka.Client.csproj" />
     <ProjectReference Include="..\..\..\..\Source\Orleankka\Orleankka.csproj" />
     <ProjectReference Include="..\..\..\..\Source\Orleankka.Runtime\Orleankka.Runtime.csproj" />
   </ItemGroup>

diff --git a/Samples/CSharp/FSM/ProcessManager/ProcessManager.csproj b/Samples/CSharp/FSM/ProcessManager/ProcessManager.csproj
@@ -9,6 +9,7 @@
     <PackageReference Include="Microsoft.Orleans.Server" Version="$(MicrosoftOrleansServerVersion)" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Source\Orleankka.Client\Orleankka.Client.csproj" />
     <ProjectReference Include="..\..\..\..\Source\Orleankka\Orleankka.csproj" />
     <ProjectReference Include="..\..\..\..\Source\Orleankka.Runtime\Orleankka.Runtime.csproj" />
   </ItemGroup>

diff --git a/Samples/CSharp/HelloWorld/HelloWorld.csproj b/Samples/CSharp/HelloWorld/HelloWorld.csproj
@@ -14,6 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Source\Orleankka.Client\Orleankka.Client.csproj" />
     <ProjectReference Include="..\..\..\Source\Orleankka.Runtime\Orleankka.Runtime.csproj" />
     <ProjectReference Include="..\..\..\Source\Orleankka\Orleankka.csproj" />
   </ItemGroup>

diff --git a/Samples/CSharp/Observers/Chat.Client/Chat.Client.csproj b/Samples/CSharp/Observers/Chat.Client/Chat.Client.csproj
@@ -14,6 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Source\Orleankka.Client\Orleankka.Client.csproj" />
     <ProjectReference Include="..\Chat.Shared\Chat.Shared.csproj" />
     <ProjectReference Include="..\..\..\..\Source\Orleankka\Orleankka.csproj" />
   </ItemGroup>

diff --git a/Samples/CSharp/Reentrant/Reentrant.csproj b/Samples/CSharp/Reentrant/Reentrant.csproj
@@ -19,8 +19,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Source\Orleankka\Orleankka.csproj" />
+    <ProjectReference Include="..\..\..\Source\Orleankka.Client\Orleankka.Client.csproj" />
     <ProjectReference Include="..\..\..\Source\Orleankka.Runtime\Orleankka.Runtime.csproj" />
+    <ProjectReference Include="..\..\..\Source\Orleankka\Orleankka.csproj" />
   </ItemGroup>
 
 

diff --git a/Samples/CSharp/Serialization/Hyperion/Hyperion.csproj b/Samples/CSharp/Serialization/Hyperion/Hyperion.csproj
@@ -21,6 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Source\Orleankka.Client\Orleankka.Client.csproj" />
     <ProjectReference Include="..\..\..\..\Source\Orleankka\Orleankka.csproj" />
     <ProjectReference Include="..\..\..\..\Source\Orleankka.Runtime\Orleankka.Runtime.csproj" />
   </ItemGroup>

diff --git a/Samples/CSharp/Serialization/ProtoBuf/ProtoBuf.csproj b/Samples/CSharp/Serialization/ProtoBuf/ProtoBuf.csproj
@@ -21,8 +21,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Source\Orleankka\Orleankka.csproj" />
+    <ProjectReference Include="..\..\..\..\Source\Orleankka.Client\Orleankka.Client.csproj" />
     <ProjectReference Include="..\..\..\..\Source\Orleankka.Runtime\Orleankka.Runtime.csproj" />
+    <ProjectReference Include="..\..\..\..\Source\Orleankka\Orleankka.csproj" />
   </ItemGroup>
 
 

diff --git a/Samples/CSharp/Streams/Chat.Client/Chat.Client.csproj b/Samples/CSharp/Streams/Chat.Client/Chat.Client.csproj
@@ -14,8 +14,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Source\Orleankka.Client\Orleankka.Client.csproj" />
     <ProjectReference Include="..\Chat.Shared\Chat.Shared.csproj" />
-    <ProjectReference Include="..\..\..\..\Source\Orleankka\Orleankka.csproj" />
   </ItemGroup>
 
 

diff --git a/Source/Orleankka/Client/ClientOptions.cs → Source/Orleankka.Client/ClientOptions.cs b/Source/Orleankka/Client/ClientOptions.cs → Source/Orleankka.Client/ClientOptions.cs
diff --git a/Source/Orleankka.Client/Orleankka.Client.csproj b/Source/Orleankka.Client/Orleankka.Client.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <PackageId>Orleankka.Client</PackageId>
+    <Title>Orleankka client library</Title>
+    <Description>Functional API for MSR Orleans. Client-side library.</Description>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+    <DocumentationFile>bin\Release\Orleankka.Client.xml</DocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Orleans.Core" Version="$(MicrosoftOrleansCoreVersion)" />
+    <PackageReference Include="Microsoft.Orleans.OrleansCodeGenerator" Version="$(MicrosoftOrleansCodeGeneratorVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Orleankka\Orleankka.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/Source/Orleankka/Client/ClientActorSystem.cs b/Source/Orleankka/Client/ClientActorSystem.cs
@@ -27,7 +27,7 @@ public sealed class ClientActorSystem : ActorSystem, IClientActorSystem
     {
         readonly IGrainFactory grainFactory;
 
-        internal ClientActorSystem(Assembly[] assemblies, IServiceProvider serviceProvider)
+        public ClientActorSystem(Assembly[] assemblies, IServiceProvider serviceProvider)
             : base(assemblies, serviceProvider)
         {
             grainFactory = serviceProvider.GetService<IGrainFactory>();

diff --git a/Source/Orleankka/Orleankka.csproj b/Source/Orleankka/Orleankka.csproj
@@ -12,7 +12,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.OrleansCodeGenerator" Version="$(MicrosoftOrleansCodeGeneratorVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsVersion)" />
+    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="$(MicrosoftOrleansCoreAbstractionsVersion)" />
   </ItemGroup>
 
 </Project>