Split into two packages (#89)

* split into core and servicebus packages * Update tests * fix tests and cleanup
Azure · May 15, 2017 · ae98596 · ae98596
1 parent fb78055
commit ae98596
Show file tree

Hide file tree

Showing 196 changed files with 553 additions and 430 deletions.
diff --git a/DurableTask.sln b/DurableTask.sln
@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.9
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DurableTask.Framework", "src\DurableTask.Framework\DurableTask.Framework.csproj", "{6F5D2EAD-726D-4FE5-A575-AEB96D1CCE37}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DurableTask.ServiceBus", "src\DurableTask.ServiceBus\DurableTask.ServiceBus.csproj", "{6F5D2EAD-726D-4FE5-A575-AEB96D1CCE37}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DurableTask.ServiceBus.Tests", "test\DurableTask.ServiceBus.Tests\DurableTask.ServiceBus.Tests.csproj", "{6639DA74-9063-4A7C-9484-0A71C4FB5C18}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DurableTask.ServiceBus.Tests", "test\DurableTask.ServiceBus.Tests\DurableTask.ServiceBus.Tests.csproj", "{6639DA74-9063-4A7C-9484-0A71C4FB5C18}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{501E1168-418C-4832-B88C-617735BD02C9}"
 	ProjectSection(SolutionItems) = preProject
@@ -23,15 +23,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{C0904C83
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{AF4E71A6-B16E-4488-B22D-2761101A601A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DurableTask.Framework.Tests", "test\DurableTask.Framework.Tests\DurableTask.Framework.Tests.csproj", "{879670A7-919B-4AF9-8AFB-7C4EDAA0CC04}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DurableTask.Core.Tests", "test\DurableTask.Core.Tests\DurableTask.Core.Tests.csproj", "{879670A7-919B-4AF9-8AFB-7C4EDAA0CC04}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DurableTask.Samples", "samples\DurableTask.Samples\DurableTask.Samples.csproj", "{BC204374-927C-4A48-8473-F5BF8C97EAEA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DurableTask.Samples", "samples\DurableTask.Samples\DurableTask.Samples.csproj", "{BC204374-927C-4A48-8473-F5BF8C97EAEA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DurableTask.Stress.Tests", "test\DurableTask.Stress.Tests\DurableTask.Stress.Tests.csproj", "{96980359-8003-4500-B97B-949A7FE01F31}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DurableTask.Stress.Tests", "test\DurableTask.Stress.Tests\DurableTask.Stress.Tests.csproj", "{96980359-8003-4500-B97B-949A7FE01F31}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DurableTask.Samples.Tests", "test\DurableTask.Samples.Tests\DurableTask.Samples.Tests.csproj", "{1F20B608-0206-4B58-8C0B-CB7430A880FD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DurableTask.Samples.Tests", "test\DurableTask.Samples.Tests\DurableTask.Samples.Tests.csproj", "{1F20B608-0206-4B58-8C0B-CB7430A880FD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DurableTask.Test.Orchestrations", "Test\DurableTask.Test.Orchestrations\DurableTask.Test.Orchestrations.csproj", "{2BC2A5AD-4200-41B9-A034-332BB1D7187B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DurableTask.Test.Orchestrations", "Test\DurableTask.Test.Orchestrations\DurableTask.Test.Orchestrations.csproj", "{2BC2A5AD-4200-41B9-A034-332BB1D7187B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DurableTask.Core", "src\DurableTask.Core\DurableTask.Core.csproj", "{C8634F14-BE3B-4685-B0E1-C5726F8F3758}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -67,6 +69,10 @@ Global
 		{2BC2A5AD-4200-41B9-A034-332BB1D7187B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2BC2A5AD-4200-41B9-A034-332BB1D7187B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2BC2A5AD-4200-41B9-A034-332BB1D7187B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C8634F14-BE3B-4685-B0E1-C5726F8F3758}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8634F14-BE3B-4685-B0E1-C5726F8F3758}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C8634F14-BE3B-4685-B0E1-C5726F8F3758}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C8634F14-BE3B-4685-B0E1-C5726F8F3758}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -79,6 +85,7 @@ Global
 		{96980359-8003-4500-B97B-949A7FE01F31} = {95C69A06-7F62-4652-A480-207B614C2869}
 		{1F20B608-0206-4B58-8C0B-CB7430A880FD} = {95C69A06-7F62-4652-A480-207B614C2869}
 		{2BC2A5AD-4200-41B9-A034-332BB1D7187B} = {95C69A06-7F62-4652-A480-207B614C2869}
+		{C8634F14-BE3B-4685-B0E1-C5726F8F3758} = {DBCD161C-D409-48E5-924E-9B7FA1C36B84}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		EnterpriseLibraryConfigurationToolBinariesPath = packages\TransientFaultHandling.Core.5.1.1209.1\lib\NET4

diff --git a/Test/DurableTask.Test.Orchestrations/DurableTask.Test.Orchestrations.csproj b/Test/DurableTask.Test.Orchestrations/DurableTask.Test.Orchestrations.csproj
@@ -4,9 +4,8 @@
   <PropertyGroup>
     <TargetFramework>net451</TargetFramework>
   </PropertyGroup>
-
   <ItemGroup>
-    <ProjectReference Include="..\..\src\DurableTask.Framework\DurableTask.Framework.csproj" />
+    <ProjectReference Include="..\..\src\DurableTask.Core\DurableTask.Core.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Test/DurableTask.Test.Orchestrations/Stress/DriverOrchestration.cs b/Test/DurableTask.Test.Orchestrations/Stress/DriverOrchestration.cs
@@ -16,6 +16,7 @@ namespace DurableTask.Test.Orchestrations.Stress
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
+    using DurableTask.Core;
 
     [System.Runtime.InteropServices.ComVisible(false)]
     public class DriverOrchestration : TaskOrchestration<int, DriverOrchestrationData>

diff --git a/Test/DurableTask.Test.Orchestrations/Stress/TestOrchestration.cs b/Test/DurableTask.Test.Orchestrations/Stress/TestOrchestration.cs
@@ -17,7 +17,7 @@ namespace DurableTask.Test.Orchestrations.Stress
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
-    using DurableTask;
+    using DurableTask.Core;
 
     [System.Runtime.InteropServices.ComVisible(false)]
     public class TestOrchestration : TaskOrchestration<int, TestOrchestrationData>

diff --git a/Test/DurableTask.Test.Orchestrations/Stress/TestTask.cs b/Test/DurableTask.Test.Orchestrations/Stress/TestTask.cs
@@ -16,6 +16,7 @@ namespace DurableTask.Test.Orchestrations.Stress
     using System;
     using System.Threading;
     using System.Threading.Tasks;
+    using DurableTask.Core;
 
     [System.Runtime.InteropServices.ComVisible(false)]
     public sealed class TestTask : AsyncTaskActivity<TestTaskData, int>

diff --git a/samples/DurableTask.Samples/App.config b/samples/DurableTask.Samples/App.config
@@ -5,20 +5,6 @@
     <add key="ServiceBusConnectionString" value="" />
     <add key="taskHubName" value="SamplesHub" />
   </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="DurableTask" switchName="mySwitch" switchType="System.Diagnostics.SourceSwitch">
-        <listeners>
-          <clear />
-          <add name="configConsoleListener" type="DurableTask.Tracing.OrchestrationConsoleTraceListener,  DurableTaskFx" traceOutputOptions="DateTime" />
-        </listeners>
-      </source>
-    </sources>
-    <switches>
-      <add name="mySwitch" value="Warning" />
-    </switches>
-  </system.diagnostics>
   <system.serviceModel>
     <extensions>
       <!-- In this extension section we are introducing all known service bus extensions. User can remove the ones they don't need. -->

diff --git a/samples/DurableTask.Samples/AverageCalculator/AverageCalculatorOrchestration.cs b/samples/DurableTask.Samples/AverageCalculator/AverageCalculatorOrchestration.cs
@@ -16,7 +16,7 @@ namespace DurableTask.Samples.AverageCalculator
     using System;
     using System.Collections.Generic;
     using System.Threading.Tasks;
-    using DurableTask;
+    using DurableTask.Core;
 
     public class AverageCalculatorOrchestration : TaskOrchestration<double, int[]>
     {

diff --git a/samples/DurableTask.Samples/AverageCalculator/ComputeSumTask.cs b/samples/DurableTask.Samples/AverageCalculator/ComputeSumTask.cs
@@ -14,15 +14,15 @@
 namespace DurableTask.Samples.AverageCalculator
 {
     using System;
-    using DurableTask;
+    using DurableTask.Core;
 
     public sealed class ComputeSumTask : TaskActivity<int[], int>
     {
         public ComputeSumTask()
         {
         }
 
-        protected override int Execute(DurableTask.TaskContext context, int[] chunk)
+        protected override int Execute(DurableTask.Core.TaskContext context, int[] chunk)
         {
             if (chunk == null || chunk.Length != 2)
             {

diff --git a/samples/DurableTask.Samples/Common.WorkItems/EmailTask.cs b/samples/DurableTask.Samples/Common.WorkItems/EmailTask.cs
@@ -15,7 +15,7 @@ namespace DurableTask.Samples.Common.WorkItems
 {
     using System.Net;
     using System.Net.Mail;
-    using DurableTask;
+    using DurableTask.Core;
 
     public sealed class EmailInput
     {

diff --git a/samples/DurableTask.Samples/Cron/CronOrchestration.cs b/samples/DurableTask.Samples/Cron/CronOrchestration.cs
@@ -15,7 +15,7 @@ namespace DurableTask.Samples.Cron
 {
     using System;
     using System.Threading.Tasks;
-    using DurableTask;
+    using DurableTask.Core;
     using NCrontab;
 
     public class CronOrchestration : TaskOrchestration<string, string>

diff --git a/samples/DurableTask.Samples/Cron/CronTask.cs b/samples/DurableTask.Samples/Cron/CronTask.cs
@@ -15,15 +15,15 @@ namespace DurableTask.Samples.Cron
 {
     using System;
     using System.Threading;
-    using DurableTask;
+    using DurableTask.Core;
 
     public sealed class CronTask : TaskActivity<string,string>
     {
         public CronTask()
         {
         }
 
-        protected override string Execute(DurableTask.TaskContext context, string input)
+        protected override string Execute(DurableTask.Core.TaskContext context, string input)
         {
             Console.WriteLine($"Executing Cron Job.  Started At: '{DateTime.Now}' Number: {input}");
 

diff --git a/samples/DurableTask.Samples/DurableTask.Samples.csproj b/samples/DurableTask.Samples/DurableTask.Samples.csproj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" version="1.9.71" />
+    <PackageReference Include="EnterpriseLibrary.SemanticLogging" Version="2.0.1406.1" />
     <PackageReference Include="ImpromptuInterface" version="6.2.2" />
     <PackageReference Include="Microsoft.Azure.KeyVault.Core" version="1.0.0" />
     <PackageReference Include="Microsoft.Data.Edm" version="5.6.4" />
@@ -22,7 +23,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\DurableTask.Framework\DurableTask.Framework.csproj" />
+    <ProjectReference Include="..\..\src\DurableTask.Core\DurableTask.Core.csproj" />
+    <ProjectReference Include="..\..\src\DurableTask.ServiceBus\DurableTask.ServiceBus.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/DurableTask.Samples/ErrorHandling/ErrorHandlingOrchestration.cs b/samples/DurableTask.Samples/ErrorHandling/ErrorHandlingOrchestration.cs
@@ -15,8 +15,8 @@ namespace DurableTask.Samples.ErrorHandling
 {
     using System;
     using System.Threading.Tasks;
-    using DurableTask;
-    using DurableTask.Exceptions;
+    using DurableTask.Core;
+    using DurableTask.Core.Exceptions;
 
     public class ErrorHandlingOrchestration : TaskOrchestration<string, string>
     {

diff --git a/samples/DurableTask.Samples/ErrorHandling/ErrorHandlingTasks.cs b/samples/DurableTask.Samples/ErrorHandling/ErrorHandlingTasks.cs
@@ -14,15 +14,15 @@
 namespace DurableTask.Samples.ErrorHandling
 {
     using System;
-    using DurableTask;
+    using DurableTask.Core;
 
     public sealed class GoodTask : TaskActivity<string, string>
     {
         public GoodTask()
         {
         }
 
-        protected override string Execute(DurableTask.TaskContext context, string input)
+        protected override string Execute(DurableTask.Core.TaskContext context, string input)
         {
             Console.WriteLine("GoodTask Executed...");
 
@@ -36,7 +36,7 @@ public BadTask()
         {
         }
 
-        protected override string Execute(DurableTask.TaskContext context, string input)
+        protected override string Execute(DurableTask.Core.TaskContext context, string input)
         {
             Console.WriteLine("BadTask Executed...");
 
@@ -50,7 +50,7 @@ public CleanupTask()
         {
         }
 
-        protected override string Execute(DurableTask.TaskContext context, string input)
+        protected override string Execute(DurableTask.Core.TaskContext context, string input)
         {
             Console.WriteLine("CleanupTask Executed...");
 

diff --git a/samples/DurableTask.Samples/Greetings/GetUserTask.cs b/samples/DurableTask.Samples/Greetings/GetUserTask.cs
@@ -15,7 +15,7 @@ namespace DurableTask.Samples.Greetings
 {
     using System;
     using System.Windows.Forms;
-    using DurableTask;
+    using DurableTask.Core;
     using DurableTaskSamples.Greetings;
 
     public sealed class GetUserTask : TaskActivity<string, string>
@@ -24,7 +24,7 @@ public GetUserTask()
         {
         }
 
-        protected override string Execute(DurableTask.TaskContext context, string input)
+        protected override string Execute(DurableTask.Core.TaskContext context, string input)
         {
             GetUserName userNamedialog = new GetUserName();
             Console.WriteLine("Waiting for user to enter name...");

diff --git a/samples/DurableTask.Samples/Greetings/GreetingsOrchestration.cs b/samples/DurableTask.Samples/Greetings/GreetingsOrchestration.cs
@@ -14,7 +14,7 @@
 namespace DurableTask.Samples.Greetings
 {
     using System.Threading.Tasks;
-    using DurableTask;
+    using DurableTask.Core;
 
     public class GreetingsOrchestration : TaskOrchestration<string,string>
     {

diff --git a/samples/DurableTask.Samples/Greetings/SendGreetingTask.cs b/samples/DurableTask.Samples/Greetings/SendGreetingTask.cs
@@ -15,15 +15,15 @@ namespace DurableTask.Samples.Greetings
 {
     using System;
     using System.Threading;
-    using DurableTask;
+    using DurableTask.Core;
 
     public sealed class SendGreetingTask : TaskActivity<string, string>
     {
         public SendGreetingTask()
         {
         }
 
-        protected override string Execute(DurableTask.TaskContext context, string user)
+        protected override string Execute(DurableTask.Core.TaskContext context, string user)
         {
             string message = null;
             if (!string.IsNullOrWhiteSpace(user) && user.Equals("TimedOut"))

diff --git a/samples/DurableTask.Samples/Greetings2/GreetingsOrchestration.cs b/samples/DurableTask.Samples/Greetings2/GreetingsOrchestration.cs
@@ -14,7 +14,7 @@
 namespace DurableTask.Samples.Greetings2
 {
     using System.Threading.Tasks;
-    using DurableTask;
+    using DurableTask.Core;
 
     public class GreetingsOrchestration2 : TaskOrchestration<string,int>
     {

diff --git a/samples/DurableTask.Samples/Program.cs b/samples/DurableTask.Samples/Program.cs
@@ -17,11 +17,10 @@ namespace DurableTask.Samples
     using System;
     using System.Collections.Generic;
     using System.Configuration;
+    using System.Diagnostics.Tracing;
     using System.IO;
     using System.Linq;
     using System.Threading;
-    using DurableTask;
-    using DurableTask.Tracking;
     using DurableTask.Samples.AverageCalculator;
     using DurableTask.Samples.Common.WorkItems;
     using DurableTask.Samples.Cron;
@@ -31,15 +30,24 @@ namespace DurableTask.Samples
     using DurableTask.Samples.Replat;
     using DurableTask.Samples.Signal;
     using DurableTask.Samples.SumOfSquares;
-    using DurableTask.Common;
+    using DurableTask.Core;
+    using DurableTask.Core.Tracing;
+    using DurableTask.ServiceBus;
+    using DurableTask.ServiceBus.Tracking;
+    using Microsoft.Practices.EnterpriseLibrary.SemanticLogging;
 
     class Program
     {
         static Options options = new Options();
+        static ObservableEventListener eventListener;
 
         [STAThread]
         static void Main(string[] args)
         {
+            eventListener = new ObservableEventListener();
+            eventListener.LogToConsole();
+            eventListener.EnableEvents(DefaultEventSource.Log, EventLevel.LogAlways);
+
             if (CommandLine.Parser.Default.ParseArgumentsStrict(args, options))
             {
                 string servicebusConnectionString = Program.GetSetting("ServiceBusConnectionString");

diff --git a/samples/DurableTask.Samples/Replat/MigrateOrchestration.cs b/samples/DurableTask.Samples/Replat/MigrateOrchestration.cs
@@ -17,7 +17,7 @@ namespace DurableTask.Samples.Replat
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
-    using DurableTask;
+    using DurableTask.Core;
 
     /// <summary>
     /// </summary>

diff --git a/samples/DurableTask.Samples/Signal/SignalOrchestration.cs b/samples/DurableTask.Samples/Signal/SignalOrchestration.cs
@@ -14,7 +14,7 @@
 namespace DurableTask.Samples.Signal
 {
     using System.Threading.Tasks;
-    using DurableTask;
+    using DurableTask.Core;
 
     public class SignalOrchestration : TaskOrchestration<string,string>
     {

diff --git a/samples/DurableTask.Samples/SumOfSquares/SumOfSquaresOrchestration.cs b/samples/DurableTask.Samples/SumOfSquares/SumOfSquaresOrchestration.cs
@@ -16,7 +16,7 @@ namespace DurableTask.Samples.SumOfSquares
     using System;
     using System.Collections.Generic;
     using System.Threading.Tasks;
-    using DurableTask;
+    using DurableTask.Core;
     using Newtonsoft.Json.Linq;
 
     public class SumOfSquaresOrchestration : TaskOrchestration<int, string>

diff --git a/samples/DurableTask.Samples/SumOfSquares/SumOfSquaresTask.cs b/samples/DurableTask.Samples/SumOfSquares/SumOfSquaresTask.cs
@@ -14,15 +14,15 @@
 namespace DurableTask.Samples.SumOfSquares
 {
     using System;
-    using DurableTask;
+    using DurableTask.Core;
 
     public sealed class SumOfSquaresTask : TaskActivity<int, int>
     {
         public SumOfSquaresTask()
         {
         }
 
-        protected override int Execute(DurableTask.TaskContext context, int chunk)
+        protected override int Execute(DurableTask.Core.TaskContext context, int chunk)
         {
             Console.WriteLine($"Square::{chunk}::{chunk * chunk}");
             return chunk * chunk;