From fedbc3b20a917940c84f9047e7f404a2061e820f Mon Sep 17 00:00:00 2001
From: tommasodotnet <tstocchi@microsoft.com>
Date: Thu, 5 Mar 2026 09:40:49 +0100
Subject: [PATCH] merge

---
 dotnet/Directory.Packages.props                                | 1 -
 dotnet/agent-framework-dotnet.slnx                             | 1 -
 dotnet/samples/DevUIIntegration/EditorAgent/EditorAgent.csproj | 1 -
 dotnet/samples/DevUIIntegration/WriterAgent/WriterAgent.csproj | 1 -
 4 files changed, 4 deletions(-)

diff --git a/dotnet/Directory.Packages.props b/dotnet/Directory.Packages.props
index 704b948929..3b6b016a92 100644
--- a/dotnet/Directory.Packages.props
+++ b/dotnet/Directory.Packages.props
@@ -22,7 +22,6 @@
     <PackageVersion Include="Aspire.Microsoft.Azure.Cosmos" Version="$(AspireAppHostSdkVersion)" />
     <PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="13.0.0" />
     <!-- Azure.* -->
-    <PackageVersion Include="Azure.Core" Version="1.50.0" />
     <PackageVersion Include="Azure.AI.Projects" Version="2.0.0-beta.1" />
     <PackageVersion Include="Azure.AI.Projects.OpenAI" Version="2.0.0-beta.1" />
     <PackageVersion Include="Azure.AI.Agents.Persistent" Version="1.2.0-beta.8" />
diff --git a/dotnet/agent-framework-dotnet.slnx b/dotnet/agent-framework-dotnet.slnx
index b3581cd98a..fbb64e1165 100644
--- a/dotnet/agent-framework-dotnet.slnx
+++ b/dotnet/agent-framework-dotnet.slnx
@@ -66,7 +66,6 @@
     <Project Path="samples/02-agents/Agents/Agent_Step15_DeepResearch/Agent_Step15_DeepResearch.csproj" />
     <Project Path="samples/02-agents/Agents/Agent_Step16_Declarative/Agent_Step16_Declarative.csproj" />
     <Project Path="samples/02-agents/Agents/Agent_Step17_AdditionalAIContext/Agent_Step17_AdditionalAIContext.csproj" />
->>>>>>> main
   </Folder>
   <Folder Name="/Samples/02-agents/DeclarativeAgents/">
     <Project Path="samples/02-agents/DeclarativeAgents/ChatClient/DeclarativeChatClientAgents.csproj" />
diff --git a/dotnet/samples/DevUIIntegration/EditorAgent/EditorAgent.csproj b/dotnet/samples/DevUIIntegration/EditorAgent/EditorAgent.csproj
index ace52399c5..cbbbccac4a 100644
--- a/dotnet/samples/DevUIIntegration/EditorAgent/EditorAgent.csproj
+++ b/dotnet/samples/DevUIIntegration/EditorAgent/EditorAgent.csproj
@@ -9,7 +9,6 @@
 
   <ItemGroup>
     <PackageReference Include="Aspire.Azure.AI.Inference" />
-    <PackageReference Include="Azure.Core" />
     <PackageReference Include="Azure.Identity" />
     <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
     <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.Hosting\Microsoft.Agents.AI.Hosting.csproj" />
diff --git a/dotnet/samples/DevUIIntegration/WriterAgent/WriterAgent.csproj b/dotnet/samples/DevUIIntegration/WriterAgent/WriterAgent.csproj
index e596b972fe..a30f969a80 100644
--- a/dotnet/samples/DevUIIntegration/WriterAgent/WriterAgent.csproj
+++ b/dotnet/samples/DevUIIntegration/WriterAgent/WriterAgent.csproj
@@ -9,7 +9,6 @@
 
   <ItemGroup>
     <PackageReference Include="Aspire.Azure.AI.Inference" />
-    <PackageReference Include="Azure.Core" />
     <PackageReference Include="Azure.Identity" />
     <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI\Microsoft.Agents.AI.csproj" />
     <ProjectReference Include="..\..\..\src\Microsoft.Agents.AI.Hosting\Microsoft.Agents.AI.Hosting.csproj" />