diff --git a/DurableTask.sln b/DurableTask.sln
index 82377f591..367160902 100644
--- 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
index 7ce519b27..fafab8a73 100644
--- a/Test/DurableTask.Test.Orchestrations/DurableTask.Test.Orchestrations.csproj
+++ b/Test/DurableTask.Test.Orchestrations/DurableTask.Test.Orchestrations.csproj
@@ -4,9 +4,8 @@
net451
-
-
+
\ No newline at end of file
diff --git a/Test/DurableTask.Test.Orchestrations/Stress/DriverOrchestration.cs b/Test/DurableTask.Test.Orchestrations/Stress/DriverOrchestration.cs
index 4238a04bd..8cb061184 100644
--- 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
diff --git a/Test/DurableTask.Test.Orchestrations/Stress/TestOrchestration.cs b/Test/DurableTask.Test.Orchestrations/Stress/TestOrchestration.cs
index 928dbf8d9..a936fecce 100644
--- 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
diff --git a/Test/DurableTask.Test.Orchestrations/Stress/TestTask.cs b/Test/DurableTask.Test.Orchestrations/Stress/TestTask.cs
index d40176488..d111ccbde 100644
--- 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
diff --git a/samples/DurableTask.Samples/App.config b/samples/DurableTask.Samples/App.config
index 0e6aa0d4d..b3176b623 100644
--- a/samples/DurableTask.Samples/App.config
+++ b/samples/DurableTask.Samples/App.config
@@ -5,20 +5,6 @@
-
-
-
-
-
-
-
-
-
diff --git a/samples/DurableTask.Samples/AverageCalculator/AverageCalculatorOrchestration.cs b/samples/DurableTask.Samples/AverageCalculator/AverageCalculatorOrchestration.cs
index 546445787..d547e76ea 100644
--- 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
{
diff --git a/samples/DurableTask.Samples/AverageCalculator/ComputeSumTask.cs b/samples/DurableTask.Samples/AverageCalculator/ComputeSumTask.cs
index bbf91bebc..5621702ca 100644
--- a/samples/DurableTask.Samples/AverageCalculator/ComputeSumTask.cs
+++ b/samples/DurableTask.Samples/AverageCalculator/ComputeSumTask.cs
@@ -14,7 +14,7 @@
namespace DurableTask.Samples.AverageCalculator
{
using System;
- using DurableTask;
+ using DurableTask.Core;
public sealed class ComputeSumTask : TaskActivity
{
@@ -22,7 +22,7 @@ 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
index d4901720f..5d18d9772 100644
--- 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
index da2e7b03e..99859ea82 100644
--- 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
diff --git a/samples/DurableTask.Samples/Cron/CronTask.cs b/samples/DurableTask.Samples/Cron/CronTask.cs
index a3025eeee..7213083f2 100644
--- a/samples/DurableTask.Samples/Cron/CronTask.cs
+++ b/samples/DurableTask.Samples/Cron/CronTask.cs
@@ -15,7 +15,7 @@ namespace DurableTask.Samples.Cron
{
using System;
using System.Threading;
- using DurableTask;
+ using DurableTask.Core;
public sealed class CronTask : TaskActivity
{
@@ -23,7 +23,7 @@ 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
index 711e084a9..1e335a36a 100644
--- a/samples/DurableTask.Samples/DurableTask.Samples.csproj
+++ b/samples/DurableTask.Samples/DurableTask.Samples.csproj
@@ -8,6 +8,7 @@
+
@@ -22,7 +23,8 @@
-
+
+
diff --git a/samples/DurableTask.Samples/ErrorHandling/ErrorHandlingOrchestration.cs b/samples/DurableTask.Samples/ErrorHandling/ErrorHandlingOrchestration.cs
index d658a3481..07d9790af 100644
--- 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
{
diff --git a/samples/DurableTask.Samples/ErrorHandling/ErrorHandlingTasks.cs b/samples/DurableTask.Samples/ErrorHandling/ErrorHandlingTasks.cs
index 5ae1f44b9..5bbf39c2c 100644
--- a/samples/DurableTask.Samples/ErrorHandling/ErrorHandlingTasks.cs
+++ b/samples/DurableTask.Samples/ErrorHandling/ErrorHandlingTasks.cs
@@ -14,7 +14,7 @@
namespace DurableTask.Samples.ErrorHandling
{
using System;
- using DurableTask;
+ using DurableTask.Core;
public sealed class GoodTask : TaskActivity
{
@@ -22,7 +22,7 @@ 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
index 2147d8d78..6c3e3bb27 100644
--- 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
@@ -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
index d7c8c148d..e81895589 100644
--- 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
{
diff --git a/samples/DurableTask.Samples/Greetings/SendGreetingTask.cs b/samples/DurableTask.Samples/Greetings/SendGreetingTask.cs
index 4b4576f24..43ec7f609 100644
--- a/samples/DurableTask.Samples/Greetings/SendGreetingTask.cs
+++ b/samples/DurableTask.Samples/Greetings/SendGreetingTask.cs
@@ -15,7 +15,7 @@ namespace DurableTask.Samples.Greetings
{
using System;
using System.Threading;
- using DurableTask;
+ using DurableTask.Core;
public sealed class SendGreetingTask : TaskActivity
{
@@ -23,7 +23,7 @@ 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
index 25b7ef515..3f689c118 100644
--- 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
{
diff --git a/samples/DurableTask.Samples/Program.cs b/samples/DurableTask.Samples/Program.cs
index 6c7d5306e..8cfa04cc6 100644
--- 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
index eb84ee73d..fe4b9f252 100644
--- 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;
///
///
diff --git a/samples/DurableTask.Samples/Signal/SignalOrchestration.cs b/samples/DurableTask.Samples/Signal/SignalOrchestration.cs
index c9053764c..dfa4eb190 100644
--- 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
{
diff --git a/samples/DurableTask.Samples/SumOfSquares/SumOfSquaresOrchestration.cs b/samples/DurableTask.Samples/SumOfSquares/SumOfSquaresOrchestration.cs
index ca8130bab..6bb2f1dc9 100644
--- 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
diff --git a/samples/DurableTask.Samples/SumOfSquares/SumOfSquaresTask.cs b/samples/DurableTask.Samples/SumOfSquares/SumOfSquaresTask.cs
index c671c3d37..7719dd942 100644
--- a/samples/DurableTask.Samples/SumOfSquares/SumOfSquaresTask.cs
+++ b/samples/DurableTask.Samples/SumOfSquares/SumOfSquaresTask.cs
@@ -14,7 +14,7 @@
namespace DurableTask.Samples.SumOfSquares
{
using System;
- using DurableTask;
+ using DurableTask.Core;
public sealed class SumOfSquaresTask : TaskActivity
{
@@ -22,7 +22,7 @@ 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;
diff --git a/src/DurableTask.Core/AssemblyInfo.cs b/src/DurableTask.Core/AssemblyInfo.cs
new file mode 100644
index 000000000..5ef98146e
--- /dev/null
+++ b/src/DurableTask.Core/AssemblyInfo.cs
@@ -0,0 +1,17 @@
+// ----------------------------------------------------------------------------------
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("DurableTask.Framework.Tests")]
+[assembly: InternalsVisibleTo("DurableTask.ServiceBus.Tests")]
\ No newline at end of file
diff --git a/src/DurableTask.Framework/Command/CreateSubOrchestrationAction.cs b/src/DurableTask.Core/Command/CreateSubOrchestrationAction.cs
similarity index 97%
rename from src/DurableTask.Framework/Command/CreateSubOrchestrationAction.cs
rename to src/DurableTask.Core/Command/CreateSubOrchestrationAction.cs
index b86781ef7..7dcc918ea 100644
--- a/src/DurableTask.Framework/Command/CreateSubOrchestrationAction.cs
+++ b/src/DurableTask.Core/Command/CreateSubOrchestrationAction.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Command
+namespace DurableTask.Core.Command
{
using System.Collections.Generic;
diff --git a/src/DurableTask.Framework/Command/CreateTimerOrchestratorAction.cs b/src/DurableTask.Core/Command/CreateTimerOrchestratorAction.cs
similarity index 96%
rename from src/DurableTask.Framework/Command/CreateTimerOrchestratorAction.cs
rename to src/DurableTask.Core/Command/CreateTimerOrchestratorAction.cs
index 2a287049b..adfa8af2b 100644
--- a/src/DurableTask.Framework/Command/CreateTimerOrchestratorAction.cs
+++ b/src/DurableTask.Core/Command/CreateTimerOrchestratorAction.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Command
+namespace DurableTask.Core.Command
{
using System;
diff --git a/src/DurableTask.Framework/Command/OrchestrationCompleteOrchestratorAction.cs b/src/DurableTask.Core/Command/OrchestrationCompleteOrchestratorAction.cs
similarity index 97%
rename from src/DurableTask.Framework/Command/OrchestrationCompleteOrchestratorAction.cs
rename to src/DurableTask.Core/Command/OrchestrationCompleteOrchestratorAction.cs
index d2b1d3abb..d0bf7543b 100644
--- a/src/DurableTask.Framework/Command/OrchestrationCompleteOrchestratorAction.cs
+++ b/src/DurableTask.Core/Command/OrchestrationCompleteOrchestratorAction.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Command
+namespace DurableTask.Core.Command
{
internal class OrchestrationCompleteOrchestratorAction : OrchestratorAction
{
diff --git a/src/DurableTask.Framework/Command/OrchestratorAction.cs b/src/DurableTask.Core/Command/OrchestratorAction.cs
similarity index 96%
rename from src/DurableTask.Framework/Command/OrchestratorAction.cs
rename to src/DurableTask.Core/Command/OrchestratorAction.cs
index c00ca6d8d..e2c74f8d6 100644
--- a/src/DurableTask.Framework/Command/OrchestratorAction.cs
+++ b/src/DurableTask.Core/Command/OrchestratorAction.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Command
+namespace DurableTask.Core.Command
{
using Newtonsoft.Json;
diff --git a/src/DurableTask.Framework/Command/OrchestratorActionConverter.cs b/src/DurableTask.Core/Command/OrchestratorActionConverter.cs
similarity index 96%
rename from src/DurableTask.Framework/Command/OrchestratorActionConverter.cs
rename to src/DurableTask.Core/Command/OrchestratorActionConverter.cs
index bf8450232..9449cf874 100644
--- a/src/DurableTask.Framework/Command/OrchestratorActionConverter.cs
+++ b/src/DurableTask.Core/Command/OrchestratorActionConverter.cs
@@ -11,11 +11,11 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Command
+namespace DurableTask.Core.Command
{
using System;
using Newtonsoft.Json.Linq;
- using DurableTask.Serializing;
+ using DurableTask.Core.Serializing;
internal class OrchestrationActionConverter : JsonCreationConverter
{
diff --git a/src/DurableTask.Framework/Command/OrchestratorActionType.cs b/src/DurableTask.Core/Command/OrchestratorActionType.cs
similarity index 96%
rename from src/DurableTask.Framework/Command/OrchestratorActionType.cs
rename to src/DurableTask.Core/Command/OrchestratorActionType.cs
index b06a78757..4f632e56b 100644
--- a/src/DurableTask.Framework/Command/OrchestratorActionType.cs
+++ b/src/DurableTask.Core/Command/OrchestratorActionType.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Command
+namespace DurableTask.Core.Command
{
internal enum OrchestratorActionType
{
diff --git a/src/DurableTask.Framework/Command/ScheduleTaskOrchestratorAction.cs b/src/DurableTask.Core/Command/ScheduleTaskOrchestratorAction.cs
similarity index 97%
rename from src/DurableTask.Framework/Command/ScheduleTaskOrchestratorAction.cs
rename to src/DurableTask.Core/Command/ScheduleTaskOrchestratorAction.cs
index f9fd390aa..d2894621d 100644
--- a/src/DurableTask.Framework/Command/ScheduleTaskOrchestratorAction.cs
+++ b/src/DurableTask.Core/Command/ScheduleTaskOrchestratorAction.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Command
+namespace DurableTask.Core.Command
{
internal class ScheduleTaskOrchestratorAction : OrchestratorAction
{
diff --git a/src/DurableTask.Framework/Common/CompressionStyle.cs b/src/DurableTask.Core/Common/CompressionStyle.cs
similarity index 97%
rename from src/DurableTask.Framework/Common/CompressionStyle.cs
rename to src/DurableTask.Core/Common/CompressionStyle.cs
index 57e8d7e71..c4f765332 100644
--- a/src/DurableTask.Framework/Common/CompressionStyle.cs
+++ b/src/DurableTask.Core/Common/CompressionStyle.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Common
+namespace DurableTask.Core.Common
{
///
/// Compression style
diff --git a/src/DurableTask.Framework/Common/DateTimeUtils.cs b/src/DurableTask.Core/Common/DateTimeUtils.cs
similarity index 98%
rename from src/DurableTask.Framework/Common/DateTimeUtils.cs
rename to src/DurableTask.Core/Common/DateTimeUtils.cs
index 9859e67e4..bd89d1b6a 100644
--- a/src/DurableTask.Framework/Common/DateTimeUtils.cs
+++ b/src/DurableTask.Core/Common/DateTimeUtils.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Common
+namespace DurableTask.Core.Common
{
using System;
using System.Reflection;
diff --git a/src/DurableTask.Framework/Common/Utils.cs b/src/DurableTask.Core/Common/Utils.cs
similarity index 98%
rename from src/DurableTask.Framework/Common/Utils.cs
rename to src/DurableTask.Core/Common/Utils.cs
index b8584cd61..db7f3361c 100644
--- a/src/DurableTask.Framework/Common/Utils.cs
+++ b/src/DurableTask.Core/Common/Utils.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Common
+namespace DurableTask.Core.Common
{
using System;
using System.Diagnostics;
@@ -21,11 +21,11 @@ namespace DurableTask.Common
using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json;
- using DurableTask.Exceptions;
- using DurableTask.Serializing;
+ using DurableTask.Core.Exceptions;
+ using DurableTask.Core.Serializing;
using Tracing;
- internal static class Utils
+ public static class Utils
{
const int FullGzipHeaderLength = 10;
diff --git a/src/DurableTask.Framework/DefaultObjectCreator.cs b/src/DurableTask.Core/DefaultObjectCreator.cs
similarity index 98%
rename from src/DurableTask.Framework/DefaultObjectCreator.cs
rename to src/DurableTask.Core/DefaultObjectCreator.cs
index 691a35bed..c224e4538 100644
--- a/src/DurableTask.Framework/DefaultObjectCreator.cs
+++ b/src/DurableTask.Core/DefaultObjectCreator.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
diff --git a/src/DurableTask.Core/DurableTask.Core.csproj b/src/DurableTask.Core/DurableTask.Core.csproj
new file mode 100644
index 000000000..4014c280e
--- /dev/null
+++ b/src/DurableTask.Core/DurableTask.Core.csproj
@@ -0,0 +1,14 @@
+
+
+
+
+ net451
+ true
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/DurableTask.Framework/Exceptions/NonDeterministicOrchestrationException.cs b/src/DurableTask.Core/Exceptions/NonDeterministicOrchestrationException.cs
similarity index 98%
rename from src/DurableTask.Framework/Exceptions/NonDeterministicOrchestrationException.cs
rename to src/DurableTask.Core/Exceptions/NonDeterministicOrchestrationException.cs
index 96acf66e2..43abaf414 100644
--- a/src/DurableTask.Framework/Exceptions/NonDeterministicOrchestrationException.cs
+++ b/src/DurableTask.Core/Exceptions/NonDeterministicOrchestrationException.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Exceptions
+namespace DurableTask.Core.Exceptions
{
using System;
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/Exceptions/OrchestrationException.cs b/src/DurableTask.Core/Exceptions/OrchestrationException.cs
similarity index 99%
rename from src/DurableTask.Framework/Exceptions/OrchestrationException.cs
rename to src/DurableTask.Core/Exceptions/OrchestrationException.cs
index 4b571ae66..10b241942 100644
--- a/src/DurableTask.Framework/Exceptions/OrchestrationException.cs
+++ b/src/DurableTask.Core/Exceptions/OrchestrationException.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Exceptions
+namespace DurableTask.Core.Exceptions
{
using System;
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/Exceptions/OrchestrationFailureException.cs b/src/DurableTask.Core/Exceptions/OrchestrationFailureException.cs
similarity index 97%
rename from src/DurableTask.Framework/Exceptions/OrchestrationFailureException.cs
rename to src/DurableTask.Core/Exceptions/OrchestrationFailureException.cs
index b5232c07e..6c170cad7 100644
--- a/src/DurableTask.Framework/Exceptions/OrchestrationFailureException.cs
+++ b/src/DurableTask.Core/Exceptions/OrchestrationFailureException.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Exceptions
+namespace DurableTask.Core.Exceptions
{
using System;
diff --git a/src/DurableTask.Framework/Exceptions/OrchestrationFrameworkException.cs b/src/DurableTask.Core/Exceptions/OrchestrationFrameworkException.cs
similarity index 98%
rename from src/DurableTask.Framework/Exceptions/OrchestrationFrameworkException.cs
rename to src/DurableTask.Core/Exceptions/OrchestrationFrameworkException.cs
index 5af1f2947..1dfbc6e79 100644
--- a/src/DurableTask.Framework/Exceptions/OrchestrationFrameworkException.cs
+++ b/src/DurableTask.Core/Exceptions/OrchestrationFrameworkException.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Exceptions
+namespace DurableTask.Core.Exceptions
{
using System;
diff --git a/src/DurableTask.Framework/Exceptions/SubOrchestrationFailedException.cs b/src/DurableTask.Core/Exceptions/SubOrchestrationFailedException.cs
similarity index 99%
rename from src/DurableTask.Framework/Exceptions/SubOrchestrationFailedException.cs
rename to src/DurableTask.Core/Exceptions/SubOrchestrationFailedException.cs
index 2f1b1a92e..eac16a8ac 100644
--- a/src/DurableTask.Framework/Exceptions/SubOrchestrationFailedException.cs
+++ b/src/DurableTask.Core/Exceptions/SubOrchestrationFailedException.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Exceptions
+namespace DurableTask.Core.Exceptions
{
using System;
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/Exceptions/TaskFailedException.cs b/src/DurableTask.Core/Exceptions/TaskFailedException.cs
similarity index 99%
rename from src/DurableTask.Framework/Exceptions/TaskFailedException.cs
rename to src/DurableTask.Core/Exceptions/TaskFailedException.cs
index 89fceeebd..c7828f977 100644
--- a/src/DurableTask.Framework/Exceptions/TaskFailedException.cs
+++ b/src/DurableTask.Core/Exceptions/TaskFailedException.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Exceptions
+namespace DurableTask.Core.Exceptions
{
using System;
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/Exceptions/TaskFailedExceptionDeserializationException.cs b/src/DurableTask.Core/Exceptions/TaskFailedExceptionDeserializationException.cs
similarity index 97%
rename from src/DurableTask.Framework/Exceptions/TaskFailedExceptionDeserializationException.cs
rename to src/DurableTask.Core/Exceptions/TaskFailedExceptionDeserializationException.cs
index 28c2ade35..78fda1926 100644
--- a/src/DurableTask.Framework/Exceptions/TaskFailedExceptionDeserializationException.cs
+++ b/src/DurableTask.Core/Exceptions/TaskFailedExceptionDeserializationException.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Exceptions
+namespace DurableTask.Core.Exceptions
{
using System;
diff --git a/src/DurableTask.Framework/Exceptions/TaskFailureException.cs b/src/DurableTask.Core/Exceptions/TaskFailureException.cs
similarity index 98%
rename from src/DurableTask.Framework/Exceptions/TaskFailureException.cs
rename to src/DurableTask.Core/Exceptions/TaskFailureException.cs
index 91ee09b9a..976b89509 100644
--- a/src/DurableTask.Framework/Exceptions/TaskFailureException.cs
+++ b/src/DurableTask.Core/Exceptions/TaskFailureException.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Exceptions
+namespace DurableTask.Core.Exceptions
{
using System;
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/Exceptions/TypeMissingException.cs b/src/DurableTask.Core/Exceptions/TypeMissingException.cs
similarity index 97%
rename from src/DurableTask.Framework/Exceptions/TypeMissingException.cs
rename to src/DurableTask.Core/Exceptions/TypeMissingException.cs
index 85a01d742..9511227a1 100644
--- a/src/DurableTask.Framework/Exceptions/TypeMissingException.cs
+++ b/src/DurableTask.Core/Exceptions/TypeMissingException.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Exceptions
+namespace DurableTask.Core.Exceptions
{
using System;
diff --git a/src/DurableTask.Framework/FrameworkConstants.cs b/src/DurableTask.Core/FrameworkConstants.cs
similarity index 80%
rename from src/DurableTask.Framework/FrameworkConstants.cs
rename to src/DurableTask.Core/FrameworkConstants.cs
index 884c41f9a..c209b73d9 100644
--- a/src/DurableTask.Framework/FrameworkConstants.cs
+++ b/src/DurableTask.Core/FrameworkConstants.cs
@@ -11,19 +11,12 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
- internal class FrameworkConstants
+ public class FrameworkConstants
{
- // TODO : Split these constants into provider specific classes
-
- // name format constants
- public const string OrchestratorEndpointFormat = "{0}/orchestrator";
- public const string WorkerEndpointFormat = "{0}/worker";
- public const string TrackingEndpointFormat = "{0}/tracking";
-
// tracking constants
public const string TaskMessageContentType = "TaskMessage";
public const string StateMessageContentType = "StateMessage";
@@ -60,13 +53,6 @@ internal class FrameworkConstants
public const string CompressionTypeGzipPropertyValue = "gzip";
public const string CompressionTypeNonePropertyValue = "none";
- // message blob key in message property
- // this property is a key to the message blob when it exceeds the message limit
- public const string MessageBlobKey = "MessageBlobKey";
-
- // instance store constants
- public const int MaxStringLengthForAzureTableColumn = 1024 * 15; // cut off at 15k * 2 bytes
-
// default settings for message size
public const int MessageOverflowThresholdInBytesDefault = 170 * 1024;
public const int MessageMaxSizeInBytesDefault = 10 * 1024 * 1024;
diff --git a/src/DurableTask.Framework/History/ContinueAsNewEvent.cs b/src/DurableTask.Core/History/ContinueAsNewEvent.cs
similarity index 97%
rename from src/DurableTask.Framework/History/ContinueAsNewEvent.cs
rename to src/DurableTask.Core/History/ContinueAsNewEvent.cs
index 13a886726..86476ca46 100644
--- a/src/DurableTask.Framework/History/ContinueAsNewEvent.cs
+++ b/src/DurableTask.Core/History/ContinueAsNewEvent.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.History
+namespace DurableTask.Core.History
{
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/History/EventRaisedEvent.cs b/src/DurableTask.Core/History/EventRaisedEvent.cs
similarity index 97%
rename from src/DurableTask.Framework/History/EventRaisedEvent.cs
rename to src/DurableTask.Core/History/EventRaisedEvent.cs
index fe1da6d73..8c4a89ded 100644
--- a/src/DurableTask.Framework/History/EventRaisedEvent.cs
+++ b/src/DurableTask.Core/History/EventRaisedEvent.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.History
+namespace DurableTask.Core.History
{
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/History/EventType.cs b/src/DurableTask.Core/History/EventType.cs
similarity index 98%
rename from src/DurableTask.Framework/History/EventType.cs
rename to src/DurableTask.Core/History/EventType.cs
index d46d7223e..6dbe548ac 100644
--- a/src/DurableTask.Framework/History/EventType.cs
+++ b/src/DurableTask.Core/History/EventType.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.History
+namespace DurableTask.Core.History
{
///
/// Enumeration of event types for orchestration, activity and history events
diff --git a/src/DurableTask.Framework/History/ExecutionCompletedEvent.cs b/src/DurableTask.Core/History/ExecutionCompletedEvent.cs
similarity index 98%
rename from src/DurableTask.Framework/History/ExecutionCompletedEvent.cs
rename to src/DurableTask.Core/History/ExecutionCompletedEvent.cs
index 460456381..dfd8d5f3d 100644
--- a/src/DurableTask.Framework/History/ExecutionCompletedEvent.cs
+++ b/src/DurableTask.Core/History/ExecutionCompletedEvent.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.History
+namespace DurableTask.Core.History
{
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/History/ExecutionStartedEvent.cs b/src/DurableTask.Core/History/ExecutionStartedEvent.cs
similarity index 98%
rename from src/DurableTask.Framework/History/ExecutionStartedEvent.cs
rename to src/DurableTask.Core/History/ExecutionStartedEvent.cs
index 9f7316dda..c10de4de9 100644
--- a/src/DurableTask.Framework/History/ExecutionStartedEvent.cs
+++ b/src/DurableTask.Core/History/ExecutionStartedEvent.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.History
+namespace DurableTask.Core.History
{
using System.Collections.Generic;
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/History/ExecutionTerminatedEvent.cs b/src/DurableTask.Core/History/ExecutionTerminatedEvent.cs
similarity index 98%
rename from src/DurableTask.Framework/History/ExecutionTerminatedEvent.cs
rename to src/DurableTask.Core/History/ExecutionTerminatedEvent.cs
index cf40516f8..6e4edf2f9 100644
--- a/src/DurableTask.Framework/History/ExecutionTerminatedEvent.cs
+++ b/src/DurableTask.Core/History/ExecutionTerminatedEvent.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.History
+namespace DurableTask.Core.History
{
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/History/GenericEvent.cs b/src/DurableTask.Core/History/GenericEvent.cs
similarity index 93%
rename from src/DurableTask.Framework/History/GenericEvent.cs
rename to src/DurableTask.Core/History/GenericEvent.cs
index bc2f9ca26..4fac2d0ba 100644
--- a/src/DurableTask.Framework/History/GenericEvent.cs
+++ b/src/DurableTask.Core/History/GenericEvent.cs
@@ -11,12 +11,12 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.History
+namespace DurableTask.Core.History
{
using System.Runtime.Serialization;
[DataContract]
- internal class GenericEvent : HistoryEvent
+ public class GenericEvent : HistoryEvent
{
[DataMember] public string Data;
diff --git a/src/DurableTask.Framework/History/HistoryEvent.cs b/src/DurableTask.Core/History/HistoryEvent.cs
similarity index 98%
rename from src/DurableTask.Framework/History/HistoryEvent.cs
rename to src/DurableTask.Core/History/HistoryEvent.cs
index 0d1624d7c..7d528ef9b 100644
--- a/src/DurableTask.Framework/History/HistoryEvent.cs
+++ b/src/DurableTask.Core/History/HistoryEvent.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.History
+namespace DurableTask.Core.History
{
using System;
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/History/HistoryStateEvent.cs b/src/DurableTask.Core/History/HistoryStateEvent.cs
similarity index 93%
rename from src/DurableTask.Framework/History/HistoryStateEvent.cs
rename to src/DurableTask.Core/History/HistoryStateEvent.cs
index 6666510ee..8c88debe5 100644
--- a/src/DurableTask.Framework/History/HistoryStateEvent.cs
+++ b/src/DurableTask.Core/History/HistoryStateEvent.cs
@@ -11,12 +11,12 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.History
+namespace DurableTask.Core.History
{
using System.Runtime.Serialization;
[DataContract]
- internal class HistoryStateEvent : HistoryEvent
+ public class HistoryStateEvent : HistoryEvent
{
public HistoryStateEvent(int eventId, OrchestrationState state)
: base(eventId)
diff --git a/src/DurableTask.Framework/History/OrchestratorCompletedEvent.cs b/src/DurableTask.Core/History/OrchestratorCompletedEvent.cs
similarity index 97%
rename from src/DurableTask.Framework/History/OrchestratorCompletedEvent.cs
rename to src/DurableTask.Core/History/OrchestratorCompletedEvent.cs
index 927f9e1ae..97acc053f 100644
--- a/src/DurableTask.Framework/History/OrchestratorCompletedEvent.cs
+++ b/src/DurableTask.Core/History/OrchestratorCompletedEvent.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.History
+namespace DurableTask.Core.History
{
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/History/OrchestratorStartedEvent.cs b/src/DurableTask.Core/History/OrchestratorStartedEvent.cs
similarity index 96%
rename from src/DurableTask.Framework/History/OrchestratorStartedEvent.cs
rename to src/DurableTask.Core/History/OrchestratorStartedEvent.cs
index 48754b5a2..037f26439 100644
--- a/src/DurableTask.Framework/History/OrchestratorStartedEvent.cs
+++ b/src/DurableTask.Core/History/OrchestratorStartedEvent.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.History
+namespace DurableTask.Core.History
{
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/History/SubOrchestrationInstanceCompletedEvent.cs b/src/DurableTask.Core/History/SubOrchestrationInstanceCompletedEvent.cs
similarity index 98%
rename from src/DurableTask.Framework/History/SubOrchestrationInstanceCompletedEvent.cs
rename to src/DurableTask.Core/History/SubOrchestrationInstanceCompletedEvent.cs
index 254746d48..6567fe561 100644
--- a/src/DurableTask.Framework/History/SubOrchestrationInstanceCompletedEvent.cs
+++ b/src/DurableTask.Core/History/SubOrchestrationInstanceCompletedEvent.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.History
+namespace DurableTask.Core.History
{
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/History/SubOrchestrationInstanceCreatedEvent.cs b/src/DurableTask.Core/History/SubOrchestrationInstanceCreatedEvent.cs
similarity index 98%
rename from src/DurableTask.Framework/History/SubOrchestrationInstanceCreatedEvent.cs
rename to src/DurableTask.Core/History/SubOrchestrationInstanceCreatedEvent.cs
index 411bec23c..c95f1d5b3 100644
--- a/src/DurableTask.Framework/History/SubOrchestrationInstanceCreatedEvent.cs
+++ b/src/DurableTask.Core/History/SubOrchestrationInstanceCreatedEvent.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.History
+namespace DurableTask.Core.History
{
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/History/SubOrchestrationInstanceFailedEvent.cs b/src/DurableTask.Core/History/SubOrchestrationInstanceFailedEvent.cs
similarity index 98%
rename from src/DurableTask.Framework/History/SubOrchestrationInstanceFailedEvent.cs
rename to src/DurableTask.Core/History/SubOrchestrationInstanceFailedEvent.cs
index 5690aa275..14fab3609 100644
--- a/src/DurableTask.Framework/History/SubOrchestrationInstanceFailedEvent.cs
+++ b/src/DurableTask.Core/History/SubOrchestrationInstanceFailedEvent.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.History
+namespace DurableTask.Core.History
{
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/History/TaskCompletedEvent.cs b/src/DurableTask.Core/History/TaskCompletedEvent.cs
similarity index 98%
rename from src/DurableTask.Framework/History/TaskCompletedEvent.cs
rename to src/DurableTask.Core/History/TaskCompletedEvent.cs
index 624100c3a..f94b3d19a 100644
--- a/src/DurableTask.Framework/History/TaskCompletedEvent.cs
+++ b/src/DurableTask.Core/History/TaskCompletedEvent.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.History
+namespace DurableTask.Core.History
{
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/History/TaskFailedEvent.cs b/src/DurableTask.Core/History/TaskFailedEvent.cs
similarity index 98%
rename from src/DurableTask.Framework/History/TaskFailedEvent.cs
rename to src/DurableTask.Core/History/TaskFailedEvent.cs
index a9acd70f5..09f5f4a34 100644
--- a/src/DurableTask.Framework/History/TaskFailedEvent.cs
+++ b/src/DurableTask.Core/History/TaskFailedEvent.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.History
+namespace DurableTask.Core.History
{
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/History/TaskScheduledEvent.cs b/src/DurableTask.Core/History/TaskScheduledEvent.cs
similarity index 98%
rename from src/DurableTask.Framework/History/TaskScheduledEvent.cs
rename to src/DurableTask.Core/History/TaskScheduledEvent.cs
index 23c7d9ed6..1404aeacd 100644
--- a/src/DurableTask.Framework/History/TaskScheduledEvent.cs
+++ b/src/DurableTask.Core/History/TaskScheduledEvent.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.History
+namespace DurableTask.Core.History
{
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/History/TimerCreatedEvent.cs b/src/DurableTask.Core/History/TimerCreatedEvent.cs
similarity index 97%
rename from src/DurableTask.Framework/History/TimerCreatedEvent.cs
rename to src/DurableTask.Core/History/TimerCreatedEvent.cs
index 9a783409e..d41e3eea0 100644
--- a/src/DurableTask.Framework/History/TimerCreatedEvent.cs
+++ b/src/DurableTask.Core/History/TimerCreatedEvent.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.History
+namespace DurableTask.Core.History
{
using System;
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/History/TimerFiredEvent.cs b/src/DurableTask.Core/History/TimerFiredEvent.cs
similarity index 98%
rename from src/DurableTask.Framework/History/TimerFiredEvent.cs
rename to src/DurableTask.Core/History/TimerFiredEvent.cs
index 294908f52..b44cf87d5 100644
--- a/src/DurableTask.Framework/History/TimerFiredEvent.cs
+++ b/src/DurableTask.Core/History/TimerFiredEvent.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.History
+namespace DurableTask.Core.History
{
using System;
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/INameVersionInfo.cs b/src/DurableTask.Core/INameVersionInfo.cs
similarity index 97%
rename from src/DurableTask.Framework/INameVersionInfo.cs
rename to src/DurableTask.Core/INameVersionInfo.cs
index b498b07cf..d0e767e54 100644
--- a/src/DurableTask.Framework/INameVersionInfo.cs
+++ b/src/DurableTask.Core/INameVersionInfo.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
///
/// Interface for name and version class to be used in lookup mappings
diff --git a/src/DurableTask.Framework/INameVersionObjectManager.cs b/src/DurableTask.Core/INameVersionObjectManager.cs
similarity index 98%
rename from src/DurableTask.Framework/INameVersionObjectManager.cs
rename to src/DurableTask.Core/INameVersionObjectManager.cs
index c8c2d102b..75cdf3b36 100644
--- a/src/DurableTask.Framework/INameVersionObjectManager.cs
+++ b/src/DurableTask.Core/INameVersionObjectManager.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
///
/// Interface for name and version manager class to be used in type lookup mappings
diff --git a/src/DurableTask.Framework/IOrchestrationService.cs b/src/DurableTask.Core/IOrchestrationService.cs
similarity index 99%
rename from src/DurableTask.Framework/IOrchestrationService.cs
rename to src/DurableTask.Core/IOrchestrationService.cs
index 1ecf13d0f..e32d3bd9f 100644
--- a/src/DurableTask.Framework/IOrchestrationService.cs
+++ b/src/DurableTask.Core/IOrchestrationService.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Collections.Generic;
diff --git a/src/DurableTask.Framework/IOrchestrationServiceClient.cs b/src/DurableTask.Core/IOrchestrationServiceClient.cs
similarity index 99%
rename from src/DurableTask.Framework/IOrchestrationServiceClient.cs
rename to src/DurableTask.Core/IOrchestrationServiceClient.cs
index ea4df4517..846877034 100644
--- a/src/DurableTask.Framework/IOrchestrationServiceClient.cs
+++ b/src/DurableTask.Core/IOrchestrationServiceClient.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Collections.Generic;
diff --git a/src/DurableTask.Framework/IOrchestrationServiceInstanceStore.cs b/src/DurableTask.Core/IOrchestrationServiceInstanceStore.cs
similarity index 98%
rename from src/DurableTask.Framework/IOrchestrationServiceInstanceStore.cs
rename to src/DurableTask.Core/IOrchestrationServiceInstanceStore.cs
index 6c8ba7a41..bc607a4d0 100644
--- a/src/DurableTask.Framework/IOrchestrationServiceInstanceStore.cs
+++ b/src/DurableTask.Core/IOrchestrationServiceInstanceStore.cs
@@ -11,12 +11,12 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
- using DurableTask.Tracking;
+ using DurableTask.Core.Tracking;
///
/// Instance Store provider interface to allow storage and lookup for orchestration state and event history
diff --git a/src/DurableTask.Framework/NameValueObjectCreator.cs b/src/DurableTask.Core/NameValueObjectCreator.cs
similarity index 98%
rename from src/DurableTask.Framework/NameValueObjectCreator.cs
rename to src/DurableTask.Core/NameValueObjectCreator.cs
index b3350f05a..a48841262 100644
--- a/src/DurableTask.Framework/NameValueObjectCreator.cs
+++ b/src/DurableTask.Core/NameValueObjectCreator.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
diff --git a/src/DurableTask.Framework/NameVersionHelper.cs b/src/DurableTask.Core/NameVersionHelper.cs
similarity index 99%
rename from src/DurableTask.Framework/NameVersionHelper.cs
rename to src/DurableTask.Core/NameVersionHelper.cs
index 255a299d4..36e9641af 100644
--- a/src/DurableTask.Framework/NameVersionHelper.cs
+++ b/src/DurableTask.Core/NameVersionHelper.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Dynamic;
diff --git a/src/DurableTask.Framework/NameVersionObjectManager.cs b/src/DurableTask.Core/NameVersionObjectManager.cs
similarity index 98%
rename from src/DurableTask.Framework/NameVersionObjectManager.cs
rename to src/DurableTask.Core/NameVersionObjectManager.cs
index bf50ead7b..a472eb3a0 100644
--- a/src/DurableTask.Framework/NameVersionObjectManager.cs
+++ b/src/DurableTask.Core/NameVersionObjectManager.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Collections.Generic;
diff --git a/src/DurableTask.Framework/ObjectCreator.cs b/src/DurableTask.Core/ObjectCreator.cs
similarity index 98%
rename from src/DurableTask.Framework/ObjectCreator.cs
rename to src/DurableTask.Core/ObjectCreator.cs
index f13538773..c31df20bf 100644
--- a/src/DurableTask.Framework/ObjectCreator.cs
+++ b/src/DurableTask.Core/ObjectCreator.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
///
/// Abstract class for object creation based on name and version
diff --git a/src/DurableTask.Framework/OrchestrationContext.cs b/src/DurableTask.Core/OrchestrationContext.cs
similarity index 99%
rename from src/DurableTask.Framework/OrchestrationContext.cs
rename to src/DurableTask.Core/OrchestrationContext.cs
index 5a37b08cb..1d21f6995 100644
--- a/src/DurableTask.Framework/OrchestrationContext.cs
+++ b/src/DurableTask.Core/OrchestrationContext.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Collections.Generic;
diff --git a/src/DurableTask.Framework/OrchestrationInstance.cs b/src/DurableTask.Core/OrchestrationInstance.cs
similarity index 98%
rename from src/DurableTask.Framework/OrchestrationInstance.cs
rename to src/DurableTask.Core/OrchestrationInstance.cs
index b759f1726..a1ecf5af8 100644
--- a/src/DurableTask.Framework/OrchestrationInstance.cs
+++ b/src/DurableTask.Core/OrchestrationInstance.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/OrchestrationRuntimeState.cs b/src/DurableTask.Core/OrchestrationRuntimeState.cs
similarity index 99%
rename from src/DurableTask.Framework/OrchestrationRuntimeState.cs
rename to src/DurableTask.Core/OrchestrationRuntimeState.cs
index 391b622b5..83dceee03 100644
--- a/src/DurableTask.Framework/OrchestrationRuntimeState.cs
+++ b/src/DurableTask.Core/OrchestrationRuntimeState.cs
@@ -11,13 +11,13 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Collections.Generic;
using System.Diagnostics;
- using DurableTask.Common;
- using DurableTask.History;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.History;
///
/// Represents the runtime state of an orchestration
diff --git a/src/DurableTask.Framework/OrchestrationRuntimeStateDump.cs b/src/DurableTask.Core/OrchestrationRuntimeStateDump.cs
similarity index 95%
rename from src/DurableTask.Framework/OrchestrationRuntimeStateDump.cs
rename to src/DurableTask.Core/OrchestrationRuntimeStateDump.cs
index 3506e9d5d..fad988531 100644
--- a/src/DurableTask.Framework/OrchestrationRuntimeStateDump.cs
+++ b/src/DurableTask.Core/OrchestrationRuntimeStateDump.cs
@@ -11,9 +11,9 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
- using DurableTask.History;
+ using DurableTask.Core.History;
using System.Collections.Generic;
///
diff --git a/src/DurableTask.Framework/OrchestrationSessionState.cs b/src/DurableTask.Core/OrchestrationSessionState.cs
similarity index 97%
rename from src/DurableTask.Framework/OrchestrationSessionState.cs
rename to src/DurableTask.Core/OrchestrationSessionState.cs
index 742495c4d..72440676c 100644
--- a/src/DurableTask.Framework/OrchestrationSessionState.cs
+++ b/src/DurableTask.Core/OrchestrationSessionState.cs
@@ -11,10 +11,10 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System.Collections.Generic;
- using DurableTask.History;
+ using DurableTask.Core.History;
///
/// The object that represents the serialized session state.
diff --git a/src/DurableTask.Framework/OrchestrationState.cs b/src/DurableTask.Core/OrchestrationState.cs
similarity index 99%
rename from src/DurableTask.Framework/OrchestrationState.cs
rename to src/DurableTask.Core/OrchestrationState.cs
index e8975e40a..8e0a2b9a2 100644
--- a/src/DurableTask.Framework/OrchestrationState.cs
+++ b/src/DurableTask.Core/OrchestrationState.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Collections.Generic;
diff --git a/src/DurableTask.Framework/OrchestrationStateInstanceFilter.cs b/src/DurableTask.Core/OrchestrationStateInstanceFilter.cs
similarity index 90%
rename from src/DurableTask.Framework/OrchestrationStateInstanceFilter.cs
rename to src/DurableTask.Core/OrchestrationStateInstanceFilter.cs
index c43ad5b96..a0afed126 100644
--- a/src/DurableTask.Framework/OrchestrationStateInstanceFilter.cs
+++ b/src/DurableTask.Core/OrchestrationStateInstanceFilter.cs
@@ -11,9 +11,9 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
- internal class OrchestrationStateInstanceFilter : OrchestrationStateQueryFilter
+ public class OrchestrationStateInstanceFilter : OrchestrationStateQueryFilter
{
public OrchestrationStateInstanceFilter()
{
diff --git a/src/DurableTask.Framework/OrchestrationStateNameVersionFilter.cs b/src/DurableTask.Core/OrchestrationStateNameVersionFilter.cs
similarity index 88%
rename from src/DurableTask.Framework/OrchestrationStateNameVersionFilter.cs
rename to src/DurableTask.Core/OrchestrationStateNameVersionFilter.cs
index 5bc235918..d1ac66b1a 100644
--- a/src/DurableTask.Framework/OrchestrationStateNameVersionFilter.cs
+++ b/src/DurableTask.Core/OrchestrationStateNameVersionFilter.cs
@@ -11,9 +11,9 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
- internal class OrchestrationStateNameVersionFilter : OrchestrationStateQueryFilter
+ public class OrchestrationStateNameVersionFilter : OrchestrationStateQueryFilter
{
public string Name { get; set; }
public string Version { get; set; }
diff --git a/src/DurableTask.Framework/OrchestrationStateQuery.cs b/src/DurableTask.Core/OrchestrationStateQuery.cs
similarity index 97%
rename from src/DurableTask.Framework/OrchestrationStateQuery.cs
rename to src/DurableTask.Core/OrchestrationStateQuery.cs
index d7c86d2e1..7af7d51f9 100644
--- a/src/DurableTask.Framework/OrchestrationStateQuery.cs
+++ b/src/DurableTask.Core/OrchestrationStateQuery.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Collections.Generic;
@@ -44,10 +44,10 @@ public OrchestrationStateQuery()
FilterMap = new Dictionary();
}
- internal IDictionary FilterMap { get; private set; }
+ public IDictionary FilterMap { get; private set; }
// returns
- internal Tuple> GetFilters()
+ public Tuple> GetFilters()
{
ICollection filters = FilterMap.Values;
if (filters.Count == 0)
diff --git a/src/DurableTask.Framework/OrchestrationStateQueryFilter.cs b/src/DurableTask.Core/OrchestrationStateQueryFilter.cs
similarity index 90%
rename from src/DurableTask.Framework/OrchestrationStateQueryFilter.cs
rename to src/DurableTask.Core/OrchestrationStateQueryFilter.cs
index e79c30086..9a37b5b2b 100644
--- a/src/DurableTask.Framework/OrchestrationStateQueryFilter.cs
+++ b/src/DurableTask.Core/OrchestrationStateQueryFilter.cs
@@ -11,9 +11,9 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
- internal abstract class OrchestrationStateQueryFilter
+ public abstract class OrchestrationStateQueryFilter
{
}
}
\ No newline at end of file
diff --git a/src/DurableTask.Framework/OrchestrationStateQuerySegment.cs b/src/DurableTask.Core/OrchestrationStateQuerySegment.cs
similarity index 97%
rename from src/DurableTask.Framework/OrchestrationStateQuerySegment.cs
rename to src/DurableTask.Core/OrchestrationStateQuerySegment.cs
index f0d82996a..5e7988c03 100644
--- a/src/DurableTask.Framework/OrchestrationStateQuerySegment.cs
+++ b/src/DurableTask.Core/OrchestrationStateQuerySegment.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System.Collections.Generic;
diff --git a/src/DurableTask.Framework/OrchestrationStateStatusFilter.cs b/src/DurableTask.Core/OrchestrationStateStatusFilter.cs
similarity index 88%
rename from src/DurableTask.Framework/OrchestrationStateStatusFilter.cs
rename to src/DurableTask.Core/OrchestrationStateStatusFilter.cs
index ce3f6b2c6..ed1a89ff1 100644
--- a/src/DurableTask.Framework/OrchestrationStateStatusFilter.cs
+++ b/src/DurableTask.Core/OrchestrationStateStatusFilter.cs
@@ -11,9 +11,9 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
- internal class OrchestrationStateStatusFilter : OrchestrationStateQueryFilter
+ public class OrchestrationStateStatusFilter : OrchestrationStateQueryFilter
{
public OrchestrationStatus Status { get; set; }
}
diff --git a/src/DurableTask.Framework/OrchestrationStateTimeRangeFilter.cs b/src/DurableTask.Core/OrchestrationStateTimeRangeFilter.cs
similarity index 89%
rename from src/DurableTask.Framework/OrchestrationStateTimeRangeFilter.cs
rename to src/DurableTask.Core/OrchestrationStateTimeRangeFilter.cs
index 60314fe64..c2fd8d112 100644
--- a/src/DurableTask.Framework/OrchestrationStateTimeRangeFilter.cs
+++ b/src/DurableTask.Core/OrchestrationStateTimeRangeFilter.cs
@@ -11,11 +11,11 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
- internal class OrchestrationStateTimeRangeFilter : OrchestrationStateQueryFilter
+ public class OrchestrationStateTimeRangeFilter : OrchestrationStateQueryFilter
{
public DateTime StartTime { get; set; }
public DateTime EndTime { get; set; }
diff --git a/src/DurableTask.Framework/OrchestrationStateTimeRangeFilterType.cs b/src/DurableTask.Core/OrchestrationStateTimeRangeFilterType.cs
similarity index 98%
rename from src/DurableTask.Framework/OrchestrationStateTimeRangeFilterType.cs
rename to src/DurableTask.Core/OrchestrationStateTimeRangeFilterType.cs
index 359b28213..e19a2f34b 100644
--- a/src/DurableTask.Framework/OrchestrationStateTimeRangeFilterType.cs
+++ b/src/DurableTask.Core/OrchestrationStateTimeRangeFilterType.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
///
/// Enumeration of the types of time filters for orchestration state queries
diff --git a/src/DurableTask.Framework/OrchestrationStatus.cs b/src/DurableTask.Core/OrchestrationStatus.cs
similarity index 98%
rename from src/DurableTask.Framework/OrchestrationStatus.cs
rename to src/DurableTask.Core/OrchestrationStatus.cs
index 90cc7661a..bc4e2bd88 100644
--- a/src/DurableTask.Framework/OrchestrationStatus.cs
+++ b/src/DurableTask.Core/OrchestrationStatus.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
///
/// Enum describing the status of the orchestration
diff --git a/src/DurableTask.Framework/ParentInstance.cs b/src/DurableTask.Core/ParentInstance.cs
similarity index 98%
rename from src/DurableTask.Framework/ParentInstance.cs
rename to src/DurableTask.Core/ParentInstance.cs
index 17285c968..34d9b1fd2 100644
--- a/src/DurableTask.Framework/ParentInstance.cs
+++ b/src/DurableTask.Core/ParentInstance.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/ReflectionBasedTaskActivity.cs b/src/DurableTask.Core/ReflectionBasedTaskActivity.cs
similarity index 97%
rename from src/DurableTask.Framework/ReflectionBasedTaskActivity.cs
rename to src/DurableTask.Core/ReflectionBasedTaskActivity.cs
index 3be022fa4..410766144 100644
--- a/src/DurableTask.Framework/ReflectionBasedTaskActivity.cs
+++ b/src/DurableTask.Core/ReflectionBasedTaskActivity.cs
@@ -11,14 +11,14 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Reflection;
using System.Threading.Tasks;
- using DurableTask.Common;
- using DurableTask.Exceptions;
- using DurableTask.Serializing;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.Exceptions;
+ using DurableTask.Core.Serializing;
using Newtonsoft.Json.Linq;
///
diff --git a/src/DurableTask.Framework/RetryInterceptor.cs b/src/DurableTask.Core/RetryInterceptor.cs
similarity index 97%
rename from src/DurableTask.Framework/RetryInterceptor.cs
rename to src/DurableTask.Core/RetryInterceptor.cs
index 4075a882b..2fee0ccf6 100644
--- a/src/DurableTask.Framework/RetryInterceptor.cs
+++ b/src/DurableTask.Core/RetryInterceptor.cs
@@ -11,13 +11,13 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Diagnostics;
using System.Threading.Tasks;
- using DurableTask.Common;
- using DurableTask.Tracing;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.Tracing;
///
/// Generic retry class to handle retries on a function call with specified retry options
diff --git a/src/DurableTask.Framework/RetryOptions.cs b/src/DurableTask.Core/RetryOptions.cs
similarity index 99%
rename from src/DurableTask.Framework/RetryOptions.cs
rename to src/DurableTask.Core/RetryOptions.cs
index 092864d0e..4e49dc156 100644
--- a/src/DurableTask.Framework/RetryOptions.cs
+++ b/src/DurableTask.Core/RetryOptions.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
diff --git a/src/DurableTask.Framework/RetryProxy.cs b/src/DurableTask.Core/RetryProxy.cs
similarity index 99%
rename from src/DurableTask.Framework/RetryProxy.cs
rename to src/DurableTask.Core/RetryProxy.cs
index 9e925b5f1..47ce0a322 100644
--- a/src/DurableTask.Framework/RetryProxy.cs
+++ b/src/DurableTask.Core/RetryProxy.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Collections.Generic;
diff --git a/src/DurableTask.Framework/ScheduleProxy.cs b/src/DurableTask.Core/ScheduleProxy.cs
similarity index 99%
rename from src/DurableTask.Framework/ScheduleProxy.cs
rename to src/DurableTask.Core/ScheduleProxy.cs
index c8daac5e9..fa8841f60 100644
--- a/src/DurableTask.Framework/ScheduleProxy.cs
+++ b/src/DurableTask.Core/ScheduleProxy.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Collections.Generic;
diff --git a/src/DurableTask.Framework/Serializing/DataConverter.cs b/src/DurableTask.Core/Serializing/DataConverter.cs
similarity index 98%
rename from src/DurableTask.Framework/Serializing/DataConverter.cs
rename to src/DurableTask.Core/Serializing/DataConverter.cs
index edcfc5a05..2b3fdf625 100644
--- a/src/DurableTask.Framework/Serializing/DataConverter.cs
+++ b/src/DurableTask.Core/Serializing/DataConverter.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Serializing
+namespace DurableTask.Core.Serializing
{
using System;
diff --git a/src/DurableTask.Framework/Serializing/JsonCreationConverter.cs b/src/DurableTask.Core/Serializing/JsonCreationConverter.cs
similarity index 98%
rename from src/DurableTask.Framework/Serializing/JsonCreationConverter.cs
rename to src/DurableTask.Core/Serializing/JsonCreationConverter.cs
index 5ee2ee31a..71f8023a0 100644
--- a/src/DurableTask.Framework/Serializing/JsonCreationConverter.cs
+++ b/src/DurableTask.Core/Serializing/JsonCreationConverter.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Serializing
+namespace DurableTask.Core.Serializing
{
using System;
using Newtonsoft.Json;
diff --git a/src/DurableTask.Framework/Serializing/JsonDataConverter.cs b/src/DurableTask.Core/Serializing/JsonDataConverter.cs
similarity index 98%
rename from src/DurableTask.Framework/Serializing/JsonDataConverter.cs
rename to src/DurableTask.Core/Serializing/JsonDataConverter.cs
index 7daf69737..b9571bbd3 100644
--- a/src/DurableTask.Framework/Serializing/JsonDataConverter.cs
+++ b/src/DurableTask.Core/Serializing/JsonDataConverter.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Serializing
+namespace DurableTask.Core.Serializing
{
using System;
using System.Globalization;
diff --git a/src/DurableTask.Framework/Serializing/RuntimeStateStreamConverter.cs b/src/DurableTask.Core/Serializing/RuntimeStateStreamConverter.cs
similarity index 97%
rename from src/DurableTask.Framework/Serializing/RuntimeStateStreamConverter.cs
rename to src/DurableTask.Core/Serializing/RuntimeStateStreamConverter.cs
index 51fd114b0..fe06fce38 100644
--- a/src/DurableTask.Framework/Serializing/RuntimeStateStreamConverter.cs
+++ b/src/DurableTask.Core/Serializing/RuntimeStateStreamConverter.cs
@@ -11,26 +11,26 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Serializing
+namespace DurableTask.Core.Serializing
{
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Threading.Tasks;
- using DurableTask.Common;
- using DurableTask.Exceptions;
- using DurableTask.History;
- using DurableTask.Settings;
- using DurableTask.Tracing;
- using DurableTask.Tracking;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.Exceptions;
+ using DurableTask.Core.History;
+ using DurableTask.Core.Settings;
+ using DurableTask.Core.Tracing;
+ using DurableTask.Core.Tracking;
///
/// A converter that does conversion between the OrchestrationRuntimeState instance and a stream after serialization.
/// The stream is a serialized OrchestrationSessionState that will set as session state.
/// De-serialization is done with fallbacks in the order: OrchestrationSessionState -> OrchestrationRuntimeState -> IList of HistoryEvent.
///
- class RuntimeStateStreamConverter
+ public class RuntimeStateStreamConverter
{
///
/// Convert an OrchestrationRuntimeState instance to a serialized raw stream to be saved in session state.
@@ -48,7 +48,7 @@ public static async Task OrchestrationRuntimeStateToRawStream(
OrchestrationRuntimeState runtimeState,
DataConverter dataConverter,
bool shouldCompress,
- ServiceBusSessionSettings serviceBusSessionSettings,
+ ISessionSettings serviceBusSessionSettings,
IOrchestrationServiceBlobStore orchestrationServiceBlobStore,
string sessionId)
{
diff --git a/src/DurableTask.Framework/Settings/CompressionSettings.cs b/src/DurableTask.Core/Settings/CompressionSettings.cs
similarity index 94%
rename from src/DurableTask.Framework/Settings/CompressionSettings.cs
rename to src/DurableTask.Core/Settings/CompressionSettings.cs
index a03ea9a32..ebff4f2b4 100644
--- a/src/DurableTask.Framework/Settings/CompressionSettings.cs
+++ b/src/DurableTask.Core/Settings/CompressionSettings.cs
@@ -11,9 +11,9 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Settings
+namespace DurableTask.Core.Settings
{
- using DurableTask.Common;
+ using DurableTask.Core.Common;
///
/// Compression settings
diff --git a/src/DurableTask.Core/Settings/ISessionSettings.cs b/src/DurableTask.Core/Settings/ISessionSettings.cs
new file mode 100644
index 000000000..8d7d96cbc
--- /dev/null
+++ b/src/DurableTask.Core/Settings/ISessionSettings.cs
@@ -0,0 +1,31 @@
+// ----------------------------------------------------------------------------------
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+namespace DurableTask.Core.Settings
+{
+ ///
+ /// Settings to configure the Service Bus session.
+ ///
+ public interface ISessionSettings
+ {
+ ///
+ /// The max allowed session size in service bus. Default is 230K.
+ ///
+ int SessionMaxSizeInBytes { get; set; }
+
+ ///
+ /// The max allowed session size for external storage. Default is 10M.
+ ///
+ int SessionOverflowThresholdInBytes { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/DurableTask.Framework/Settings/TaskActivityDispatcherSettings.cs b/src/DurableTask.Core/Settings/TaskActivityDispatcherSettings.cs
similarity index 96%
rename from src/DurableTask.Framework/Settings/TaskActivityDispatcherSettings.cs
rename to src/DurableTask.Core/Settings/TaskActivityDispatcherSettings.cs
index 432b7d758..7008bbd21 100644
--- a/src/DurableTask.Framework/Settings/TaskActivityDispatcherSettings.cs
+++ b/src/DurableTask.Core/Settings/TaskActivityDispatcherSettings.cs
@@ -11,14 +11,14 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Settings
+namespace DurableTask.Core.Settings
{
///
/// Settings to configure the Task Activity Dispatcher
///
public class TaskActivityDispatcherSettings
{
- internal TaskActivityDispatcherSettings()
+ public TaskActivityDispatcherSettings()
{
TransientErrorBackOffSecs = FrameworkConstants.ActivityTransientErrorBackOffSecs;
NonTransientErrorBackOffSecs = FrameworkConstants.ActivityNonTransientErrorBackOffSecs;
diff --git a/src/DurableTask.Framework/Settings/TaskOrchestrationDispatcherSettings.cs b/src/DurableTask.Core/Settings/TaskOrchestrationDispatcherSettings.cs
similarity index 97%
rename from src/DurableTask.Framework/Settings/TaskOrchestrationDispatcherSettings.cs
rename to src/DurableTask.Core/Settings/TaskOrchestrationDispatcherSettings.cs
index a9d03b36d..e26b8709c 100644
--- a/src/DurableTask.Framework/Settings/TaskOrchestrationDispatcherSettings.cs
+++ b/src/DurableTask.Core/Settings/TaskOrchestrationDispatcherSettings.cs
@@ -11,14 +11,14 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Settings
+namespace DurableTask.Core.Settings
{
///
/// Settings to configure the Task Orchestration Dispatcher
///
public class TaskOrchestrationDispatcherSettings
{
- internal TaskOrchestrationDispatcherSettings()
+ public TaskOrchestrationDispatcherSettings()
{
TransientErrorBackOffSecs = FrameworkConstants.OrchestrationTransientErrorBackOffSecs;
NonTransientErrorBackOffSecs = FrameworkConstants.OrchestrationNonTransientErrorBackOffSecs;
diff --git a/src/DurableTask.Framework/Settings/TrackingDispatcherSettings.cs b/src/DurableTask.Core/Settings/TrackingDispatcherSettings.cs
similarity index 97%
rename from src/DurableTask.Framework/Settings/TrackingDispatcherSettings.cs
rename to src/DurableTask.Core/Settings/TrackingDispatcherSettings.cs
index 778103486..891050f73 100644
--- a/src/DurableTask.Framework/Settings/TrackingDispatcherSettings.cs
+++ b/src/DurableTask.Core/Settings/TrackingDispatcherSettings.cs
@@ -13,14 +13,14 @@
using System;
-namespace DurableTask.Settings
+namespace DurableTask.Core.Settings
{
///
/// Settings to configure the Tracking Dispatcher
///
public class TrackingDispatcherSettings
{
- internal TrackingDispatcherSettings()
+ public TrackingDispatcherSettings()
{
TransientErrorBackOffSecs = FrameworkConstants.TrackingTransientErrorBackOffSecs;
NonTransientErrorBackOffSecs = FrameworkConstants.TrackingNonTransientErrorBackOffSecs;
diff --git a/src/DurableTask.Framework/StateMessage.cs b/src/DurableTask.Core/StateMessage.cs
similarity index 97%
rename from src/DurableTask.Framework/StateMessage.cs
rename to src/DurableTask.Core/StateMessage.cs
index 85b60331a..04cd47318 100644
--- a/src/DurableTask.Framework/StateMessage.cs
+++ b/src/DurableTask.Core/StateMessage.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System.Runtime.Serialization;
diff --git a/src/DurableTask.Framework/Stats/Counter.cs b/src/DurableTask.Core/Stats/Counter.cs
similarity index 98%
rename from src/DurableTask.Framework/Stats/Counter.cs
rename to src/DurableTask.Core/Stats/Counter.cs
index 02f10e546..ee98b61e1 100644
--- a/src/DurableTask.Framework/Stats/Counter.cs
+++ b/src/DurableTask.Core/Stats/Counter.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Stats
+namespace DurableTask.Core.Stats
{
using System.Threading;
diff --git a/src/DurableTask.Framework/SynchronousTaskScheduler.cs b/src/DurableTask.Core/SynchronousTaskScheduler.cs
similarity index 98%
rename from src/DurableTask.Framework/SynchronousTaskScheduler.cs
rename to src/DurableTask.Core/SynchronousTaskScheduler.cs
index 3b40e6539..6e79e80fc 100644
--- a/src/DurableTask.Framework/SynchronousTaskScheduler.cs
+++ b/src/DurableTask.Core/SynchronousTaskScheduler.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System.Collections.Generic;
using System.Linq;
diff --git a/src/DurableTask.Framework/TaskActivity.cs b/src/DurableTask.Core/TaskActivity.cs
similarity index 98%
rename from src/DurableTask.Framework/TaskActivity.cs
rename to src/DurableTask.Core/TaskActivity.cs
index 3f92caa3c..203de66ed 100644
--- a/src/DurableTask.Framework/TaskActivity.cs
+++ b/src/DurableTask.Core/TaskActivity.cs
@@ -11,13 +11,13 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Threading.Tasks;
- using DurableTask.Common;
- using DurableTask.Exceptions;
- using DurableTask.Serializing;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.Exceptions;
+ using DurableTask.Core.Serializing;
using Newtonsoft.Json.Linq;
///
diff --git a/src/DurableTask.Framework/TaskActivityDispatcher.cs b/src/DurableTask.Core/TaskActivityDispatcher.cs
similarity index 98%
rename from src/DurableTask.Framework/TaskActivityDispatcher.cs
rename to src/DurableTask.Core/TaskActivityDispatcher.cs
index 29e97595c..68fba5b92 100644
--- a/src/DurableTask.Framework/TaskActivityDispatcher.cs
+++ b/src/DurableTask.Core/TaskActivityDispatcher.cs
@@ -11,16 +11,16 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;
- using DurableTask.Common;
- using DurableTask.Exceptions;
- using DurableTask.History;
- using DurableTask.Tracing;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.Exceptions;
+ using DurableTask.Core.History;
+ using DurableTask.Core.Tracing;
///
/// Dispatcher for task activities to handle processing and renewing of work items
diff --git a/src/DurableTask.Framework/TaskActivityWorkItem.cs b/src/DurableTask.Core/TaskActivityWorkItem.cs
similarity index 98%
rename from src/DurableTask.Framework/TaskActivityWorkItem.cs
rename to src/DurableTask.Core/TaskActivityWorkItem.cs
index a1b606de0..70278b189 100644
--- a/src/DurableTask.Framework/TaskActivityWorkItem.cs
+++ b/src/DurableTask.Core/TaskActivityWorkItem.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
diff --git a/src/DurableTask.Framework/TaskContext.cs b/src/DurableTask.Core/TaskContext.cs
similarity index 98%
rename from src/DurableTask.Framework/TaskContext.cs
rename to src/DurableTask.Core/TaskContext.cs
index 34ae12c60..d68fe91e3 100644
--- a/src/DurableTask.Framework/TaskContext.cs
+++ b/src/DurableTask.Core/TaskContext.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
///
/// Task context
diff --git a/src/DurableTask.Framework/TaskHubClient.cs b/src/DurableTask.Core/TaskHubClient.cs
similarity index 99%
rename from src/DurableTask.Framework/TaskHubClient.cs
rename to src/DurableTask.Core/TaskHubClient.cs
index cfae7f2dc..f9b839175 100644
--- a/src/DurableTask.Framework/TaskHubClient.cs
+++ b/src/DurableTask.Core/TaskHubClient.cs
@@ -11,16 +11,16 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
- using DurableTask.History;
- using DurableTask.Serializing;
- using DurableTask.Settings;
+ using DurableTask.Core.History;
+ using DurableTask.Core.Serializing;
+ using DurableTask.Core.Settings;
///
/// Client used to manage and query orchestration instances
diff --git a/src/DurableTask.Framework/TaskHubWorker.cs b/src/DurableTask.Core/TaskHubWorker.cs
similarity index 99%
rename from src/DurableTask.Framework/TaskHubWorker.cs
rename to src/DurableTask.Core/TaskHubWorker.cs
index 59fd7a7b0..3a5a5849a 100644
--- a/src/DurableTask.Framework/TaskHubWorker.cs
+++ b/src/DurableTask.Core/TaskHubWorker.cs
@@ -11,13 +11,13 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
- using DurableTask.Settings;
+ using DurableTask.Core.Settings;
///
/// Allows users to load the TaskOrchestration and TaskActivity classes and start
diff --git a/src/DurableTask.Framework/TaskMessage.cs b/src/DurableTask.Core/TaskMessage.cs
similarity index 96%
rename from src/DurableTask.Framework/TaskMessage.cs
rename to src/DurableTask.Core/TaskMessage.cs
index db0026951..27c000e7e 100644
--- a/src/DurableTask.Framework/TaskMessage.cs
+++ b/src/DurableTask.Core/TaskMessage.cs
@@ -11,11 +11,11 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Runtime.Serialization;
- using DurableTask.History;
+ using DurableTask.Core.History;
///
/// Wire level transport object for task messages containing events and orchestration instance information
diff --git a/src/DurableTask.Framework/TaskOrchestration.cs b/src/DurableTask.Core/TaskOrchestration.cs
similarity index 97%
rename from src/DurableTask.Framework/TaskOrchestration.cs
rename to src/DurableTask.Core/TaskOrchestration.cs
index ab483170f..b5f35c489 100644
--- a/src/DurableTask.Framework/TaskOrchestration.cs
+++ b/src/DurableTask.Core/TaskOrchestration.cs
@@ -11,13 +11,13 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Threading.Tasks;
- using DurableTask.Common;
- using DurableTask.Exceptions;
- using DurableTask.Serializing;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.Exceptions;
+ using DurableTask.Core.Serializing;
///
/// Base class for TaskOrchestration
diff --git a/src/DurableTask.Framework/TaskOrchestrationContext.cs b/src/DurableTask.Core/TaskOrchestrationContext.cs
similarity index 98%
rename from src/DurableTask.Framework/TaskOrchestrationContext.cs
rename to src/DurableTask.Core/TaskOrchestrationContext.cs
index 220de9d74..1bbc469c6 100644
--- a/src/DurableTask.Framework/TaskOrchestrationContext.cs
+++ b/src/DurableTask.Core/TaskOrchestrationContext.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Collections.Generic;
@@ -19,12 +19,12 @@ namespace DurableTask
using System.Globalization;
using System.Threading;
using System.Threading.Tasks;
- using DurableTask.Command;
- using DurableTask.Common;
- using DurableTask.Exceptions;
- using DurableTask.History;
- using DurableTask.Serializing;
- using DurableTask.Tracing;
+ using DurableTask.Core.Command;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.Exceptions;
+ using DurableTask.Core.History;
+ using DurableTask.Core.Serializing;
+ using DurableTask.Core.Tracing;
internal class TaskOrchestrationContext : OrchestrationContext
{
diff --git a/src/DurableTask.Framework/TaskOrchestrationDispatcher.cs b/src/DurableTask.Core/TaskOrchestrationDispatcher.cs
similarity index 99%
rename from src/DurableTask.Framework/TaskOrchestrationDispatcher.cs
rename to src/DurableTask.Core/TaskOrchestrationDispatcher.cs
index 6e7b67424..d3c3e36cc 100644
--- a/src/DurableTask.Framework/TaskOrchestrationDispatcher.cs
+++ b/src/DurableTask.Core/TaskOrchestrationDispatcher.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Collections.Generic;
@@ -19,12 +19,12 @@ namespace DurableTask
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
- using DurableTask.Command;
- using DurableTask.Common;
- using DurableTask.Exceptions;
- using DurableTask.History;
- using DurableTask.Serializing;
- using DurableTask.Tracing;
+ using DurableTask.Core.Command;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.Exceptions;
+ using DurableTask.Core.History;
+ using DurableTask.Core.Serializing;
+ using DurableTask.Core.Tracing;
///
/// Dispatcher for orchestrations to handle processing and renewing, completetion of orchestration events
diff --git a/src/DurableTask.Framework/TaskOrchestrationExecutor.cs b/src/DurableTask.Core/TaskOrchestrationExecutor.cs
similarity index 98%
rename from src/DurableTask.Framework/TaskOrchestrationExecutor.cs
rename to src/DurableTask.Core/TaskOrchestrationExecutor.cs
index 415106fbe..4acb713be 100644
--- a/src/DurableTask.Framework/TaskOrchestrationExecutor.cs
+++ b/src/DurableTask.Core/TaskOrchestrationExecutor.cs
@@ -11,15 +11,15 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
- using DurableTask.Command;
- using DurableTask.Exceptions;
- using DurableTask.History;
+ using DurableTask.Core.Command;
+ using DurableTask.Core.Exceptions;
+ using DurableTask.Core.History;
internal class TaskOrchestrationExecutor
{
diff --git a/src/DurableTask.Framework/TaskOrchestrationWorkItem.cs b/src/DurableTask.Core/TaskOrchestrationWorkItem.cs
similarity index 98%
rename from src/DurableTask.Framework/TaskOrchestrationWorkItem.cs
rename to src/DurableTask.Core/TaskOrchestrationWorkItem.cs
index 3b0475c4c..dbe470d2c 100644
--- a/src/DurableTask.Framework/TaskOrchestrationWorkItem.cs
+++ b/src/DurableTask.Core/TaskOrchestrationWorkItem.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Collections.Generic;
diff --git a/src/DurableTask.Framework/Test/DebugTestHost.cs b/src/DurableTask.Core/Test/DebugTestHost.cs
similarity index 98%
rename from src/DurableTask.Framework/Test/DebugTestHost.cs
rename to src/DurableTask.Core/Test/DebugTestHost.cs
index 64babbc86..d15dc459f 100644
--- a/src/DurableTask.Framework/Test/DebugTestHost.cs
+++ b/src/DurableTask.Core/Test/DebugTestHost.cs
@@ -12,12 +12,12 @@
// ----------------------------------------------------------------------------------
#pragma warning disable 1591
-namespace DurableTask.Test
+namespace DurableTask.Core.Test
{
using System;
using System.Collections.Generic;
using System.Linq;
- using DurableTask.History;
+ using DurableTask.Core.History;
using Newtonsoft.Json;
public class DebugTestHost
diff --git a/src/DurableTask.Framework/Test/FakeOrchestrationClock.cs b/src/DurableTask.Core/Test/FakeOrchestrationClock.cs
similarity index 99%
rename from src/DurableTask.Framework/Test/FakeOrchestrationClock.cs
rename to src/DurableTask.Core/Test/FakeOrchestrationClock.cs
index 2cdceb5db..9d03e0047 100644
--- a/src/DurableTask.Framework/Test/FakeOrchestrationClock.cs
+++ b/src/DurableTask.Core/Test/FakeOrchestrationClock.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Test
+namespace DurableTask.Core.Test
{
using System;
using System.Collections.Generic;
diff --git a/src/DurableTask.Framework/Test/FakeOrchestrationContext.cs b/src/DurableTask.Core/Test/FakeOrchestrationContext.cs
similarity index 99%
rename from src/DurableTask.Framework/Test/FakeOrchestrationContext.cs
rename to src/DurableTask.Core/Test/FakeOrchestrationContext.cs
index 2e205cc9c..58251e4ea 100644
--- a/src/DurableTask.Framework/Test/FakeOrchestrationContext.cs
+++ b/src/DurableTask.Core/Test/FakeOrchestrationContext.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Test
+namespace DurableTask.Core.Test
{
using System;
using System.Collections.Generic;
diff --git a/src/DurableTask.Framework/Test/FakeOrchestrationExecutor.cs b/src/DurableTask.Core/Test/FakeOrchestrationExecutor.cs
similarity index 98%
rename from src/DurableTask.Framework/Test/FakeOrchestrationExecutor.cs
rename to src/DurableTask.Core/Test/FakeOrchestrationExecutor.cs
index d43555c47..a0276b045 100644
--- a/src/DurableTask.Framework/Test/FakeOrchestrationExecutor.cs
+++ b/src/DurableTask.Core/Test/FakeOrchestrationExecutor.cs
@@ -11,15 +11,15 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Test
+namespace DurableTask.Core.Test
{
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
- using DurableTask.Common;
- using DurableTask.Exceptions;
- using DurableTask.Serializing;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.Exceptions;
+ using DurableTask.Core.Serializing;
internal class FakeOrchestrationExecutor
{
diff --git a/src/DurableTask.Framework/Test/FakeTaskActivityExecutor.cs b/src/DurableTask.Core/Test/FakeTaskActivityExecutor.cs
similarity index 95%
rename from src/DurableTask.Framework/Test/FakeTaskActivityExecutor.cs
rename to src/DurableTask.Core/Test/FakeTaskActivityExecutor.cs
index 054588a4b..263dfd21f 100644
--- a/src/DurableTask.Framework/Test/FakeTaskActivityExecutor.cs
+++ b/src/DurableTask.Core/Test/FakeTaskActivityExecutor.cs
@@ -11,14 +11,14 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Test
+namespace DurableTask.Core.Test
{
using System;
using System.Threading;
using System.Threading.Tasks;
- using DurableTask.Common;
- using DurableTask.Exceptions;
- using DurableTask.Serializing;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.Exceptions;
+ using DurableTask.Core.Serializing;
internal class FakeTaskActivityExecutor
{
diff --git a/src/DurableTask.Framework/Test/OrchestrationTestHost.cs b/src/DurableTask.Core/Test/OrchestrationTestHost.cs
similarity index 98%
rename from src/DurableTask.Framework/Test/OrchestrationTestHost.cs
rename to src/DurableTask.Core/Test/OrchestrationTestHost.cs
index 09bcc63a4..bd4dc7f51 100644
--- a/src/DurableTask.Framework/Test/OrchestrationTestHost.cs
+++ b/src/DurableTask.Core/Test/OrchestrationTestHost.cs
@@ -12,14 +12,14 @@
// ----------------------------------------------------------------------------------
#pragma warning disable 1591
-namespace DurableTask.Test
+namespace DurableTask.Core.Test
{
using System;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
- using DurableTask.Exceptions;
- using DurableTask.Serializing;
+ using DurableTask.Core.Exceptions;
+ using DurableTask.Core.Serializing;
public class OrchestrationTestHost
{
diff --git a/src/DurableTask.Framework/Tracing/DefaultEventSource.cs b/src/DurableTask.Core/Tracing/DefaultEventSource.cs
similarity index 99%
rename from src/DurableTask.Framework/Tracing/DefaultEventSource.cs
rename to src/DurableTask.Core/Tracing/DefaultEventSource.cs
index 4312716f7..e70196157 100644
--- a/src/DurableTask.Framework/Tracing/DefaultEventSource.cs
+++ b/src/DurableTask.Core/Tracing/DefaultEventSource.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Tracing
+namespace DurableTask.Core.Tracing
{
using System;
using System.Diagnostics;
@@ -21,7 +21,7 @@ namespace DurableTask.Tracing
[EventSource(
Name = "DurableTask-Core",
Guid = "7DA4779A-152E-44A2-A6F2-F80D991A5BEE")]
- internal class DefaultEventSource : EventSource
+ public class DefaultEventSource : EventSource
{
const int TraceEventId = 1;
const int DebugEventId = 2;
diff --git a/src/DurableTask.Framework/Tracing/TraceHelper.cs b/src/DurableTask.Core/Tracing/TraceHelper.cs
similarity index 98%
rename from src/DurableTask.Framework/Tracing/TraceHelper.cs
rename to src/DurableTask.Core/Tracing/TraceHelper.cs
index 547767e18..7a517cdfd 100644
--- a/src/DurableTask.Framework/Tracing/TraceHelper.cs
+++ b/src/DurableTask.Core/Tracing/TraceHelper.cs
@@ -11,14 +11,14 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Tracing
+namespace DurableTask.Core.Tracing
{
using System;
using System.Diagnostics;
- using DurableTask.Common;
using System.Globalization;
+ using DurableTask.Core.Common;
- internal class TraceHelper
+ public class TraceHelper
{
const string Source = "DurableTask";
diff --git a/src/DurableTask.Framework/Tracking/IOrchestrationServiceBlobStore.cs b/src/DurableTask.Core/Tracking/IOrchestrationServiceBlobStore.cs
similarity index 98%
rename from src/DurableTask.Framework/Tracking/IOrchestrationServiceBlobStore.cs
rename to src/DurableTask.Core/Tracking/IOrchestrationServiceBlobStore.cs
index b830a228c..9bb4ad8bf 100644
--- a/src/DurableTask.Framework/Tracking/IOrchestrationServiceBlobStore.cs
+++ b/src/DurableTask.Core/Tracking/IOrchestrationServiceBlobStore.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Tracking
+namespace DurableTask.Core.Tracking
{
using System;
using System.IO;
diff --git a/src/DurableTask.Framework/Tracking/InstanceEntityBase.cs b/src/DurableTask.Core/Tracking/InstanceEntityBase.cs
similarity index 93%
rename from src/DurableTask.Framework/Tracking/InstanceEntityBase.cs
rename to src/DurableTask.Core/Tracking/InstanceEntityBase.cs
index 6dfacca74..6de636fdb 100644
--- a/src/DurableTask.Framework/Tracking/InstanceEntityBase.cs
+++ b/src/DurableTask.Core/Tracking/InstanceEntityBase.cs
@@ -11,10 +11,10 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Tracking
+namespace DurableTask.Core.Tracking
{
using System;
- using DurableTask.History;
+ using DurableTask.Core.History;
///
/// Base class for history tracking events
diff --git a/src/DurableTask.Framework/Tracking/OrchestrationJumpStartInstanceEntity.cs b/src/DurableTask.Core/Tracking/OrchestrationJumpStartInstanceEntity.cs
similarity index 97%
rename from src/DurableTask.Framework/Tracking/OrchestrationJumpStartInstanceEntity.cs
rename to src/DurableTask.Core/Tracking/OrchestrationJumpStartInstanceEntity.cs
index fa36ae7ed..e084c7f4d 100644
--- a/src/DurableTask.Framework/Tracking/OrchestrationJumpStartInstanceEntity.cs
+++ b/src/DurableTask.Core/Tracking/OrchestrationJumpStartInstanceEntity.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Tracking
+namespace DurableTask.Core.Tracking
{
using System;
diff --git a/src/DurableTask.Framework/Tracking/OrchestrationStateInstanceEntity.cs b/src/DurableTask.Core/Tracking/OrchestrationStateInstanceEntity.cs
similarity index 96%
rename from src/DurableTask.Framework/Tracking/OrchestrationStateInstanceEntity.cs
rename to src/DurableTask.Core/Tracking/OrchestrationStateInstanceEntity.cs
index 7ee5c84c5..fc75879e1 100644
--- a/src/DurableTask.Framework/Tracking/OrchestrationStateInstanceEntity.cs
+++ b/src/DurableTask.Core/Tracking/OrchestrationStateInstanceEntity.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Tracking
+namespace DurableTask.Core.Tracking
{
///
/// History Entity for Orchestration State
diff --git a/src/DurableTask.Framework/Tracking/OrchestrationWorkItemInstanceEntity.cs b/src/DurableTask.Core/Tracking/OrchestrationWorkItemInstanceEntity.cs
similarity index 95%
rename from src/DurableTask.Framework/Tracking/OrchestrationWorkItemInstanceEntity.cs
rename to src/DurableTask.Core/Tracking/OrchestrationWorkItemInstanceEntity.cs
index 6184e857f..b05b82b30 100644
--- a/src/DurableTask.Framework/Tracking/OrchestrationWorkItemInstanceEntity.cs
+++ b/src/DurableTask.Core/Tracking/OrchestrationWorkItemInstanceEntity.cs
@@ -11,10 +11,10 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Tracking
+namespace DurableTask.Core.Tracking
{
using System;
- using DurableTask.History;
+ using DurableTask.Core.History;
///
/// History Entity for a Work Item Instance
diff --git a/src/DurableTask.Framework/TrackingWorkItem.cs b/src/DurableTask.Core/TrackingWorkItem.cs
similarity index 98%
rename from src/DurableTask.Framework/TrackingWorkItem.cs
rename to src/DurableTask.Core/TrackingWorkItem.cs
index 9b50ca9eb..52982d0a8 100644
--- a/src/DurableTask.Framework/TrackingWorkItem.cs
+++ b/src/DurableTask.Core/TrackingWorkItem.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Collections.Generic;
diff --git a/src/DurableTask.Framework/WorkItemDispatcher.cs b/src/DurableTask.Core/WorkItemDispatcher.cs
similarity index 99%
rename from src/DurableTask.Framework/WorkItemDispatcher.cs
rename to src/DurableTask.Core/WorkItemDispatcher.cs
index a8339c138..c1a366d6d 100644
--- a/src/DurableTask.Framework/WorkItemDispatcher.cs
+++ b/src/DurableTask.Core/WorkItemDispatcher.cs
@@ -11,14 +11,14 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
using System;
using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;
- using DurableTask.Common;
- using DurableTask.Exceptions;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.Exceptions;
using Tracing;
///
diff --git a/src/DurableTask.Framework/WorkItemDispatcherContext.cs b/src/DurableTask.Core/WorkItemDispatcherContext.cs
similarity index 98%
rename from src/DurableTask.Framework/WorkItemDispatcherContext.cs
rename to src/DurableTask.Core/WorkItemDispatcherContext.cs
index 1710a22cb..d184dab0d 100644
--- a/src/DurableTask.Framework/WorkItemDispatcherContext.cs
+++ b/src/DurableTask.Core/WorkItemDispatcherContext.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.Core
{
///
/// Class to hold context for a WorkItemDispatcher call
diff --git a/src/DurableTask.Framework/AssemblyInfo.cs b/src/DurableTask.ServiceBus/AssemblyInfo.cs
similarity index 100%
rename from src/DurableTask.Framework/AssemblyInfo.cs
rename to src/DurableTask.ServiceBus/AssemblyInfo.cs
diff --git a/src/DurableTask.Framework/Common/BrokeredMessageExtensions.cs b/src/DurableTask.ServiceBus/Common/BrokeredMessageExtensions.cs
similarity index 95%
rename from src/DurableTask.Framework/Common/BrokeredMessageExtensions.cs
rename to src/DurableTask.ServiceBus/Common/BrokeredMessageExtensions.cs
index addad2fcf..aa7ea50f8 100644
--- a/src/DurableTask.Framework/Common/BrokeredMessageExtensions.cs
+++ b/src/DurableTask.ServiceBus/Common/BrokeredMessageExtensions.cs
@@ -11,12 +11,11 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Common
+namespace DurableTask.ServiceBus.Common
{
using System;
- using System.Diagnostics;
using Microsoft.ServiceBus.Messaging;
- using Tracing;
+ using DurableTask.Core.Common;
///
/// Extension methods for BrokeredMessage
diff --git a/src/DurableTask.Framework/Common/ServiceBusUtils.cs b/src/DurableTask.ServiceBus/Common/ServiceBusUtils.cs
similarity index 96%
rename from src/DurableTask.Framework/Common/ServiceBusUtils.cs
rename to src/DurableTask.ServiceBus/Common/ServiceBusUtils.cs
index bb015b6d3..3d46586e6 100644
--- a/src/DurableTask.Framework/Common/ServiceBusUtils.cs
+++ b/src/DurableTask.ServiceBus/Common/ServiceBusUtils.cs
@@ -11,16 +11,19 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Common
+namespace DurableTask.ServiceBus.Common
{
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Threading.Tasks;
- using DurableTask.Settings;
- using DurableTask.Tracing;
- using DurableTask.Tracking;
+ using DurableTask.Core;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.Settings;
+ using DurableTask.Core.Tracing;
+ using DurableTask.Core.Tracking;
+ using DurableTask.ServiceBus.Settings;
using Microsoft.ServiceBus;
using Microsoft.ServiceBus.Messaging;
@@ -155,7 +158,7 @@ static async Task GenerateBrokeredMessageWithBlobKeyPropertyAsy
await orchestrationServiceBlobStore.SaveStreamAsync(blobKey, stream);
BrokeredMessage brokeredMessage = new BrokeredMessage();
- brokeredMessage.Properties[FrameworkConstants.MessageBlobKey] = blobKey;
+ brokeredMessage.Properties[ServiceBusConstants.MessageBlobKey] = blobKey;
brokeredMessage.Properties[FrameworkConstants.CompressionTypePropertyName] = compressionType;
return brokeredMessage;
@@ -224,7 +227,7 @@ static Task LoadMessageStreamAsync(BrokeredMessage message, IOrchestrati
object blobKeyObj = null;
string blobKey = string.Empty;
- if (message.Properties.TryGetValue(FrameworkConstants.MessageBlobKey, out blobKeyObj))
+ if (message.Properties.TryGetValue(ServiceBusConstants.MessageBlobKey, out blobKeyObj))
{
blobKey = (string)blobKeyObj;
}
diff --git a/src/DurableTask.Framework/DurableTask.Framework.csproj b/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
similarity index 91%
rename from src/DurableTask.Framework/DurableTask.Framework.csproj
rename to src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
index d0a14e25e..471910d7f 100644
--- a/src/DurableTask.Framework/DurableTask.Framework.csproj
+++ b/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
@@ -3,8 +3,6 @@
net451
- DurableTaskFx
- DurableTasktrue
@@ -22,6 +20,10 @@
+
+
+
+
diff --git a/src/DurableTask.ServiceBus/ServiceBusConstants.cs b/src/DurableTask.ServiceBus/ServiceBusConstants.cs
new file mode 100644
index 000000000..b2d643996
--- /dev/null
+++ b/src/DurableTask.ServiceBus/ServiceBusConstants.cs
@@ -0,0 +1,37 @@
+// ----------------------------------------------------------------------------------
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+namespace DurableTask.ServiceBus
+{
+ using System;
+
+ internal class ServiceBusConstants
+ {
+ // name format constants
+ public const string OrchestratorEndpointFormat = "{0}/orchestrator";
+ public const string WorkerEndpointFormat = "{0}/worker";
+ public const string TrackingEndpointFormat = "{0}/tracking";
+
+ // tracking constants
+ public const string TaskMessageContentType = "TaskMessage";
+ public const string StateMessageContentType = "StateMessage";
+ public const string HistoryEventIndexPropertyName = "HistoryEventIndex";
+
+ // message blob key in message property
+ // this property is a key to the message blob when it exceeds the message limit
+ public const string MessageBlobKey = "MessageBlobKey";
+
+ // instance store constants
+ public const int MaxStringLengthForAzureTableColumn = 1024 * 15; // cut off at 15k * 2 bytes
+ }
+}
\ No newline at end of file
diff --git a/src/DurableTask.Framework/ServiceBusOrchestrationService.cs b/src/DurableTask.ServiceBus/ServiceBusOrchestrationService.cs
similarity index 98%
rename from src/DurableTask.Framework/ServiceBusOrchestrationService.cs
rename to src/DurableTask.ServiceBus/ServiceBusOrchestrationService.cs
index b6eb23658..397d687b8 100644
--- a/src/DurableTask.Framework/ServiceBusOrchestrationService.cs
+++ b/src/DurableTask.ServiceBus/ServiceBusOrchestrationService.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.ServiceBus
{
using System;
using System.Collections.Concurrent;
@@ -24,14 +24,17 @@ namespace DurableTask
using System.Threading.Tasks;
using System.Transactions;
- using DurableTask.Common;
- using DurableTask.Exceptions;
- using DurableTask.History;
- using DurableTask.Tracing;
- using DurableTask.Tracking;
- using DurableTask.Serializing;
- using DurableTask.Settings;
- using DurableTask.Stats;
+ using DurableTask.Core;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.Exceptions;
+ using DurableTask.Core.History;
+ using DurableTask.Core.Tracing;
+ using DurableTask.Core.Tracking;
+ using DurableTask.Core.Serializing;
+ using DurableTask.ServiceBus.Common;
+ using DurableTask.ServiceBus.Settings;
+ using DurableTask.ServiceBus.Stats;
+ using DurableTask.ServiceBus.Tracking;
using Microsoft.ServiceBus;
using Microsoft.ServiceBus.Messaging;
@@ -109,9 +112,9 @@ public ServiceBusOrchestrationService(
this.hubName = hubName;
this.ServiceStats = new ServiceBusOrchestrationServiceStats();
messagingFactory = ServiceBusUtils.CreateMessagingFactory(connectionString);
- workerEntityName = string.Format(FrameworkConstants.WorkerEndpointFormat, this.hubName);
- orchestratorEntityName = string.Format(FrameworkConstants.OrchestratorEndpointFormat, this.hubName);
- trackingEntityName = string.Format(FrameworkConstants.TrackingEndpointFormat, this.hubName);
+ workerEntityName = string.Format(ServiceBusConstants.WorkerEndpointFormat, this.hubName);
+ orchestratorEntityName = string.Format(ServiceBusConstants.OrchestratorEndpointFormat, this.hubName);
+ trackingEntityName = string.Format(ServiceBusConstants.TrackingEndpointFormat, this.hubName);
this.Settings = settings ?? new ServiceBusOrchestrationServiceSettings();
this.BlobStore = blobStore;
if (instanceStore != null)
diff --git a/src/DurableTask.Framework/ServiceBusOrchestrationSession.cs b/src/DurableTask.ServiceBus/ServiceBusOrchestrationSession.cs
similarity index 94%
rename from src/DurableTask.Framework/ServiceBusOrchestrationSession.cs
rename to src/DurableTask.ServiceBus/ServiceBusOrchestrationSession.cs
index 7f7f0d9c8..7ac8690b8 100644
--- a/src/DurableTask.Framework/ServiceBusOrchestrationSession.cs
+++ b/src/DurableTask.ServiceBus/ServiceBusOrchestrationSession.cs
@@ -11,11 +11,12 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask
+namespace DurableTask.ServiceBus
{
using System;
using System.Collections.Generic;
using Microsoft.ServiceBus.Messaging;
+ using DurableTask.Core;
class ServiceBusOrchestrationSession
{
diff --git a/src/DurableTask.Framework/Settings/JumpStartSettings.cs b/src/DurableTask.ServiceBus/Settings/JumpStartSettings.cs
similarity index 96%
rename from src/DurableTask.Framework/Settings/JumpStartSettings.cs
rename to src/DurableTask.ServiceBus/Settings/JumpStartSettings.cs
index 91f2d21f5..c4a1f1700 100644
--- a/src/DurableTask.Framework/Settings/JumpStartSettings.cs
+++ b/src/DurableTask.ServiceBus/Settings/JumpStartSettings.cs
@@ -11,9 +11,10 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Settings
+namespace DurableTask.ServiceBus.Settings
{
using System;
+ using DurableTask.Core;
///
/// Settings to configure the Jumpstart manager
diff --git a/src/DurableTask.Framework/Settings/ServiceBusMessageSettings.cs b/src/DurableTask.ServiceBus/Settings/ServiceBusMessageSettings.cs
similarity index 96%
rename from src/DurableTask.Framework/Settings/ServiceBusMessageSettings.cs
rename to src/DurableTask.ServiceBus/Settings/ServiceBusMessageSettings.cs
index 5edc75b75..c80a7849a 100644
--- a/src/DurableTask.Framework/Settings/ServiceBusMessageSettings.cs
+++ b/src/DurableTask.ServiceBus/Settings/ServiceBusMessageSettings.cs
@@ -11,8 +11,10 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Settings
+namespace DurableTask.ServiceBus.Settings
{
+ using DurableTask.Core;
+
///
/// Settings to configure the Service Bus message.
/// TODO: add a flag OverflowEnabled to indicate if the overflow settings are enabled
diff --git a/src/DurableTask.Framework/Settings/ServiceBusOrchestrationServiceSettings.cs b/src/DurableTask.ServiceBus/Settings/ServiceBusOrchestrationServiceSettings.cs
similarity index 97%
rename from src/DurableTask.Framework/Settings/ServiceBusOrchestrationServiceSettings.cs
rename to src/DurableTask.ServiceBus/Settings/ServiceBusOrchestrationServiceSettings.cs
index 709d1bc4a..4e3e239dc 100644
--- a/src/DurableTask.Framework/Settings/ServiceBusOrchestrationServiceSettings.cs
+++ b/src/DurableTask.ServiceBus/Settings/ServiceBusOrchestrationServiceSettings.cs
@@ -11,9 +11,11 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Settings
+namespace DurableTask.ServiceBus.Settings
{
- using DurableTask.Common;
+ using DurableTask.Core;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.Settings;
///
/// Configuration for various TaskHubWorker options
diff --git a/src/DurableTask.Framework/Settings/ServiceBusSessionSettings.cs b/src/DurableTask.ServiceBus/Settings/ServiceBusSessionSettings.cs
similarity index 90%
rename from src/DurableTask.Framework/Settings/ServiceBusSessionSettings.cs
rename to src/DurableTask.ServiceBus/Settings/ServiceBusSessionSettings.cs
index 2411e3201..2e5d6d4b5 100644
--- a/src/DurableTask.Framework/Settings/ServiceBusSessionSettings.cs
+++ b/src/DurableTask.ServiceBus/Settings/ServiceBusSessionSettings.cs
@@ -11,13 +11,15 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Settings
+namespace DurableTask.ServiceBus.Settings
{
+ using DurableTask.Core;
+ using DurableTask.Core.Settings;
+
///
/// Settings to configure the Service Bus session.
- /// TODO: add a flag OverflowEnabled to indicate if the overflow settings are enabled
///
- public class ServiceBusSessionSettings
+ public class ServiceBusSessionSettings : ISessionSettings
{
internal ServiceBusSessionSettings() :
this (FrameworkConstants.SessionOverflowThresholdInBytesDefault, FrameworkConstants.SessionMaxSizeInBytesDefault)
diff --git a/src/DurableTask.Framework/Stats/ServiceBusOrchestrationServiceStats.cs b/src/DurableTask.ServiceBus/Stats/ServiceBusOrchestrationServiceStats.cs
similarity index 98%
rename from src/DurableTask.Framework/Stats/ServiceBusOrchestrationServiceStats.cs
rename to src/DurableTask.ServiceBus/Stats/ServiceBusOrchestrationServiceStats.cs
index bc3517a9f..aefefa875 100644
--- a/src/DurableTask.Framework/Stats/ServiceBusOrchestrationServiceStats.cs
+++ b/src/DurableTask.ServiceBus/Stats/ServiceBusOrchestrationServiceStats.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Stats
+namespace DurableTask.ServiceBus.Stats
{
///
/// Stats for the ServiceBusOrchestrationService
diff --git a/src/DurableTask.Framework/Stats/ServiceBusQueueStats.cs b/src/DurableTask.ServiceBus/Stats/ServiceBusQueueStats.cs
similarity index 97%
rename from src/DurableTask.Framework/Stats/ServiceBusQueueStats.cs
rename to src/DurableTask.ServiceBus/Stats/ServiceBusQueueStats.cs
index be6455c29..532a55e76 100644
--- a/src/DurableTask.Framework/Stats/ServiceBusQueueStats.cs
+++ b/src/DurableTask.ServiceBus/Stats/ServiceBusQueueStats.cs
@@ -11,8 +11,10 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Stats
+namespace DurableTask.ServiceBus.Stats
{
+ using DurableTask.Core.Stats;
+
///
/// Stats container for a Service Bus queue
///
diff --git a/src/DurableTask.Framework/Tracking/AzureStorageBlobStore.cs b/src/DurableTask.ServiceBus/Tracking/AzureStorageBlobStore.cs
similarity index 97%
rename from src/DurableTask.Framework/Tracking/AzureStorageBlobStore.cs
rename to src/DurableTask.ServiceBus/Tracking/AzureStorageBlobStore.cs
index 57058f4d5..5f7aff0c2 100644
--- a/src/DurableTask.Framework/Tracking/AzureStorageBlobStore.cs
+++ b/src/DurableTask.ServiceBus/Tracking/AzureStorageBlobStore.cs
@@ -11,11 +11,13 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Tracking
+namespace DurableTask.ServiceBus.Tracking
{
using System;
using System.IO;
using System.Threading.Tasks;
+ using DurableTask.Core;
+ using DurableTask.Core.Tracking;
///
/// Azure blob storage to allow save and load large blobs, such as message and session, as a stream using Azure blob container.
diff --git a/src/DurableTask.Framework/Tracking/AzureTableClient.cs b/src/DurableTask.ServiceBus/Tracking/AzureTableClient.cs
similarity index 99%
rename from src/DurableTask.Framework/Tracking/AzureTableClient.cs
rename to src/DurableTask.ServiceBus/Tracking/AzureTableClient.cs
index 9d07deedf..ee543212e 100644
--- a/src/DurableTask.Framework/Tracking/AzureTableClient.cs
+++ b/src/DurableTask.ServiceBus/Tracking/AzureTableClient.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Tracking
+namespace DurableTask.ServiceBus.Tracking
{
using System;
using System.Collections.Generic;
@@ -21,9 +21,10 @@ namespace DurableTask.Tracking
using System.Net;
using System.Threading.Tasks;
using System.Xml;
- using DurableTask.Common;
- using DurableTask.Exceptions;
- using DurableTask.Tracing;
+ using DurableTask.Core;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.Exceptions;
+ using DurableTask.Core.Tracing;
using Microsoft.WindowsAzure.Storage;
using Microsoft.WindowsAzure.Storage.RetryPolicies;
using Microsoft.WindowsAzure.Storage.Table;
diff --git a/src/DurableTask.Framework/Tracking/AzureTableCompositeTableEntity.cs b/src/DurableTask.ServiceBus/Tracking/AzureTableCompositeTableEntity.cs
similarity index 98%
rename from src/DurableTask.Framework/Tracking/AzureTableCompositeTableEntity.cs
rename to src/DurableTask.ServiceBus/Tracking/AzureTableCompositeTableEntity.cs
index 1102d12f2..7822f69db 100644
--- a/src/DurableTask.Framework/Tracking/AzureTableCompositeTableEntity.cs
+++ b/src/DurableTask.ServiceBus/Tracking/AzureTableCompositeTableEntity.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Tracking
+namespace DurableTask.ServiceBus.Tracking
{
using System;
using System.Collections.Generic;
diff --git a/src/DurableTask.Framework/Tracking/AzureTableConstants.cs b/src/DurableTask.ServiceBus/Tracking/AzureTableConstants.cs
similarity index 99%
rename from src/DurableTask.Framework/Tracking/AzureTableConstants.cs
rename to src/DurableTask.ServiceBus/Tracking/AzureTableConstants.cs
index 1f0554c8e..ae2d7459e 100644
--- a/src/DurableTask.Framework/Tracking/AzureTableConstants.cs
+++ b/src/DurableTask.ServiceBus/Tracking/AzureTableConstants.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Tracking
+namespace DurableTask.ServiceBus.Tracking
{
internal class AzureTableConstants
{
diff --git a/src/DurableTask.Framework/Tracking/AzureTableInstanceStore.cs b/src/DurableTask.ServiceBus/Tracking/AzureTableInstanceStore.cs
similarity index 99%
rename from src/DurableTask.Framework/Tracking/AzureTableInstanceStore.cs
rename to src/DurableTask.ServiceBus/Tracking/AzureTableInstanceStore.cs
index 256f04c40..9adad9df9 100644
--- a/src/DurableTask.Framework/Tracking/AzureTableInstanceStore.cs
+++ b/src/DurableTask.ServiceBus/Tracking/AzureTableInstanceStore.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Tracking
+namespace DurableTask.ServiceBus.Tracking
{
using System;
using System.Collections.Concurrent;
@@ -19,8 +19,10 @@ namespace DurableTask.Tracking
using System.Linq;
using System.Text;
using System.Threading.Tasks;
- using DurableTask.Common;
- using DurableTask.Serializing;
+ using DurableTask.Core;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.Serializing;
+ using DurableTask.Core.Tracking;
using Microsoft.WindowsAzure.Storage.Table;
///
diff --git a/src/DurableTask.Framework/Tracking/AzureTableOrchestrationHistoryEventEntity.cs b/src/DurableTask.ServiceBus/Tracking/AzureTableOrchestrationHistoryEventEntity.cs
similarity index 95%
rename from src/DurableTask.Framework/Tracking/AzureTableOrchestrationHistoryEventEntity.cs
rename to src/DurableTask.ServiceBus/Tracking/AzureTableOrchestrationHistoryEventEntity.cs
index e6344be0a..1f639e65d 100644
--- a/src/DurableTask.Framework/Tracking/AzureTableOrchestrationHistoryEventEntity.cs
+++ b/src/DurableTask.ServiceBus/Tracking/AzureTableOrchestrationHistoryEventEntity.cs
@@ -11,11 +11,11 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Tracking
+namespace DurableTask.ServiceBus.Tracking
{
using System;
using System.Collections.Generic;
- using DurableTask.History;
+ using DurableTask.Core.History;
using Microsoft.WindowsAzure.Storage;
using Microsoft.WindowsAzure.Storage.Table;
using Newtonsoft.Json;
@@ -110,10 +110,10 @@ public override IDictionary WriteEntity(OperationContext
// note that this makes the history stored in the instance store unreplayable. so any replay logic
// that we build will have to especially check for this event and flag the orchestration as unplayable if it sees this event
if (!string.IsNullOrEmpty(serializedHistoryEvent) &&
- serializedHistoryEvent.Length > FrameworkConstants.MaxStringLengthForAzureTableColumn)
+ serializedHistoryEvent.Length > ServiceBusConstants.MaxStringLengthForAzureTableColumn)
{
serializedHistoryEvent = JsonConvert.SerializeObject(new GenericEvent(HistoryEvent.EventId,
- serializedHistoryEvent.Substring(0, FrameworkConstants.MaxStringLengthForAzureTableColumn) + " ....(truncated)..]"),
+ serializedHistoryEvent.Substring(0, ServiceBusConstants.MaxStringLengthForAzureTableColumn) + " ....(truncated)..]"),
new JsonSerializerSettings
{
Formatting = Formatting.Indented,
diff --git a/src/DurableTask.Framework/Tracking/AzureTableOrchestrationJumpStartEntity.cs b/src/DurableTask.ServiceBus/Tracking/AzureTableOrchestrationJumpStartEntity.cs
similarity index 98%
rename from src/DurableTask.Framework/Tracking/AzureTableOrchestrationJumpStartEntity.cs
rename to src/DurableTask.ServiceBus/Tracking/AzureTableOrchestrationJumpStartEntity.cs
index a29b46d96..a479f8f4c 100644
--- a/src/DurableTask.Framework/Tracking/AzureTableOrchestrationJumpStartEntity.cs
+++ b/src/DurableTask.ServiceBus/Tracking/AzureTableOrchestrationJumpStartEntity.cs
@@ -11,13 +11,14 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Tracking
+namespace DurableTask.ServiceBus.Tracking
{
using System;
using System.Collections.Generic;
using System.Globalization;
using Microsoft.WindowsAzure.Storage;
using Microsoft.WindowsAzure.Storage.Table;
+ using DurableTask.Core.Tracking;
///
/// History Tracking Entity for orchestration jump start event
diff --git a/src/DurableTask.Framework/Tracking/AzureTableOrchestrationStateEntity.cs b/src/DurableTask.ServiceBus/Tracking/AzureTableOrchestrationStateEntity.cs
similarity index 97%
rename from src/DurableTask.Framework/Tracking/AzureTableOrchestrationStateEntity.cs
rename to src/DurableTask.ServiceBus/Tracking/AzureTableOrchestrationStateEntity.cs
index fc413697a..a56a8cfc6 100644
--- a/src/DurableTask.Framework/Tracking/AzureTableOrchestrationStateEntity.cs
+++ b/src/DurableTask.ServiceBus/Tracking/AzureTableOrchestrationStateEntity.cs
@@ -11,12 +11,13 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Tracking
+namespace DurableTask.ServiceBus.Tracking
{
using System;
using System.Collections.Generic;
- using DurableTask.Common;
- using DurableTask.Serializing;
+ using DurableTask.Core;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.Serializing;
using Microsoft.WindowsAzure.Storage;
using Microsoft.WindowsAzure.Storage.Table;
@@ -95,8 +96,8 @@ public override IDictionary WriteEntity(OperationContext
retVals.Add("LastUpdatedTime", new EntityProperty(State.LastUpdatedTime));
retVals.Add("Size", new EntityProperty(State.Size));
retVals.Add("CompressedSize", new EntityProperty(State.CompressedSize));
- retVals.Add("Input", new EntityProperty(State.Input.Truncate(FrameworkConstants.MaxStringLengthForAzureTableColumn)));
- retVals.Add("Output", new EntityProperty(State.Output.Truncate(FrameworkConstants.MaxStringLengthForAzureTableColumn)));
+ retVals.Add("Input", new EntityProperty(State.Input.Truncate(ServiceBusConstants.MaxStringLengthForAzureTableColumn)));
+ retVals.Add("Output", new EntityProperty(State.Output.Truncate(ServiceBusConstants.MaxStringLengthForAzureTableColumn)));
return retVals;
}
diff --git a/src/DurableTask.Framework/Tracking/BlobStorageClient.cs b/src/DurableTask.ServiceBus/Tracking/BlobStorageClient.cs
similarity index 99%
rename from src/DurableTask.Framework/Tracking/BlobStorageClient.cs
rename to src/DurableTask.ServiceBus/Tracking/BlobStorageClient.cs
index f71660aa2..012918674 100644
--- a/src/DurableTask.Framework/Tracking/BlobStorageClient.cs
+++ b/src/DurableTask.ServiceBus/Tracking/BlobStorageClient.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Tracking
+namespace DurableTask.ServiceBus.Tracking
{
using System;
using System.Collections.Generic;
diff --git a/src/DurableTask.Framework/Tracking/BlobStorageClientHelper.cs b/src/DurableTask.ServiceBus/Tracking/BlobStorageClientHelper.cs
similarity index 98%
rename from src/DurableTask.Framework/Tracking/BlobStorageClientHelper.cs
rename to src/DurableTask.ServiceBus/Tracking/BlobStorageClientHelper.cs
index 052349ead..a605f0c27 100644
--- a/src/DurableTask.Framework/Tracking/BlobStorageClientHelper.cs
+++ b/src/DurableTask.ServiceBus/Tracking/BlobStorageClientHelper.cs
@@ -11,14 +11,14 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Tracking
+namespace DurableTask.ServiceBus.Tracking
{
using System;
using System.Diagnostics;
using System.Globalization;
using System.Text.RegularExpressions;
- using DurableTask.Tracing;
- using DurableTask.Common;
+ using DurableTask.Core.Tracing;
+ using DurableTask.Core.Common;
///
/// A helper class for the Azure blob storage client.
diff --git a/src/DurableTask.Framework/Tracking/JumpStartManager.cs b/src/DurableTask.ServiceBus/Tracking/JumpStartManager.cs
similarity index 96%
rename from src/DurableTask.Framework/Tracking/JumpStartManager.cs
rename to src/DurableTask.ServiceBus/Tracking/JumpStartManager.cs
index b7f99148b..20c6ed76d 100644
--- a/src/DurableTask.Framework/Tracking/JumpStartManager.cs
+++ b/src/DurableTask.ServiceBus/Tracking/JumpStartManager.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Tracking
+namespace DurableTask.ServiceBus.Tracking
{
using System;
using System.Collections.Generic;
@@ -19,9 +19,11 @@ namespace DurableTask.Tracking
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
- using Common;
- using History;
- using Tracing;
+ using DurableTask.Core;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.History;
+ using DurableTask.Core.Tracing;
+ using DurableTask.Core.Tracking;
internal class JumpStartManager
{
diff --git a/src/DurableTask.Framework/app.config b/src/DurableTask.ServiceBus/app.config
similarity index 100%
rename from src/DurableTask.Framework/app.config
rename to src/DurableTask.ServiceBus/app.config
diff --git a/test/DurableTask.Framework.Tests/AssemblyInfo.cs b/test/DurableTask.Core.Tests/AssemblyInfo.cs
similarity index 100%
rename from test/DurableTask.Framework.Tests/AssemblyInfo.cs
rename to test/DurableTask.Core.Tests/AssemblyInfo.cs
diff --git a/test/DurableTask.Framework.Tests/CommonTests.cs b/test/DurableTask.Core.Tests/CommonTests.cs
similarity index 95%
rename from test/DurableTask.Framework.Tests/CommonTests.cs
rename to test/DurableTask.Core.Tests/CommonTests.cs
index c09e2efba..12b696101 100644
--- a/test/DurableTask.Framework.Tests/CommonTests.cs
+++ b/test/DurableTask.Core.Tests/CommonTests.cs
@@ -11,10 +11,10 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Framework.Tests
+namespace DurableTask.Core.Tests
{
using System;
- using DurableTask.Common;
+ using DurableTask.Core.Common;
using Microsoft.VisualStudio.TestTools.UnitTesting;
[TestClass]
diff --git a/test/DurableTask.Framework.Tests/DurableTask.Framework.Tests.csproj b/test/DurableTask.Core.Tests/DurableTask.Core.Tests.csproj
similarity index 78%
rename from test/DurableTask.Framework.Tests/DurableTask.Framework.Tests.csproj
rename to test/DurableTask.Core.Tests/DurableTask.Core.Tests.csproj
index 1b9c7849c..8951ed702 100644
--- a/test/DurableTask.Framework.Tests/DurableTask.Framework.Tests.csproj
+++ b/test/DurableTask.Core.Tests/DurableTask.Core.Tests.csproj
@@ -11,9 +11,10 @@
-
+
-
+
+
diff --git a/test/DurableTask.Framework.Tests/DurableTaskCoreFxTest.cs b/test/DurableTask.Core.Tests/DurableTaskCoreFxTest.cs
similarity index 99%
rename from test/DurableTask.Framework.Tests/DurableTaskCoreFxTest.cs
rename to test/DurableTask.Core.Tests/DurableTaskCoreFxTest.cs
index 057bc61cc..a2e6de002 100644
--- a/test/DurableTask.Framework.Tests/DurableTaskCoreFxTest.cs
+++ b/test/DurableTask.Core.Tests/DurableTaskCoreFxTest.cs
@@ -12,16 +12,16 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Framework.Tests
+namespace DurableTask.Core.Tests
{
using System;
using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;
- using DurableTask;
- using DurableTask.Settings;
+ using DurableTask.Core;
+ using DurableTask.Core.Settings;
using Microsoft.VisualStudio.TestTools.UnitTesting;
- using DurableTask.Framework.Tests.Mocks;
+ using DurableTask.Core.Tests.Mocks;
///
/// Test the core dtfx via a mock orchestration service and client provider
diff --git a/test/DurableTask.Framework.Tests/Mocks/LocalOrchestrationService.cs b/test/DurableTask.Core.Tests/Mocks/LocalOrchestrationService.cs
similarity index 99%
rename from test/DurableTask.Framework.Tests/Mocks/LocalOrchestrationService.cs
rename to test/DurableTask.Core.Tests/Mocks/LocalOrchestrationService.cs
index f0f0aca16..d5477cebd 100644
--- a/test/DurableTask.Framework.Tests/Mocks/LocalOrchestrationService.cs
+++ b/test/DurableTask.Core.Tests/Mocks/LocalOrchestrationService.cs
@@ -11,11 +11,11 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Framework.Tests.Mocks
+namespace DurableTask.Core.Tests.Mocks
{
- using DurableTask;
- using DurableTask.History;
- using DurableTask.Tracing;
+ using DurableTask.Core;
+ using DurableTask.Core.History;
+ using DurableTask.Core.Tracing;
using Newtonsoft.Json;
using System;
using System.Collections.Concurrent;
diff --git a/test/DurableTask.Framework.Tests/Mocks/PeekLockQueue.cs b/test/DurableTask.Core.Tests/Mocks/PeekLockQueue.cs
similarity index 97%
rename from test/DurableTask.Framework.Tests/Mocks/PeekLockQueue.cs
rename to test/DurableTask.Core.Tests/Mocks/PeekLockQueue.cs
index bb8e9753f..bc40ef9c3 100644
--- a/test/DurableTask.Framework.Tests/Mocks/PeekLockQueue.cs
+++ b/test/DurableTask.Core.Tests/Mocks/PeekLockQueue.cs
@@ -11,9 +11,9 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Framework.Tests.Mocks
+namespace DurableTask.Core.Tests.Mocks
{
- using DurableTask;
+ using DurableTask.Core;
using System;
using System.Collections.Generic;
using System.Diagnostics;
diff --git a/test/DurableTask.Framework.Tests/Mocks/PeekLockSessionQueue.cs b/test/DurableTask.Core.Tests/Mocks/PeekLockSessionQueue.cs
similarity index 98%
rename from test/DurableTask.Framework.Tests/Mocks/PeekLockSessionQueue.cs
rename to test/DurableTask.Core.Tests/Mocks/PeekLockSessionQueue.cs
index 142a97ff1..4dbf6c86f 100644
--- a/test/DurableTask.Framework.Tests/Mocks/PeekLockSessionQueue.cs
+++ b/test/DurableTask.Core.Tests/Mocks/PeekLockSessionQueue.cs
@@ -11,9 +11,9 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Framework.Tests.Mocks
+namespace DurableTask.Core.Tests.Mocks
{
- using DurableTask;
+ using DurableTask.Core;
using System;
using System.Collections.Generic;
using System.Diagnostics;
diff --git a/test/DurableTask.Framework.Tests/Mocks/TaskSession.cs b/test/DurableTask.Core.Tests/Mocks/TaskSession.cs
similarity index 94%
rename from test/DurableTask.Framework.Tests/Mocks/TaskSession.cs
rename to test/DurableTask.Core.Tests/Mocks/TaskSession.cs
index 39629d4ac..560f7cd0c 100644
--- a/test/DurableTask.Framework.Tests/Mocks/TaskSession.cs
+++ b/test/DurableTask.Core.Tests/Mocks/TaskSession.cs
@@ -11,9 +11,9 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Framework.Tests.Mocks
+namespace DurableTask.Core.Tests.Mocks
{
- using DurableTask;
+ using DurableTask.Core;
using System.Collections.Generic;
class TaskSession
diff --git a/test/DurableTask.Framework.Tests/OrchestrationTestHostTests.cs b/test/DurableTask.Core.Tests/OrchestrationTestHostTests.cs
similarity index 99%
rename from test/DurableTask.Framework.Tests/OrchestrationTestHostTests.cs
rename to test/DurableTask.Core.Tests/OrchestrationTestHostTests.cs
index febbb6cce..916c4cd03 100644
--- a/test/DurableTask.Framework.Tests/OrchestrationTestHostTests.cs
+++ b/test/DurableTask.Core.Tests/OrchestrationTestHostTests.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Framework.Tests
+namespace DurableTask.Core.Tests
{
using System;
using System.Collections.Generic;
@@ -19,9 +19,9 @@ namespace DurableTask.Framework.Tests
using System.Threading.Tasks;
using System.Linq;
- using DurableTask;
- using DurableTask.Exceptions;
- using DurableTask.Test;
+ using DurableTask.Core;
+ using DurableTask.Core.Exceptions;
+ using DurableTask.Core.Test;
using Microsoft.VisualStudio.TestTools.UnitTesting;
[TestClass]
diff --git a/test/DurableTask.Framework.Tests/TestObjectCreator.cs b/test/DurableTask.Core.Tests/TestObjectCreator.cs
similarity index 95%
rename from test/DurableTask.Framework.Tests/TestObjectCreator.cs
rename to test/DurableTask.Core.Tests/TestObjectCreator.cs
index b155f0e21..1095f49be 100644
--- a/test/DurableTask.Framework.Tests/TestObjectCreator.cs
+++ b/test/DurableTask.Core.Tests/TestObjectCreator.cs
@@ -11,10 +11,10 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Framework.Tests
+namespace DurableTask.Core.Tests
{
using System;
- using DurableTask;
+ using DurableTask.Core;
internal class TestObjectCreator : ObjectCreator
{
diff --git a/test/DurableTask.Framework.Tests/TestUtils.cs b/test/DurableTask.Core.Tests/TestUtils.cs
similarity index 97%
rename from test/DurableTask.Framework.Tests/TestUtils.cs
rename to test/DurableTask.Core.Tests/TestUtils.cs
index 46ceeb274..efbbdc536 100644
--- a/test/DurableTask.Framework.Tests/TestUtils.cs
+++ b/test/DurableTask.Core.Tests/TestUtils.cs
@@ -11,7 +11,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------
-namespace DurableTask.Framework.Tests
+namespace DurableTask.Core.Tests
{
using System;
using System.Text;
diff --git a/test/DurableTask.Framework.Tests/app.config b/test/DurableTask.Core.Tests/app.config
similarity index 100%
rename from test/DurableTask.Framework.Tests/app.config
rename to test/DurableTask.Core.Tests/app.config
diff --git a/test/DurableTask.Samples.Tests/AverageCalculatorTests.cs b/test/DurableTask.Samples.Tests/AverageCalculatorTests.cs
index 2ed6246b1..8b33adea8 100644
--- a/test/DurableTask.Samples.Tests/AverageCalculatorTests.cs
+++ b/test/DurableTask.Samples.Tests/AverageCalculatorTests.cs
@@ -16,7 +16,7 @@ namespace DurableTask.Samples.Tests
using System;
using System.Threading.Tasks;
using DurableTask.Samples.AverageCalculator;
- using DurableTask.Test;
+ using DurableTask.Core.Test;
using Microsoft.VisualStudio.TestTools.UnitTesting;
[TestClass]
diff --git a/test/DurableTask.Samples.Tests/CronTest.cs b/test/DurableTask.Samples.Tests/CronTest.cs
index 546cc26d3..479dec5ae 100644
--- a/test/DurableTask.Samples.Tests/CronTest.cs
+++ b/test/DurableTask.Samples.Tests/CronTest.cs
@@ -15,9 +15,9 @@ namespace DurableTask.Samples.Tests
{
using System;
using System.Threading.Tasks;
- using DurableTask;
+ using DurableTask.Core;
using DurableTask.Samples.Cron;
- using DurableTask.Test;
+ using DurableTask.Core.Test;
using Microsoft.VisualStudio.TestTools.UnitTesting;
[TestClass]
@@ -31,7 +31,7 @@ public MockCronTask()
{
}
- 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.ToString() + "' Number: " + input);
diff --git a/test/DurableTask.Samples.Tests/DurableTask.Samples.Tests.csproj b/test/DurableTask.Samples.Tests/DurableTask.Samples.Tests.csproj
index a540421ba..d9940c80c 100644
--- a/test/DurableTask.Samples.Tests/DurableTask.Samples.Tests.csproj
+++ b/test/DurableTask.Samples.Tests/DurableTask.Samples.Tests.csproj
@@ -12,7 +12,6 @@
-
diff --git a/test/DurableTask.Samples.Tests/MockObjectCreator.cs b/test/DurableTask.Samples.Tests/MockObjectCreator.cs
index 617725606..6a9f33551 100644
--- a/test/DurableTask.Samples.Tests/MockObjectCreator.cs
+++ b/test/DurableTask.Samples.Tests/MockObjectCreator.cs
@@ -14,7 +14,7 @@
namespace DurableTask.Samples.Tests
{
using System;
- using DurableTask;
+ using DurableTask.Core;
class MockObjectCreator : ObjectCreator
{
diff --git a/test/DurableTask.ServiceBus.Tests/BlobStorageClientHelperTest.cs b/test/DurableTask.ServiceBus.Tests/BlobStorageClientHelperTest.cs
index 6400a2156..72b57d68b 100644
--- a/test/DurableTask.ServiceBus.Tests/BlobStorageClientHelperTest.cs
+++ b/test/DurableTask.ServiceBus.Tests/BlobStorageClientHelperTest.cs
@@ -16,7 +16,7 @@ namespace DurableTask.ServiceBus.Tests
using System;
using System.Text.RegularExpressions;
using Microsoft.VisualStudio.TestTools.UnitTesting;
- using DurableTask.Tracking;
+ using DurableTask.ServiceBus.Tracking;
[TestClass]
public class BlobStorageClientHelperTest
diff --git a/test/DurableTask.ServiceBus.Tests/BlobStorageClientTest.cs b/test/DurableTask.ServiceBus.Tests/BlobStorageClientTest.cs
index 7b1a7dbd1..432fa3ef2 100644
--- a/test/DurableTask.ServiceBus.Tests/BlobStorageClientTest.cs
+++ b/test/DurableTask.ServiceBus.Tests/BlobStorageClientTest.cs
@@ -21,7 +21,7 @@ namespace DurableTask.ServiceBus.Tests
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.WindowsAzure.Storage.Blob;
- using DurableTask.Tracking;
+ using DurableTask.ServiceBus.Tracking;
[TestClass]
public class BlobStorageClientTest
diff --git a/test/DurableTask.ServiceBus.Tests/DispatcherTests.cs b/test/DurableTask.ServiceBus.Tests/DispatcherTests.cs
index c01dcca52..6b29c8283 100644
--- a/test/DurableTask.ServiceBus.Tests/DispatcherTests.cs
+++ b/test/DurableTask.ServiceBus.Tests/DispatcherTests.cs
@@ -19,11 +19,12 @@ namespace DurableTask.ServiceBus.Tests
using System.Text;
using System.Threading;
using System.Threading.Tasks;
- using DurableTask;
- using DurableTask.Common;
- using DurableTask.Settings;
- using DurableTask.Test;
- using Framework.Tests;
+ using DurableTask.Core;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.Settings;
+ using DurableTask.Core.Test;
+ using DurableTask.ServiceBus.Settings;
+ using DurableTask.Core.Tests;
using Microsoft.VisualStudio.TestTools.UnitTesting;
[TestClass]
diff --git a/test/DurableTask.ServiceBus.Tests/DurableTask.ServiceBus.Tests.csproj b/test/DurableTask.ServiceBus.Tests/DurableTask.ServiceBus.Tests.csproj
index 310113259..279552f4a 100644
--- a/test/DurableTask.ServiceBus.Tests/DurableTask.ServiceBus.Tests.csproj
+++ b/test/DurableTask.ServiceBus.Tests/DurableTask.ServiceBus.Tests.csproj
@@ -25,8 +25,9 @@
-
-
+
+
+
diff --git a/test/DurableTask.ServiceBus.Tests/DynamicProxyTests.cs b/test/DurableTask.ServiceBus.Tests/DynamicProxyTests.cs
index 7df37497d..1a5fa8267 100644
--- a/test/DurableTask.ServiceBus.Tests/DynamicProxyTests.cs
+++ b/test/DurableTask.ServiceBus.Tests/DynamicProxyTests.cs
@@ -16,9 +16,9 @@ namespace DurableTask.ServiceBus.Tests
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
- using DurableTask;
- using DurableTask.Exceptions;
- using Framework.Tests;
+ using DurableTask.Core;
+ using DurableTask.Core.Exceptions;
+ using DurableTask.Core.Tests;
using Microsoft.VisualStudio.TestTools.UnitTesting;
[TestClass]
diff --git a/test/DurableTask.ServiceBus.Tests/ErrorHandlingTests.cs b/test/DurableTask.ServiceBus.Tests/ErrorHandlingTests.cs
index 57513905b..a1663dd53 100644
--- a/test/DurableTask.ServiceBus.Tests/ErrorHandlingTests.cs
+++ b/test/DurableTask.ServiceBus.Tests/ErrorHandlingTests.cs
@@ -18,9 +18,9 @@ namespace DurableTask.ServiceBus.Tests
using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
- using DurableTask;
- using DurableTask.Exceptions;
- using DurableTask.Framework.Tests;
+ using DurableTask.Core;
+ using DurableTask.Core.Exceptions;
+ using DurableTask.Core.Tests;
using Microsoft.VisualStudio.TestTools.UnitTesting;
[TestClass]
diff --git a/test/DurableTask.ServiceBus.Tests/FunctionalTests.cs b/test/DurableTask.ServiceBus.Tests/FunctionalTests.cs
index f4b1af775..8879f6818 100644
--- a/test/DurableTask.ServiceBus.Tests/FunctionalTests.cs
+++ b/test/DurableTask.ServiceBus.Tests/FunctionalTests.cs
@@ -19,12 +19,12 @@ namespace DurableTask.ServiceBus.Tests
using System.Text;
using System.Threading;
using System.Threading.Tasks;
- using DurableTask;
- using DurableTask.Exceptions;
- using DurableTask.Serializing;
- using DurableTask.Settings;
- using DurableTask.Test;
- using Framework.Tests;
+ using DurableTask.Core;
+ using DurableTask.Core.Exceptions;
+ using DurableTask.Core.Serializing;
+ using DurableTask.Core.Test;
+ using DurableTask.ServiceBus.Settings;
+ using DurableTask.Core.Tests;
using Microsoft.VisualStudio.TestTools.UnitTesting;
[TestClass]
diff --git a/test/DurableTask.ServiceBus.Tests/InstanceStoreQueryTests.cs b/test/DurableTask.ServiceBus.Tests/InstanceStoreQueryTests.cs
index 07c6e3678..b3af007d3 100644
--- a/test/DurableTask.ServiceBus.Tests/InstanceStoreQueryTests.cs
+++ b/test/DurableTask.ServiceBus.Tests/InstanceStoreQueryTests.cs
@@ -18,8 +18,8 @@ namespace DurableTask.ServiceBus.Tests
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
- using DurableTask;
- using DurableTask.Tracking;
+ using DurableTask.Core;
+ using DurableTask.ServiceBus.Tracking;
using Microsoft.VisualStudio.TestTools.UnitTesting;
[TestClass]
diff --git a/test/DurableTask.ServiceBus.Tests/OrchestrationHubTableClientTests.cs b/test/DurableTask.ServiceBus.Tests/OrchestrationHubTableClientTests.cs
index 1e3e18217..816f13b85 100644
--- a/test/DurableTask.ServiceBus.Tests/OrchestrationHubTableClientTests.cs
+++ b/test/DurableTask.ServiceBus.Tests/OrchestrationHubTableClientTests.cs
@@ -17,9 +17,9 @@ namespace DurableTask.ServiceBus.Tests
using System.Collections.Generic;
using System.Diagnostics;
using System.Threading.Tasks;
- using DurableTask;
- using DurableTask.History;
- using DurableTask.Tracking;
+ using DurableTask.Core;
+ using DurableTask.Core.History;
+ using DurableTask.ServiceBus.Tracking;
using Microsoft.VisualStudio.TestTools.UnitTesting;
[TestClass]
diff --git a/test/DurableTask.ServiceBus.Tests/RuntimeStateStreamConverterTest.cs b/test/DurableTask.ServiceBus.Tests/RuntimeStateStreamConverterTest.cs
index b54b84475..92290422e 100644
--- a/test/DurableTask.ServiceBus.Tests/RuntimeStateStreamConverterTest.cs
+++ b/test/DurableTask.ServiceBus.Tests/RuntimeStateStreamConverterTest.cs
@@ -18,14 +18,14 @@ namespace DurableTask.ServiceBus.Tests
using System.IO;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
- using DurableTask;
- using DurableTask.Common;
- using DurableTask.Exceptions;
- using DurableTask.History;
- using DurableTask.Serializing;
- using DurableTask.Settings;
- using DurableTask.Tracking;
- using Framework.Tests;
+ using DurableTask.Core;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.Exceptions;
+ using DurableTask.Core.History;
+ using DurableTask.Core.Serializing;
+ using DurableTask.ServiceBus.Settings;
+ using DurableTask.ServiceBus.Tracking;
+ using DurableTask.Core.Tests;
[TestClass]
public class RuntimeStateStreamConverterTest
diff --git a/test/DurableTask.ServiceBus.Tests/SampleScenarioTests.cs b/test/DurableTask.ServiceBus.Tests/SampleScenarioTests.cs
index 6e7b43e29..3a04a584f 100644
--- a/test/DurableTask.ServiceBus.Tests/SampleScenarioTests.cs
+++ b/test/DurableTask.ServiceBus.Tests/SampleScenarioTests.cs
@@ -20,10 +20,10 @@ namespace DurableTask.ServiceBus.Tests
using System.Threading.Tasks;
using System.Linq;
- using DurableTask;
- using DurableTask.Exceptions;
- using DurableTask.Test;
- using Framework.Tests;
+ using DurableTask.Core;
+ using DurableTask.Core.Exceptions;
+ using DurableTask.Core.Test;
+ using DurableTask.Core.Tests;
using Microsoft.VisualStudio.TestTools.UnitTesting;
[TestClass]
diff --git a/test/DurableTask.ServiceBus.Tests/SerializationTests.cs b/test/DurableTask.ServiceBus.Tests/SerializationTests.cs
index 5c7b5d546..de5feaf41 100644
--- a/test/DurableTask.ServiceBus.Tests/SerializationTests.cs
+++ b/test/DurableTask.ServiceBus.Tests/SerializationTests.cs
@@ -16,9 +16,9 @@ namespace DurableTask.ServiceBus.Tests
using System;
using System.IO;
using System.Threading.Tasks;
- using DurableTask;
- using DurableTask.History;
- using DurableTask.Serializing;
+ using DurableTask.Core;
+ using DurableTask.Core.History;
+ using DurableTask.Core.Serializing;
using Microsoft.VisualStudio.TestTools.UnitTesting;
[TestClass]
diff --git a/test/DurableTask.ServiceBus.Tests/ServiceBusOrchestrationServiceTests.cs b/test/DurableTask.ServiceBus.Tests/ServiceBusOrchestrationServiceTests.cs
index 2e66637e4..7cdd59063 100644
--- a/test/DurableTask.ServiceBus.Tests/ServiceBusOrchestrationServiceTests.cs
+++ b/test/DurableTask.ServiceBus.Tests/ServiceBusOrchestrationServiceTests.cs
@@ -16,8 +16,8 @@ namespace DurableTask.ServiceBus.Tests
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
- using DurableTask;
- using Framework.Tests;
+ using DurableTask.Core;
+ using DurableTask.Core.Tests;
using Microsoft.VisualStudio.TestTools.UnitTesting;
[TestClass]
diff --git a/test/DurableTask.ServiceBus.Tests/TaskHubClientTests.cs b/test/DurableTask.ServiceBus.Tests/TaskHubClientTests.cs
index eefabf3fb..9cc7f4dca 100644
--- a/test/DurableTask.ServiceBus.Tests/TaskHubClientTests.cs
+++ b/test/DurableTask.ServiceBus.Tests/TaskHubClientTests.cs
@@ -15,8 +15,8 @@ namespace DurableTask.ServiceBus.Tests
{
using System.Collections.Generic;
using System.Threading.Tasks;
- using DurableTask;
- using DurableTask.Settings;
+ using DurableTask.Core;
+ using DurableTask.ServiceBus.Settings;
using Microsoft.VisualStudio.TestTools.UnitTesting;
[TestClass]
diff --git a/test/DurableTask.ServiceBus.Tests/TestData/SerializedExecutionStartedEvent.json b/test/DurableTask.ServiceBus.Tests/TestData/SerializedExecutionStartedEvent.json
index 4a78d4406..34c681448 100644
--- a/test/DurableTask.ServiceBus.Tests/TestData/SerializedExecutionStartedEvent.json
+++ b/test/DurableTask.ServiceBus.Tests/TestData/SerializedExecutionStartedEvent.json
@@ -1,7 +1,7 @@
{
- "$type": "DurableTask.History.ExecutionStartedEvent, DurableTaskFx",
+ "$type": "DurableTask.Core.History.ExecutionStartedEvent, DurableTask.Core",
"OrchestrationInstance": {
- "$type": "DurableTask.OrchestrationInstance, DurableTaskFx",
+ "$type": "DurableTask.Core.OrchestrationInstance, DurableTask.Core",
"InstanceId": "TestInstance",
"ExecutionId": "eda9e8417d3943c193ac6214481865e7"
},
diff --git a/test/DurableTask.ServiceBus.Tests/TestData/SerializedOrchestrationState.json b/test/DurableTask.ServiceBus.Tests/TestData/SerializedOrchestrationState.json
index 11d47e255..9c7daee3e 100644
--- a/test/DurableTask.ServiceBus.Tests/TestData/SerializedOrchestrationState.json
+++ b/test/DurableTask.ServiceBus.Tests/TestData/SerializedOrchestrationState.json
@@ -1,17 +1,17 @@
{
- "$type": "DurableTask.OrchestrationRuntimeState, DurableTaskFx",
+ "$type": "DurableTask.Core.OrchestrationRuntimeState, DurableTask.Core",
"Events": [
{
- "$type": "DurableTask.History.OrchestratorStartedEvent, DurableTaskFx",
+ "$type": "DurableTask.Core.History.OrchestratorStartedEvent, DurableTask.Core",
"EventType": 12,
"EventId": -1,
"IsPlayed": false,
"Timestamp": "2016-04-05T17:18:44.5851025Z"
},
{
- "$type": "DurableTask.History.ExecutionStartedEvent, DurableTaskFx",
+ "$type": "DurableTask.Core.History.ExecutionStartedEvent, DurableTask.Core",
"OrchestrationInstance": {
- "$type": "DurableTask.OrchestrationInstance, DurableTaskFx",
+ "$type": "DurableTask.Core.OrchestrationInstance, DurableTask.Core",
"InstanceId": "b26d0baea1934549b087add7a9dd2b83",
"ExecutionId": "06722b8ac29e49e9962230d474483720"
},
@@ -26,7 +26,7 @@
"Timestamp": "2016-04-05T17:18:40.9632Z"
},
{
- "$type": "DurableTask.History.TaskScheduledEvent, DurableTaskFx",
+ "$type": "DurableTask.Core.History.TaskScheduledEvent, DurableTask.Core",
"EventType": 4,
"Name": "FrameworkUnitTests.FunctionalTests+GenerationBasicTask",
"Version": "",
@@ -36,7 +36,7 @@
"Timestamp": "2016-04-05T17:18:44.6098492Z"
},
{
- "$type": "DurableTask.History.OrchestratorCompletedEvent, DurableTaskFx",
+ "$type": "DurableTask.Core.History.OrchestratorCompletedEvent, DurableTask.Core",
"EventType": 13,
"EventId": -1,
"IsPlayed": false,
@@ -45,16 +45,16 @@
],
"NewEvents": [
{
- "$type": "DurableTask.History.OrchestratorStartedEvent, DurableTaskFx",
+ "$type": "DurableTask.Core.History.OrchestratorStartedEvent, DurableTask.Core",
"EventType": 12,
"EventId": -1,
"IsPlayed": false,
"Timestamp": "2016-04-05T17:18:44.5851025Z"
},
{
- "$type": "DurableTask.History.ExecutionStartedEvent, DurableTaskFx",
+ "$type": "DurableTask.Core.History.ExecutionStartedEvent, DurableTask.Core",
"OrchestrationInstance": {
- "$type": "DurableTask.OrchestrationInstance, DurableTaskFx",
+ "$type": "DurableTask.Core.OrchestrationInstance, DurableTask.Core",
"InstanceId": "b26d0baea1934549b087add7a9dd2b83",
"ExecutionId": "06722b8ac29e49e9962230d474483720"
},
@@ -69,7 +69,7 @@
"Timestamp": "2016-04-05T17:18:40.9632Z"
},
{
- "$type": "DurableTask.History.TaskScheduledEvent, DurableTaskFx",
+ "$type": "DurableTask.Core.History.TaskScheduledEvent, DurableTask.Core",
"EventType": 4,
"Name": "FrameworkUnitTests.FunctionalTests+GenerationBasicTask",
"Version": "",
@@ -79,7 +79,7 @@
"Timestamp": "2016-04-05T17:18:44.6098492Z"
},
{
- "$type": "DurableTask.History.OrchestratorCompletedEvent, DurableTaskFx",
+ "$type": "DurableTask.Core.History.OrchestratorCompletedEvent, DurableTask.Core",
"EventType": 13,
"EventId": -1,
"IsPlayed": false,
@@ -98,7 +98,7 @@
"Tags": null,
"OrchestrationStatus": 0,
"OrchestrationInstance": {
- "$type": "DurableTask.OrchestrationInstance, DurableTaskFx",
+ "$type": "DurableTask.Core.OrchestrationInstance, DurableTask.Core",
"InstanceId": "b26d0baea1934549b087add7a9dd2b83",
"ExecutionId": "06722b8ac29e49e9962230d474483720"
},
diff --git a/test/DurableTask.ServiceBus.Tests/TestData/SerializedOrchestrationStateWithTags.json b/test/DurableTask.ServiceBus.Tests/TestData/SerializedOrchestrationStateWithTags.json
index 961286907..6c74dc7bd 100644
--- a/test/DurableTask.ServiceBus.Tests/TestData/SerializedOrchestrationStateWithTags.json
+++ b/test/DurableTask.ServiceBus.Tests/TestData/SerializedOrchestrationStateWithTags.json
@@ -1,17 +1,17 @@
{
- "$type": "DurableTask.OrchestrationRuntimeState, DurableTaskFx",
+ "$type": "DurableTask.Core.OrchestrationRuntimeState, DurableTask.Core",
"Events": [
{
- "$type": "DurableTask.History.OrchestratorStartedEvent, DurableTaskFx",
+ "$type": "DurableTask.Core.History.OrchestratorStartedEvent, DurableTask.Core",
"EventType": 12,
"EventId": -1,
"IsPlayed": false,
"Timestamp": "2016-04-05T17:35:31.9077064Z"
},
{
- "$type": "DurableTask.History.ExecutionStartedEvent, DurableTaskFx",
+ "$type": "DurableTask.Core.History.ExecutionStartedEvent, DurableTask.Core",
"OrchestrationInstance": {
- "$type": "DurableTask.OrchestrationInstance, DurableTaskFx",
+ "$type": "DurableTask.Core.OrchestrationInstance, DurableTask.Core",
"InstanceId": "TestInstance",
"ExecutionId": "eda9e8417d3943c193ac6214481865e7"
},
@@ -29,7 +29,7 @@
"Timestamp": "2016-04-05T17:35:31.9062038Z"
},
{
- "$type": "DurableTask.History.OrchestratorCompletedEvent, DurableTaskFx",
+ "$type": "DurableTask.Core.History.OrchestratorCompletedEvent, DurableTask.Core",
"EventType": 13,
"EventId": -1,
"IsPlayed": false,
@@ -38,16 +38,16 @@
],
"NewEvents": [
{
- "$type": "DurableTask.History.OrchestratorStartedEvent, DurableTaskFx",
+ "$type": "DurableTask.Core.History.OrchestratorStartedEvent, DurableTask.Core",
"EventType": 12,
"EventId": -1,
"IsPlayed": false,
"Timestamp": "2016-04-05T17:35:31.9077064Z"
},
{
- "$type": "DurableTask.History.ExecutionStartedEvent, DurableTaskFx",
+ "$type": "DurableTask.Core.History.ExecutionStartedEvent, DurableTask.Core",
"OrchestrationInstance": {
- "$type": "DurableTask.OrchestrationInstance, DurableTaskFx",
+ "$type": "DurableTask.Core.OrchestrationInstance, DurableTask.Core",
"InstanceId": "TestInstance",
"ExecutionId": "eda9e8417d3943c193ac6214481865e7"
},
@@ -65,7 +65,7 @@
"Timestamp": "2016-04-05T17:35:31.9062038Z"
},
{
- "$type": "DurableTask.History.OrchestratorCompletedEvent, DurableTaskFx",
+ "$type": "DurableTask.Core.History.OrchestratorCompletedEvent, DurableTask.Core",
"EventType": 13,
"EventId": -1,
"IsPlayed": false,
@@ -87,7 +87,7 @@
},
"OrchestrationStatus": 0,
"OrchestrationInstance": {
- "$type": "DurableTask.OrchestrationInstance, DurableTaskFx",
+ "$type": "DurableTask.Core.OrchestrationInstance, DurableTask.Core",
"InstanceId": "TestInstance",
"ExecutionId": "eda9e8417d3943c193ac6214481865e7"
},
diff --git a/test/DurableTask.ServiceBus.Tests/TestHelpers.cs b/test/DurableTask.ServiceBus.Tests/TestHelpers.cs
index 232a1555f..173e54ea3 100644
--- a/test/DurableTask.ServiceBus.Tests/TestHelpers.cs
+++ b/test/DurableTask.ServiceBus.Tests/TestHelpers.cs
@@ -17,12 +17,15 @@ namespace DurableTask.ServiceBus.Tests
using System.Configuration;
using System.Diagnostics.Tracing;
using System.Threading.Tasks;
- using DurableTask;
- using DurableTask.Common;
- using DurableTask.History;
- using DurableTask.Settings;
- using DurableTask.Tracing;
- using DurableTask.Tracking;
+ using DurableTask.Core;
+ using DurableTask.Core.Common;
+ using DurableTask.Core.History;
+ using DurableTask.Core.Settings;
+ using DurableTask.Core.Tracing;
+ using DurableTask.Core.Tracking;
+ using DurableTask.ServiceBus;
+ using DurableTask.ServiceBus.Settings;
+ using DurableTask.ServiceBus.Tracking;
using Microsoft.ServiceBus;
using Microsoft.ServiceBus.Messaging;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/test/DurableTask.Stress.Tests/DurableTask.Stress.Tests.csproj b/test/DurableTask.Stress.Tests/DurableTask.Stress.Tests.csproj
index 3721cc9c7..10bbfebab 100644
--- a/test/DurableTask.Stress.Tests/DurableTask.Stress.Tests.csproj
+++ b/test/DurableTask.Stress.Tests/DurableTask.Stress.Tests.csproj
@@ -22,7 +22,8 @@
-
+
+
diff --git a/test/DurableTask.Stress.Tests/Program.cs b/test/DurableTask.Stress.Tests/Program.cs
index fb6932266..1e20bcbd5 100644
--- a/test/DurableTask.Stress.Tests/Program.cs
+++ b/test/DurableTask.Stress.Tests/Program.cs
@@ -17,10 +17,12 @@ namespace DurableTask.Stress.Tests
using System;
using System.Configuration;
using System.Diagnostics;
- using DurableTask.Settings;
+ using DurableTask.Core;
+ using DurableTask.Core.Tracing;
+ using DurableTask.ServiceBus.Settings;
+ using DurableTask.ServiceBus;
using DurableTask.Test.Orchestrations.Stress;
- using DurableTask.Tracing;
- using DurableTask.Tracking;
+ using DurableTask.ServiceBus.Tracking;
using Microsoft.Practices.EnterpriseLibrary.SemanticLogging;
using System.Diagnostics.Tracing;