diff --git a/dotnet/agent-framework-dotnet.slnx b/dotnet/agent-framework-dotnet.slnx
index cd74579409..c4cdfca7fe 100644
--- a/dotnet/agent-framework-dotnet.slnx
+++ b/dotnet/agent-framework-dotnet.slnx
@@ -60,20 +60,21 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/dotnet/samples/Durable/Workflow/AzureFunctions/01_SequentialWorkflow/01_SequentialWorkflow.csproj b/dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/01_SequentialWorkflow/01_SequentialWorkflow.csproj
similarity index 100%
rename from dotnet/samples/Durable/Workflow/AzureFunctions/01_SequentialWorkflow/01_SequentialWorkflow.csproj
rename to dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/01_SequentialWorkflow/01_SequentialWorkflow.csproj
diff --git a/dotnet/samples/Durable/Workflow/AzureFunctions/01_SequentialWorkflow/OrderCancelExecutors.cs b/dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/01_SequentialWorkflow/OrderCancelExecutors.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/AzureFunctions/01_SequentialWorkflow/OrderCancelExecutors.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/01_SequentialWorkflow/OrderCancelExecutors.cs
diff --git a/dotnet/samples/Durable/Workflow/AzureFunctions/01_SequentialWorkflow/Program.cs b/dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/01_SequentialWorkflow/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/AzureFunctions/01_SequentialWorkflow/Program.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/01_SequentialWorkflow/Program.cs
diff --git a/dotnet/samples/Durable/Workflow/AzureFunctions/01_SequentialWorkflow/README.md b/dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/01_SequentialWorkflow/README.md
similarity index 100%
rename from dotnet/samples/Durable/Workflow/AzureFunctions/01_SequentialWorkflow/README.md
rename to dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/01_SequentialWorkflow/README.md
diff --git a/dotnet/samples/Durable/Workflow/AzureFunctions/01_SequentialWorkflow/demo.http b/dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/01_SequentialWorkflow/demo.http
similarity index 100%
rename from dotnet/samples/Durable/Workflow/AzureFunctions/01_SequentialWorkflow/demo.http
rename to dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/01_SequentialWorkflow/demo.http
diff --git a/dotnet/samples/Durable/Workflow/AzureFunctions/01_SequentialWorkflow/host.json b/dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/01_SequentialWorkflow/host.json
similarity index 100%
rename from dotnet/samples/Durable/Workflow/AzureFunctions/01_SequentialWorkflow/host.json
rename to dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/01_SequentialWorkflow/host.json
diff --git a/dotnet/samples/Durable/Workflow/AzureFunctions/02_ConcurrentWorkflow/02_ConcurrentWorkflow.csproj b/dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/02_ConcurrentWorkflow/02_ConcurrentWorkflow.csproj
similarity index 100%
rename from dotnet/samples/Durable/Workflow/AzureFunctions/02_ConcurrentWorkflow/02_ConcurrentWorkflow.csproj
rename to dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/02_ConcurrentWorkflow/02_ConcurrentWorkflow.csproj
diff --git a/dotnet/samples/Durable/Workflow/AzureFunctions/02_ConcurrentWorkflow/ExpertExecutors.cs b/dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/02_ConcurrentWorkflow/ExpertExecutors.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/AzureFunctions/02_ConcurrentWorkflow/ExpertExecutors.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/02_ConcurrentWorkflow/ExpertExecutors.cs
diff --git a/dotnet/samples/Durable/Workflow/AzureFunctions/02_ConcurrentWorkflow/Program.cs b/dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/02_ConcurrentWorkflow/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/AzureFunctions/02_ConcurrentWorkflow/Program.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/02_ConcurrentWorkflow/Program.cs
diff --git a/dotnet/samples/Durable/Workflow/AzureFunctions/02_ConcurrentWorkflow/README.md b/dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/02_ConcurrentWorkflow/README.md
similarity index 100%
rename from dotnet/samples/Durable/Workflow/AzureFunctions/02_ConcurrentWorkflow/README.md
rename to dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/02_ConcurrentWorkflow/README.md
diff --git a/dotnet/samples/Durable/Workflow/AzureFunctions/02_ConcurrentWorkflow/demo.http b/dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/02_ConcurrentWorkflow/demo.http
similarity index 100%
rename from dotnet/samples/Durable/Workflow/AzureFunctions/02_ConcurrentWorkflow/demo.http
rename to dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/02_ConcurrentWorkflow/demo.http
diff --git a/dotnet/samples/Durable/Workflow/AzureFunctions/02_ConcurrentWorkflow/host.json b/dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/02_ConcurrentWorkflow/host.json
similarity index 100%
rename from dotnet/samples/Durable/Workflow/AzureFunctions/02_ConcurrentWorkflow/host.json
rename to dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/02_ConcurrentWorkflow/host.json
diff --git a/dotnet/samples/Durable/Workflow/AzureFunctions/03_WorkflowHITL/03_WorkflowHITL.csproj b/dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/03_WorkflowHITL/03_WorkflowHITL.csproj
similarity index 100%
rename from dotnet/samples/Durable/Workflow/AzureFunctions/03_WorkflowHITL/03_WorkflowHITL.csproj
rename to dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/03_WorkflowHITL/03_WorkflowHITL.csproj
diff --git a/dotnet/samples/Durable/Workflow/AzureFunctions/03_WorkflowHITL/Executors.cs b/dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/03_WorkflowHITL/Executors.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/AzureFunctions/03_WorkflowHITL/Executors.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/03_WorkflowHITL/Executors.cs
diff --git a/dotnet/samples/Durable/Workflow/AzureFunctions/03_WorkflowHITL/Program.cs b/dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/03_WorkflowHITL/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/AzureFunctions/03_WorkflowHITL/Program.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/03_WorkflowHITL/Program.cs
diff --git a/dotnet/samples/Durable/Workflow/AzureFunctions/03_WorkflowHITL/README.md b/dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/03_WorkflowHITL/README.md
similarity index 100%
rename from dotnet/samples/Durable/Workflow/AzureFunctions/03_WorkflowHITL/README.md
rename to dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/03_WorkflowHITL/README.md
diff --git a/dotnet/samples/Durable/Workflow/AzureFunctions/03_WorkflowHITL/demo.http b/dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/03_WorkflowHITL/demo.http
similarity index 100%
rename from dotnet/samples/Durable/Workflow/AzureFunctions/03_WorkflowHITL/demo.http
rename to dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/03_WorkflowHITL/demo.http
diff --git a/dotnet/samples/Durable/Workflow/AzureFunctions/03_WorkflowHITL/host.json b/dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/03_WorkflowHITL/host.json
similarity index 100%
rename from dotnet/samples/Durable/Workflow/AzureFunctions/03_WorkflowHITL/host.json
rename to dotnet/samples/04-hosting/DurableWorkflows/AzureFunctions/03_WorkflowHITL/host.json
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/01_SequentialWorkflow/01_SequentialWorkflow.csproj b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/01_SequentialWorkflow/01_SequentialWorkflow.csproj
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/01_SequentialWorkflow/01_SequentialWorkflow.csproj
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/01_SequentialWorkflow/01_SequentialWorkflow.csproj
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/01_SequentialWorkflow/OrderCancelExecutors.cs b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/01_SequentialWorkflow/OrderCancelExecutors.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/01_SequentialWorkflow/OrderCancelExecutors.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/01_SequentialWorkflow/OrderCancelExecutors.cs
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/01_SequentialWorkflow/Program.cs b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/01_SequentialWorkflow/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/01_SequentialWorkflow/Program.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/01_SequentialWorkflow/Program.cs
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/01_SequentialWorkflow/README.md b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/01_SequentialWorkflow/README.md
similarity index 97%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/01_SequentialWorkflow/README.md
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/01_SequentialWorkflow/README.md
index 4eb50e2662..ac5a3e43f5 100644
--- a/dotnet/samples/Durable/Workflow/ConsoleApps/01_SequentialWorkflow/README.md
+++ b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/01_SequentialWorkflow/README.md
@@ -52,7 +52,7 @@ See the [README.md](../../README.md) file in the parent directory for informatio
## Running the Sample
```bash
-cd dotnet/samples/Durable/Workflow/ConsoleApps/01_SequentialWorkflow
+cd dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/01_SequentialWorkflow
dotnet run --framework net10.0
```
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/02_ConcurrentWorkflow/02_ConcurrentWorkflow.csproj b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/02_ConcurrentWorkflow/02_ConcurrentWorkflow.csproj
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/02_ConcurrentWorkflow/02_ConcurrentWorkflow.csproj
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/02_ConcurrentWorkflow/02_ConcurrentWorkflow.csproj
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/02_ConcurrentWorkflow/ExpertExecutors.cs b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/02_ConcurrentWorkflow/ExpertExecutors.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/02_ConcurrentWorkflow/ExpertExecutors.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/02_ConcurrentWorkflow/ExpertExecutors.cs
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/02_ConcurrentWorkflow/Program.cs b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/02_ConcurrentWorkflow/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/02_ConcurrentWorkflow/Program.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/02_ConcurrentWorkflow/Program.cs
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/02_ConcurrentWorkflow/README.md b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/02_ConcurrentWorkflow/README.md
similarity index 97%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/02_ConcurrentWorkflow/README.md
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/02_ConcurrentWorkflow/README.md
index e21f92f6de..4887a77ccc 100644
--- a/dotnet/samples/Durable/Workflow/ConsoleApps/02_ConcurrentWorkflow/README.md
+++ b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/02_ConcurrentWorkflow/README.md
@@ -66,7 +66,7 @@ AZURE_OPENAI_KEY="your-key" # Optional if using Azure CLI credentials
## Running the Sample
```bash
-cd dotnet/samples/Durable/Workflow/ConsoleApps/02_ConcurrentWorkflow
+cd dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/02_ConcurrentWorkflow
dotnet run --framework net10.0
```
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/03_ConditionalEdges/03_ConditionalEdges.csproj b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/03_ConditionalEdges/03_ConditionalEdges.csproj
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/03_ConditionalEdges/03_ConditionalEdges.csproj
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/03_ConditionalEdges/03_ConditionalEdges.csproj
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/03_ConditionalEdges/NotifyFraud.cs b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/03_ConditionalEdges/NotifyFraud.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/03_ConditionalEdges/NotifyFraud.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/03_ConditionalEdges/NotifyFraud.cs
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/03_ConditionalEdges/Program.cs b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/03_ConditionalEdges/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/03_ConditionalEdges/Program.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/03_ConditionalEdges/Program.cs
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/03_ConditionalEdges/README.md b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/03_ConditionalEdges/README.md
similarity index 97%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/03_ConditionalEdges/README.md
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/03_ConditionalEdges/README.md
index f06e185f30..6074e8c7f8 100644
--- a/dotnet/samples/Durable/Workflow/ConsoleApps/03_ConditionalEdges/README.md
+++ b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/03_ConditionalEdges/README.md
@@ -65,7 +65,7 @@ See the [README.md](../../README.md) file in the parent directory for informatio
## Running the Sample
```bash
-cd dotnet/samples/Durable/Workflow/ConsoleApps/03_ConditionalEdges
+cd dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/03_ConditionalEdges
dotnet run --framework net10.0
```
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/04_WorkflowAndAgents/04_WorkflowAndAgents.csproj b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/04_WorkflowAndAgents/04_WorkflowAndAgents.csproj
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/04_WorkflowAndAgents/04_WorkflowAndAgents.csproj
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/04_WorkflowAndAgents/04_WorkflowAndAgents.csproj
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/04_WorkflowAndAgents/ParseQuestionExecutor.cs b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/04_WorkflowAndAgents/ParseQuestionExecutor.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/04_WorkflowAndAgents/ParseQuestionExecutor.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/04_WorkflowAndAgents/ParseQuestionExecutor.cs
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/04_WorkflowAndAgents/Program.cs b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/04_WorkflowAndAgents/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/04_WorkflowAndAgents/Program.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/04_WorkflowAndAgents/Program.cs
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/05_WorkflowEvents/05_WorkflowEvents.csproj b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/05_WorkflowEvents/05_WorkflowEvents.csproj
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/05_WorkflowEvents/05_WorkflowEvents.csproj
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/05_WorkflowEvents/05_WorkflowEvents.csproj
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/05_WorkflowEvents/Executors.cs b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/05_WorkflowEvents/Executors.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/05_WorkflowEvents/Executors.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/05_WorkflowEvents/Executors.cs
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/05_WorkflowEvents/Program.cs b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/05_WorkflowEvents/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/05_WorkflowEvents/Program.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/05_WorkflowEvents/Program.cs
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/05_WorkflowEvents/README.md b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/05_WorkflowEvents/README.md
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/05_WorkflowEvents/README.md
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/05_WorkflowEvents/README.md
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/06_WorkflowSharedState/06_WorkflowSharedState.csproj b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/06_WorkflowSharedState/06_WorkflowSharedState.csproj
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/06_WorkflowSharedState/06_WorkflowSharedState.csproj
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/06_WorkflowSharedState/06_WorkflowSharedState.csproj
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/06_WorkflowSharedState/Executors.cs b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/06_WorkflowSharedState/Executors.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/06_WorkflowSharedState/Executors.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/06_WorkflowSharedState/Executors.cs
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/06_WorkflowSharedState/Program.cs b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/06_WorkflowSharedState/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/06_WorkflowSharedState/Program.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/06_WorkflowSharedState/Program.cs
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/06_WorkflowSharedState/README.md b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/06_WorkflowSharedState/README.md
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/06_WorkflowSharedState/README.md
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/06_WorkflowSharedState/README.md
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/07_SubWorkflows/07_SubWorkflows.csproj b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/07_SubWorkflows/07_SubWorkflows.csproj
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/07_SubWorkflows/07_SubWorkflows.csproj
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/07_SubWorkflows/07_SubWorkflows.csproj
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/07_SubWorkflows/Executors.cs b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/07_SubWorkflows/Executors.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/07_SubWorkflows/Executors.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/07_SubWorkflows/Executors.cs
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/07_SubWorkflows/Program.cs b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/07_SubWorkflows/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/07_SubWorkflows/Program.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/07_SubWorkflows/Program.cs
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/07_SubWorkflows/README.md b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/07_SubWorkflows/README.md
similarity index 97%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/07_SubWorkflows/README.md
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/07_SubWorkflows/README.md
index f53bfb93c4..83968eee0e 100644
--- a/dotnet/samples/Durable/Workflow/ConsoleApps/07_SubWorkflows/README.md
+++ b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/07_SubWorkflows/README.md
@@ -45,7 +45,7 @@ OrderProcessing (main workflow)
## How Sub-Workflows Work
-For an introduction to sub-workflows and the `BindAsExecutor()` API, see the [Sub-Workflows foundational sample](../../../../GettingStarted/Workflows/_Foundational/06_SubWorkflows).
+For an introduction to sub-workflows and the `BindAsExecutor()` API, see the [Sub-Workflows foundational sample](../../../../03-workflows/_StartHere/05_SubWorkflows).
This durable sample extends the same pattern — the key difference is that each sub-workflow runs as a **separate orchestration instance** on the Durable Task Scheduler, providing independent checkpointing, fault tolerance, and hierarchical visualization in the DTS dashboard.
@@ -56,7 +56,7 @@ See the [README.md](../../README.md) file in the parent directory for informatio
## Running the Sample
```bash
-cd dotnet/samples/Durable/Workflow/ConsoleApps/07_SubWorkflows
+cd dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/07_SubWorkflows
dotnet run --framework net10.0
```
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/08_WorkflowHITL/08_WorkflowHITL.csproj b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/08_WorkflowHITL/08_WorkflowHITL.csproj
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/08_WorkflowHITL/08_WorkflowHITL.csproj
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/08_WorkflowHITL/08_WorkflowHITL.csproj
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/08_WorkflowHITL/Executors.cs b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/08_WorkflowHITL/Executors.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/08_WorkflowHITL/Executors.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/08_WorkflowHITL/Executors.cs
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/08_WorkflowHITL/Program.cs b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/08_WorkflowHITL/Program.cs
similarity index 100%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/08_WorkflowHITL/Program.cs
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/08_WorkflowHITL/Program.cs
diff --git a/dotnet/samples/Durable/Workflow/ConsoleApps/08_WorkflowHITL/README.md b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/08_WorkflowHITL/README.md
similarity index 98%
rename from dotnet/samples/Durable/Workflow/ConsoleApps/08_WorkflowHITL/README.md
rename to dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/08_WorkflowHITL/README.md
index a58d69d6f2..f659077371 100644
--- a/dotnet/samples/Durable/Workflow/ConsoleApps/08_WorkflowHITL/README.md
+++ b/dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/08_WorkflowHITL/README.md
@@ -67,7 +67,7 @@ See the [README.md](../../README.md) file in the parent directory for informatio
## Running the Sample
```bash
-cd dotnet/samples/Durable/Workflow/ConsoleApps/08_WorkflowHITL
+cd dotnet/samples/04-hosting/DurableWorkflows/ConsoleApps/08_WorkflowHITL
dotnet run --framework net10.0
```
diff --git a/dotnet/samples/04-hosting/DurableWorkflows/Directory.Build.props b/dotnet/samples/04-hosting/DurableWorkflows/Directory.Build.props
new file mode 100644
index 0000000000..3723bee3cc
--- /dev/null
+++ b/dotnet/samples/04-hosting/DurableWorkflows/Directory.Build.props
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/dotnet/samples/Durable/Workflow/README.md b/dotnet/samples/04-hosting/DurableWorkflows/README.md
similarity index 100%
rename from dotnet/samples/Durable/Workflow/README.md
rename to dotnet/samples/04-hosting/DurableWorkflows/README.md
diff --git a/dotnet/tests/Microsoft.Agents.AI.DurableTask.IntegrationTests/WorkflowConsoleAppSamplesValidation.cs b/dotnet/tests/Microsoft.Agents.AI.DurableTask.IntegrationTests/WorkflowConsoleAppSamplesValidation.cs
index 83158803dc..9c1b58f166 100644
--- a/dotnet/tests/Microsoft.Agents.AI.DurableTask.IntegrationTests/WorkflowConsoleAppSamplesValidation.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.DurableTask.IntegrationTests/WorkflowConsoleAppSamplesValidation.cs
@@ -6,14 +6,14 @@ namespace Microsoft.Agents.AI.DurableTask.IntegrationTests;
///
/// Integration tests for validating the durable workflow console app samples
-/// located in samples/Durable/Workflow/ConsoleApps.
+/// located in samples/04-hosting/DurableWorkflows/ConsoleApps.
///
[Collection("Samples")]
[Trait("Category", "SampleValidation")]
public sealed class WorkflowConsoleAppSamplesValidation(ITestOutputHelper outputHelper) : SamplesValidationBase(outputHelper)
{
private static readonly string s_samplesPath = Path.GetFullPath(
- Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "..", "..", "..", "..", "..", "samples", "Durable", "Workflow", "ConsoleApps"));
+ Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "..", "..", "..", "..", "..", "samples", "04-hosting", "DurableWorkflows", "ConsoleApps"));
///
protected override string SamplesPath => s_samplesPath;
diff --git a/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureFunctions.IntegrationTests/WorkflowSamplesValidation.cs b/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureFunctions.IntegrationTests/WorkflowSamplesValidation.cs
index 34e8f9ef61..a3729a27ee 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureFunctions.IntegrationTests/WorkflowSamplesValidation.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureFunctions.IntegrationTests/WorkflowSamplesValidation.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Agents.AI.Hosting.AzureFunctions.IntegrationTests;
///
/// Integration tests for validating the durable workflow Azure Functions samples
-/// located in samples/Durable/Workflow/AzureFunctions.
+/// located in samples/04-hosting/DurableWorkflows/AzureFunctions.
///
[Collection("Samples")]
[Trait("Category", "SampleValidation")]
@@ -32,7 +32,7 @@ public sealed class WorkflowSamplesValidation(ITestOutputHelper outputHelper) :
private static bool s_infrastructureStarted;
private static readonly TimeSpan s_orchestrationTimeout = TimeSpan.FromMinutes(1);
private static readonly string s_samplesPath = Path.GetFullPath(
- Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "..", "..", "..", "..", "..", "samples", "Durable", "Workflow", "AzureFunctions"));
+ Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "..", "..", "..", "..", "..", "samples", "04-hosting", "DurableWorkflows", "AzureFunctions"));
private readonly ITestOutputHelper _outputHelper = outputHelper;