Merge branch 'v1' into refactor/use-tasks-from-fsharpx

Signed-off-by: Alexander Prooks <aprooks@live.ru>
OrleansContrib · Mar 3, 2017 · 88a3498 · 88a3498
2 parents c2ccc72 + df0859f
commit 88a3498
Show file tree

Hide file tree

Showing 164 changed files with 5,815 additions and 1,994 deletions.
diff --git a/Build/Orleankka.nuspec b/Build/Orleankka.nuspec
@@ -23,5 +23,7 @@
     <file src="Output\Package\Release\Orleankka.Meta.dll" target="lib/net451" />
     <file src="Output\Package\Release\Orleankka.Meta.xml" target="lib/net451" />
     <file src="Output\Package\Release\Orleankka.Meta.pdb" target="lib/net451" />
+    <file src="Output\Package\Release\OrleansManager.dll" target="lib/net451" />       
+    <file src="Output\Package\Release\OrleansManager.pdb" target="lib/net451" />
   </files>
 </package>
diff --git a/Orleankka.sln b/Orleankka.sln
@@ -81,6 +81,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Http.Suave", "Source\FSharp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orleankka.Meta", "Source\Orleankka.Meta\Orleankka.Meta.csproj", "{1220A904-CAFA-4F1C-BBCB-82B9257C9FC5}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orleans.Internals", "Source\Orleans.Internals\Orleans.Internals.csproj", "{97E4FE27-27FD-499B-8737-0F293807C297}"
+EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Reentrant", "Source\FSharp.Example.Reentrant\Reentrant.fsproj", "{04C62B7B-3202-4577-868F-7553D5ED01E2}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chat.Shared", "Source\Example.Observers.Chat.Shared\Chat.Shared.csproj", "{355B546C-C246-5CEE-A302-7D453A81D3A2}"
@@ -117,6 +119,12 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Orleankka.FSharp.Tests", "S
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSM", "Source\Example.EventSourcing.FSM\FSM.csproj", "{D4EA085E-732B-475B-A5DA-766D4EF8692E}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Serialization", "Serialization", "{2A3C4C8F-9836-4CE6-8089-08080463BAD1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtoBuf", "Source\Example.Serialization.ProtoBuf\ProtoBuf.csproj", "{E43D9F8D-8EC8-44D3-A334-29B3677B022E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyperion", "Source\Example.Serialization.Hyperion\Hyperion.csproj", "{E43D9F8D-8EC8-44D3-A334-29B3655B022E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -256,6 +264,12 @@ Global
 		{1220A904-CAFA-4F1C-BBCB-82B9257C9FC5}.Package|Any CPU.Build.0 = Package|Any CPU
 		{1220A904-CAFA-4F1C-BBCB-82B9257C9FC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1220A904-CAFA-4F1C-BBCB-82B9257C9FC5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{97E4FE27-27FD-499B-8737-0F293807C297}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97E4FE27-27FD-499B-8737-0F293807C297}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97E4FE27-27FD-499B-8737-0F293807C297}.Package|Any CPU.ActiveCfg = Release|Any CPU
+		{97E4FE27-27FD-499B-8737-0F293807C297}.Package|Any CPU.Build.0 = Release|Any CPU
+		{97E4FE27-27FD-499B-8737-0F293807C297}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97E4FE27-27FD-499B-8737-0F293807C297}.Release|Any CPU.Build.0 = Release|Any CPU
 		{04C62B7B-3202-4577-868F-7553D5ED01E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{04C62B7B-3202-4577-868F-7553D5ED01E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{04C62B7B-3202-4577-868F-7553D5ED01E2}.Package|Any CPU.ActiveCfg = Release|Any CPU
@@ -352,6 +366,18 @@ Global
 		{D4EA085E-732B-475B-A5DA-766D4EF8692E}.Package|Any CPU.Build.0 = Release|Any CPU
 		{D4EA085E-732B-475B-A5DA-766D4EF8692E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D4EA085E-732B-475B-A5DA-766D4EF8692E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E43D9F8D-8EC8-44D3-A334-29B3677B022E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E43D9F8D-8EC8-44D3-A334-29B3677B022E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E43D9F8D-8EC8-44D3-A334-29B3677B022E}.Package|Any CPU.ActiveCfg = Package|Any CPU
+		{E43D9F8D-8EC8-44D3-A334-29B3677B022E}.Package|Any CPU.Build.0 = Package|Any CPU
+		{E43D9F8D-8EC8-44D3-A334-29B3677B022E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E43D9F8D-8EC8-44D3-A334-29B3677B022E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E43D9F8D-8EC8-44D3-A334-29B3655B022E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E43D9F8D-8EC8-44D3-A334-29B3655B022E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E43D9F8D-8EC8-44D3-A334-29B3655B022E}.Package|Any CPU.ActiveCfg = Package|Any CPU
+		{E43D9F8D-8EC8-44D3-A334-29B3655B022E}.Package|Any CPU.Build.0 = Package|Any CPU
+		{E43D9F8D-8EC8-44D3-A334-29B3655B022E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E43D9F8D-8EC8-44D3-A334-29B3655B022E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -402,5 +428,8 @@ Global
 		{AB4305C5-3139-4E62-95C1-E367CFEA8A6C} = {A2A2E93C-20F7-4021-AEC2-B00BD22AADDE}
 		{ADD939F9-5362-4CF8-9A8C-AF7C3AACAC8B} = {A2A2E93C-20F7-4021-AEC2-B00BD22AADDE}
 		{D4EA085E-732B-475B-A5DA-766D4EF8692E} = {AD0D4C26-B7CC-4A26-B681-6FA3D95B5FAC}
+		{2A3C4C8F-9836-4CE6-8089-08080463BAD1} = {C9B497F6-87DA-40EF-933C-A572A7603991}
+		{E43D9F8D-8EC8-44D3-A334-29B3677B022E} = {2A3C4C8F-9836-4CE6-8089-08080463BAD1}
+		{E43D9F8D-8EC8-44D3-A334-29B3655B022E} = {2A3C4C8F-9836-4CE6-8089-08080463BAD1}
 	EndGlobalSection
 EndGlobal