Skip to content

Commit 99c3eba

Browse files
Merge branch 'main' into copilot/fix-32f34ae3-c04c-4d1d-ab50-b71db78acf2e
2 parents 8f3ea7d + 1a81ed2 commit 99c3eba

File tree

22 files changed

+684
-87
lines changed

22 files changed

+684
-87
lines changed

dotnet/agent-framework-dotnet.slnx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,10 @@
8080
<Project Path="samples/GettingStarted/Workflows/ConditionalEdges/03_MultiSelection/03_MultiSelection.csproj" />
8181
</Folder>
8282
<Folder Name="/Samples/GettingStarted/Workflows/Declarative/">
83-
<Project Path="samples/GettingStarted/Workflows/Declarative/DeclarativeWorkflow.csproj" />
84-
<Project Path="samples/GettingStarted/Workflows/DeclarativeCode/DeclarativeCode.csproj" />
85-
<Project Path="samples/GettingStarted/Workflows/DeclarativeEject/DeclarativeEject.csproj" />
83+
<File Path="samples/GettingStarted/Workflows/Declarative/README.md" />
84+
<Project Path="samples/GettingStarted/Workflows/Declarative/ExecuteCode/ExecuteCode.csproj" />
85+
<Project Path="samples/GettingStarted/Workflows/Declarative/ExecuteWorkflow/ExecuteWorkflow.csproj" />
86+
<Project Path="samples/GettingStarted/Workflows/Declarative/GenerateCode/GenerateCode.csproj" />
8687
</Folder>
8788
<Folder Name="/Samples/GettingStarted/Workflows/Declarative/Examples/">
8889
<File Path="../workflow-samples/DeepResearch.yaml" />
@@ -171,6 +172,11 @@
171172
<Project Path="samples/SemanticKernelMigration/AzureOpenAIResponses/Step03_ToolCall/AzureOpenAIResponses_Step03_ToolCall.csproj" />
172173
<Project Path="samples/SemanticKernelMigration/AzureOpenAIResponses/Step04_DependencyInjection/AzureOpenAIResponses_Step04_DependencyInjection.csproj" />
173174
</Folder>
175+
<Folder Name="/Samples/SemanticKernelMigration/AgentOrchestrations/">
176+
<Project Path="samples/SemanticKernelMigration/AgentOrchestrations/Step01_Concurrent/AgentOrchestrations_Step01_Concurrent.csproj" />
177+
<Project Path="samples/SemanticKernelMigration/AgentOrchestrations/Step02_Sequential/AgentOrchestrations_Step02_Sequential.csproj" />
178+
<Project Path="samples/SemanticKernelMigration/AgentOrchestrations/Step03_Handoff/AgentOrchestrations_Step03_Handoff.csproj" />
179+
</Folder>
174180
<Folder Name="/Solution Items/">
175181
<File Path=".editorconfig" />
176182
<File Path=".gitignore" />

dotnet/nuget/nuget-package.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<PropertyGroup>
33
<!-- Central version prefix - applies to all nuget packages. -->
44
<VersionPrefix>1.0.0</VersionPrefix>
5-
<PackageVersion Condition="'$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix).251002.1</PackageVersion>
6-
<PackageVersion Condition="'$(VersionSuffix)' == ''">$(VersionPrefix)-preview.251002.1</PackageVersion>
5+
<PackageVersion Condition="'$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix).251007.1</PackageVersion>
6+
<PackageVersion Condition="'$(VersionSuffix)' == ''">$(VersionPrefix)-preview.251007.1</PackageVersion>
77

88
<Configurations>Debug;Release;Publish</Configurations>
99
<IsPackable>true</IsPackable>

dotnet/samples/GettingStarted/Workflows/DeclarativeCode/DeclarativeCode.csproj renamed to dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteCode/ExecuteCode.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Workflows.Declarative\Microsoft.Agents.AI.Workflows.Declarative.csproj" />
29+
<ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Workflows.Declarative\Microsoft.Agents.AI.Workflows.Declarative.csproj" />
3030
</ItemGroup>
3131

3232
</Project>

dotnet/samples/GettingStarted/Workflows/DeclarativeCode/Generated.cs renamed to dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteCode/Generated.cs

File renamed without changes.

dotnet/samples/GettingStarted/Workflows/DeclarativeCode/Program.cs renamed to dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteCode/Program.cs

File renamed without changes.

dotnet/samples/GettingStarted/Workflows/Declarative/DeclarativeWorkflow.csproj renamed to dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteWorkflow/ExecuteWorkflow.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Workflows.Declarative\Microsoft.Agents.AI.Workflows.Declarative.csproj" />
28+
<ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Workflows.Declarative\Microsoft.Agents.AI.Workflows.Declarative.csproj" />
2929
</ItemGroup>
3030

3131
</Project>

dotnet/samples/GettingStarted/Workflows/Declarative/Program.cs renamed to dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteWorkflow/Program.cs

File renamed without changes.

dotnet/samples/GettingStarted/Workflows/DeclarativeEject/DeclarativeEject.csproj renamed to dotnet/samples/GettingStarted/Workflows/Declarative/GenerateCode/GenerateCode.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.Workflows.Declarative\Microsoft.Agents.AI.Workflows.Declarative.csproj" />
29+
<ProjectReference Include="..\..\..\..\..\src\Microsoft.Agents.AI.Workflows.Declarative\Microsoft.Agents.AI.Workflows.Declarative.csproj" />
3030
</ItemGroup>
3131

3232
</Project>

dotnet/samples/GettingStarted/Workflows/DeclarativeEject/Program.cs renamed to dotnet/samples/GettingStarted/Workflows/Declarative/GenerateCode/Program.cs

File renamed without changes.

dotnet/samples/GettingStarted/Workflows/Declarative/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ To set your secrets with .NET Secret Manager:
2727
1. From the root of the repository, navigate the console to the project folder:
2828

2929
```
30-
cd dotnet/samples/GettingStarted/Workflows/Declarative/DeclarativeWorkflow
30+
cd dotnet/samples/GettingStarted/Workflows/Declarative/ExecuteWorkflow
3131
```
3232
3333
2. Examine existing secret definitions:

0 commit comments

Comments
 (0)