.NET Workflows - Integrate Element Aliasing

dotnet/Directory.Packages.props

@@ -89,9 +89,9 @@
     <!-- Identity -->
     <PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.77.0" />
     <!-- Workflows -->
-    <PackageVersion Include="Microsoft.Bot.ObjectModel" Version="1.2025.915-1" />
-    <PackageVersion Include="Microsoft.Bot.ObjectModel.Json" Version="1.2025.915-1" />
-    <PackageVersion Include="Microsoft.Bot.ObjectModel.PowerFx" Version="1.2025.915-1" />
+    <PackageVersion Include="Microsoft.Bot.ObjectModel" Version="1.2025.922-1" />
+    <PackageVersion Include="Microsoft.Bot.ObjectModel.Json" Version="1.2025.922-1" />
+    <PackageVersion Include="Microsoft.Bot.ObjectModel.PowerFx" Version="1.2025.922-1" />
     <PackageVersion Include="Microsoft.PowerFx.Interpreter" Version="1.4.0-build.20250821-1001" />
     <!-- Test -->
     <PackageVersion Include="FluentAssertions" Version="8.6.0" />

dotnet/samples/GettingStarted/Workflows/Declarative/Program.cs

@@ -291,7 +291,7 @@ private static InputResponse HandleExternalRequest(ExternalRequest request)
             string? repoFolder = GetRepoFolder();
             if (repoFolder is not null)
             {
-                workflowFile = Path.Combine(repoFolder, "Workflows", workflowFile);
+                workflowFile = Path.Combine(repoFolder, "workflow-samples", workflowFile);
                 workflowFile = Path.ChangeExtension(workflowFile, ".yaml");
             }
         }

dotnet/src/Microsoft.Agents.Workflows.Declarative/DeclarativeWorkflowBuilder.cs

@@ -50,10 +50,9 @@ public static Workflow<TInput> Build<TInput>(
     {
         BotElement rootElement = YamlSerializer.Deserialize<BotElement>(yamlReader) ?? throw new DeclarativeModelException("Workflow undefined.");
 
-        // ISSUE #486 - Use "Workflow" element for Foundry.
         if (rootElement is not AdaptiveDialog workflowElement)
         {
-            throw new DeclarativeModelException($"Unsupported root element: {rootElement.GetType().Name}. Expected an {nameof(AdaptiveDialog)}.");
+            throw new DeclarativeModelException($"Unsupported root element: {rootElement.GetType().Name}. Expected an {nameof(Workflow)}.");
         }
 
         string rootId = WorkflowActionVisitor.Steps.Root(workflowElement.BeginDialog?.Id.Value);

dotnet/src/Microsoft.Agents.Workflows.Declarative/Extensions/BotElementExtensions.cs

@@ -14,6 +14,7 @@ public static string GetId(this BotElement element) =>
             DialogAction action => action.Id.Value,
             ConditionItem conditionItem => conditionItem.Id ?? throw new DeclarativeModelException($"Undefined identifier for {nameof(ConditionItem)} that is member of {conditionItem.GetParentId() ?? "(root)"}."),
             OnActivity activity => activity.Id.Value,
+            SystemTrigger trigger => trigger.Id.Value,
             _ => throw new DeclarativeModelException($"Unknown identify for element type: {element.GetType().Name}"),
         };
 }

dotnet/src/Microsoft.Agents.Workflows.Declarative/Interpreter/WorkflowElementWalker.cs

@@ -6,6 +6,11 @@ namespace Microsoft.Agents.Workflows.Declarative.Interpreter;
 
 internal sealed class WorkflowElementWalker : BotElementWalker
 {
+    static WorkflowElementWalker()
+    {
+        ProductContext.SetContext(Product.Foundry);
+    }
+
     private readonly DialogActionVisitor _visitor;
 
     public WorkflowElementWalker(DialogActionVisitor visitor)

dotnet/src/Microsoft.Agents.Workflows.Declarative/ObjectModel/AddConversationMessageExecutor.cs

@@ -20,7 +20,7 @@ internal sealed class AddConversationMessageExecutor(AddConversationMessage mode
         StringExpression conversationExpression = Throw.IfNull(this.Model.ConversationId, $"{nameof(this.Model)}.{nameof(this.Model.ConversationId)}");
         string conversationId = this.State.Evaluator.GetValue(conversationExpression).Value;
 
-        ChatMessage newMessage = new(this.GetRole(), [.. this.GetContent()]) { AdditionalProperties = this.GetMetadata() };
+        ChatMessage newMessage = new(this.Model.Role.Value.ToChatRole(), [.. this.GetContent()]) { AdditionalProperties = this.GetMetadata() };
 
         await agentProvider.CreateMessageAsync(conversationId, newMessage, cancellationToken).ConfigureAwait(false);
 
@@ -41,18 +41,6 @@ private IEnumerable<AIContent> GetContent()
         }
     }
 
-    private ChatRole GetRole()
-    {
-        if (this.Model.Role is null)
-        {
-            return ChatRole.User;
-        }
-
-        AgentMessageRoleWrapper roleWrapper = this.State.Evaluator.GetValue(this.Model.Role).Value;
-
-        return roleWrapper.Value.ToChatRole();
-    }
-
     private AdditionalPropertiesDictionary? GetMetadata()
     {
         if (this.Model.Metadata is null)

dotnet/tests/Microsoft.Agents.Workflows.Declarative.IntegrationTests/Workflows/AddMessages.yaml

@@ -1,13 +1,7 @@
-#
-# This workflow demonstrates a conversation and message manipulation.
-#
-# Any Foundry Agent may be used to provide the response.
-# See: ./setup/QuestionAgent.yaml
-#
-kind: AdaptiveDialog
-beginDialog:
-
-  kind: OnActivity
+kind: Workflow
+trigger:
+
+  kind: OnConversationStart
   id: workflow_test
   actions:
 

dotnet/tests/Microsoft.Agents.Workflows.Declarative.IntegrationTests/Workflows/GetMessage.yaml

@@ -1,13 +1,7 @@
-#
-# This workflow demonstrates a conversation and message manipulation.
-#
-# Any Foundry Agent may be used to provide the response.
-# See: ./setup/QuestionAgent.yaml
-#
-kind: AdaptiveDialog
-beginDialog:
+kind: Workflow
+trigger:
 
-  kind: OnActivity
+  kind: OnConversationStart
   id: workflow_test
   actions:
 

dotnet/tests/Microsoft.Agents.Workflows.Declarative.IntegrationTests/Workflows/GetMessages.yaml

@@ -1,13 +1,7 @@
-#
-# This workflow demonstrates a conversation and message manipulation.
-#
-# Any Foundry Agent may be used to provide the response.
-# See: ./setup/QuestionAgent.yaml
-#
-kind: AdaptiveDialog
-beginDialog:
+kind: Workflow
+trigger:
 
-  kind: OnActivity
+  kind: OnConversationStart
   id: workflow_test
   actions:
 

dotnet/tests/Microsoft.Agents.Workflows.Declarative.IntegrationTests/Workflows/InvokeAgent.yaml

@@ -1,7 +1,7 @@
-kind: AdaptiveDialog
-beginDialog:
+kind: Workflow
+trigger:
 
-  kind: OnActivity
+  kind: OnConversationStart
   id: workflow_test
   actions:
 

dotnet/tests/Microsoft.Agents.Workflows.Declarative.IntegrationTests/Workflows/SendActivity.yaml

@@ -1,12 +1,7 @@
-#
-# This workflow provides the most basic example of providing a response that includes the user and environment input.
-#
-# No agent setup is required to run this workflow.
-#
-kind: AdaptiveDialog
-beginDialog:
+kind: Workflow
+trigger:
 
-  kind: OnActivity
+  kind: OnConversationStart
   id: workflow_test
   actions:
 

dotnet/tests/Microsoft.Agents.Workflows.Declarative.UnitTests/Workflows/BadId.yaml

@@ -1,7 +1,8 @@
-kind: AdaptiveDialog
-beginDialog:
-  kind: OnActivity
-  type: Message
+kind: Workflow
+trigger:
+
+  kind: OnConversationStart
   actions:
+
     - kind: EndConversation
       id: end_all

dotnet/tests/Microsoft.Agents.Workflows.Declarative.UnitTests/Workflows/ClearAllVariables.yaml

@@ -1,9 +1,10 @@
-kind: AdaptiveDialog
-beginDialog:
-  kind: OnActivity
+kind: Workflow
+trigger:
+
+  kind: OnConversationStart
   id: my_workflow
-  type: Message
   actions:
+
     - kind: ClearAllVariables
       id: clear_all
       variables: [ConversationScopedVariables]

dotnet/tests/Microsoft.Agents.Workflows.Declarative.UnitTests/Workflows/Condition.yaml

@@ -1,9 +1,8 @@
-kind: AdaptiveDialog
-beginDialog:
-  
-  kind: OnActivity
+kind: Workflow
+trigger:
+
+  kind: OnConversationStart
   id: my_workflow
-  type: Message
   actions:
 
     - kind: SetVariable

dotnet/tests/Microsoft.Agents.Workflows.Declarative.UnitTests/Workflows/ConditionElse.yaml

@@ -1,9 +1,8 @@
-kind: AdaptiveDialog
-beginDialog:
-  
-  kind: OnActivity
+kind: Workflow
+trigger:
+
+  kind: OnConversationStart
   id: my_workflow
-  type: Message
   actions:
 
     - kind: SetVariable

dotnet/tests/Microsoft.Agents.Workflows.Declarative.UnitTests/Workflows/EditTable.yaml

@@ -1,13 +1,15 @@
-kind: AdaptiveDialog
-beginDialog:
-  kind: OnActivity
+kind: Workflow
+trigger:
+
+  kind: OnConversationStart
   id: my_workflow
-  type: Message
   actions:
+
     - kind: SetVariable
       id: set_var
       variable: Topic.MyTable
       value: =[{id: 3}]
+
     - kind: EditTable
       id: edit_var
       itemsVariable: Topic.MyTable

dotnet/tests/Microsoft.Agents.Workflows.Declarative.UnitTests/Workflows/EditTableV2.yaml

@@ -1,13 +1,15 @@
-kind: AdaptiveDialog
-beginDialog:
-  kind: OnActivity
+kind: Workflow
+trigger:
+
+  kind: OnConversationStart
   id: my_workflow
-  type: Message
   actions:
+
     - kind: SetVariable
       id: set_var
       variable: Topic.MyTable
       value: =[{id: 3}]
+
     - kind: EditTableV2
       id: edit_var
       itemsVariable: Topic.MyTable

dotnet/tests/Microsoft.Agents.Workflows.Declarative.UnitTests/Workflows/EndConversation.yaml

@@ -1,8 +1,8 @@
-kind: AdaptiveDialog
-beginDialog:
-  kind: OnActivity
+kind: Workflow
+trigger:
+
+  kind: OnConversationStart
   id: my_workflow
-  type: Message
   actions:
 
     - kind: EndConversation

dotnet/tests/Microsoft.Agents.Workflows.Declarative.UnitTests/Workflows/Goto.yaml

@@ -1,8 +1,8 @@
-kind: AdaptiveDialog
-beginDialog:
-  kind: OnActivity
+kind: Workflow
+trigger:
+
+  kind: OnConversationStart
   id: my_workflow
-  type: Message
   actions:
 
     - kind: GotoAction

dotnet/tests/Microsoft.Agents.Workflows.Declarative.UnitTests/Workflows/LoopBreak.yaml

@@ -1,9 +1,10 @@
-kind: AdaptiveDialog
-beginDialog:
-  kind: OnActivity
+kind: Workflow
+trigger:
+
+  kind: OnConversationStart
   id: my_workflow
-  type: Message
   actions:
+
     - kind: SetVariable
       id: setVariable_count
       variable: Topic.Count

dotnet/tests/Microsoft.Agents.Workflows.Declarative.UnitTests/Workflows/LoopContinue.yaml

@@ -1,8 +1,9 @@
-kind: AdaptiveDialog
-beginDialog:
-  kind: OnActivity
+kind: Workflow
+trigger:
+
+  kind: OnConversationStart
   id: my_workflow
-  type: Message
+
   actions:
     - kind: SetVariable
       id: setVariable_count

dotnet/tests/Microsoft.Agents.Workflows.Declarative.UnitTests/Workflows/LoopEach.yaml

@@ -1,8 +1,9 @@
-kind: AdaptiveDialog
-beginDialog:
-  kind: OnActivity
+kind: Workflow
+trigger:
+
+  kind: OnConversationStart
   id: my_workflow
-  type: Message
+
   actions:
     - kind: SetVariable
       id: setVariable_count

dotnet/tests/Microsoft.Agents.Workflows.Declarative.UnitTests/Workflows/ParseValue.yaml

@@ -1,8 +1,9 @@
-kind: AdaptiveDialog
-beginDialog:
-  kind: OnActivity
+kind: Workflow
+trigger:
+
+  kind: OnConversationStart
   id: my_workflow
-  type: Message
+
   actions:
     - kind: ParseValue
       id: parse_var

dotnet/tests/Microsoft.Agents.Workflows.Declarative.UnitTests/Workflows/ResetVariable.yaml

@@ -1,9 +1,10 @@
-kind: AdaptiveDialog
-beginDialog:
-  kind: OnActivity
+kind: Workflow
+trigger:
+
+  kind: OnConversationStart
   id: my_workflow
-  type: Message
   actions:
+
     - kind: SetVariable
       id: set_var
       variable: Topic.MyVar

dotnet/tests/Microsoft.Agents.Workflows.Declarative.UnitTests/Workflows/SendActivity.yaml

@@ -1,8 +1,8 @@
-kind: AdaptiveDialog
-beginDialog:
-  kind: OnActivity
+kind: Workflow
+trigger:
+
+  kind: OnConversationStart
   id: my_workflow
-  type: Message
   actions:
 
     - kind: SetVariable

dotnet/tests/Microsoft.Agents.Workflows.Declarative.UnitTests/Workflows/SetTextVariable.yaml

@@ -1,9 +1,10 @@
-kind: AdaptiveDialog
-beginDialog:
-  kind: OnActivity
+kind: Workflow
+trigger:
+
+  kind: OnConversationStart
   id: my_workflow
-  type: Message
   actions:
+
     - kind: SetTextVariable
       id: set_text
       variable: Topic.TestVar

dotnet/tests/Microsoft.Agents.Workflows.Declarative.UnitTests/Workflows/SetVariable.yaml

@@ -1,9 +1,10 @@
-kind: AdaptiveDialog
-beginDialog:
-  kind: OnActivity
+kind: Workflow
+trigger:
+
+  kind: OnConversationStart
   id: my_workflow
-  type: Message
   actions:
+
     - kind: SetVariable
       id: set_var
       variable: Topic.TestVar