fix neget and build (#387)

adyada · web-flow · commit 56bf5072c4e3 · 2025-11-19T17:38:16.000-08:00
diff --git a/samples/microsoft/csharp/FoundryA365/src/hello_world_a365_agent/AgentLogic/A365AgentApplication.cs b/samples/microsoft/csharp/FoundryA365/src/hello_world_a365_agent/AgentLogic/A365AgentApplication.cs
@@ -35,7 +35,7 @@ private void ConfigureMessageHandling()
         this.OnAgenticEmailNotification(async (turnContext, turnState, agentNotificationActivity, cancellationToken) =>
         {
             var agent = await GetAgentFromRecipient(turnContext.Activity);
-            var agentService = await _factory.GetService(agent);
+            var agentService = await _factory.GetService(agent, turnContext);
             if (agent.IsMessagingEnabled || true)
             {
                 // Use the specific email notification handler
@@ -51,7 +51,7 @@ private void ConfigureMessageHandling()
         this.OnAgenticWordNotification(async (turnContext, turnState, agentNotificationActivity, cancellationToken) =>
         {
             var agent = await GetAgentFromRecipient(turnContext.Activity);
-            var agentService = await _factory.GetService(agent);
+            var agentService = await _factory.GetService(agent, turnContext);
 
             if (agent.IsMessagingEnabled)
             {
@@ -68,7 +68,7 @@ private void ConfigureMessageHandling()
         this.OnAgenticExcelNotification(async (turnContext, turnState, agentNotificationActivity, cancellationToken) =>
         {
             var agent = await GetAgentFromRecipient(turnContext.Activity);
-            var agentService = await _factory.GetService(agent);
+            var agentService = await _factory.GetService(agent, turnContext);
 
             if (agent.IsMessagingEnabled)
             {
@@ -85,7 +85,7 @@ private void ConfigureMessageHandling()
         this.OnAgenticPowerPointNotification(async (turnContext, turnState, agentNotificationActivity, cancellationToken) =>
         {
             var agent = await GetAgentFromRecipient(turnContext.Activity);
-            var agentService = await _factory.GetService(agent);
+            var agentService = await _factory.GetService(agent, turnContext);
 
             if (agent.IsMessagingEnabled)
             {
@@ -104,7 +104,7 @@ private void ConfigureMessageHandling()
             var agent = await GetAgentFromRecipient(turnContext.Activity);
 
             // Get agent logic service from factory
-            var agentService = await _factory.GetService(agent);
+            var agentService = await _factory.GetService(agent, turnContext);
 
             // Ignoring all other channel Ids to prevent duplicate notifications.
 			if (agent.IsMessagingEnabled && turnContext.Activity.ChannelId != "msteams")
@@ -120,16 +120,16 @@ private void ConfigureMessageHandling()
         OnActivity(ActivityTypes.Event, async (turnContext, turnState, cancellationToken) =>
         {
             var agent = await GetAgentFromRecipient(turnContext.Activity);
-            var agentService = await _factory.GetService(agent);
+            var agentService = await _factory.GetService(agent, turnContext);
 
             await agentService.NewActivityReceived(turnContext, turnState, cancellationToken);
         });
 
         OnActivity(ActivityTypes.InstallationUpdate, async (turnContext, turnState, cancellationToken) =>
         {
             var agent = await GetAgentFromRecipient(turnContext.Activity);
-            var agentService = await _factory.GetService(agent);
-            
+            var agentService = await _factory.GetService(agent, turnContext);
+
             if (agent.IsMessagingEnabled)
             {
 				// Create AgentNotificationActivity for installation updates
diff --git a/samples/microsoft/csharp/FoundryA365/src/hello_world_a365_agent/AgentLogic/AgentLogicServiceFactory.cs b/samples/microsoft/csharp/FoundryA365/src/hello_world_a365_agent/AgentLogic/AgentLogicServiceFactory.cs
@@ -2,10 +2,10 @@ namespace HelloWorldA365.AgentLogic;
 
 using HelloWorldA365.AgentLogic.SemanticKernel;
 using HelloWorldA365.Models;
+using Microsoft.Agents.Builder;
 
 public sealed class AgentLogicServiceFactory(
     IConfiguration configuration,
-    IServiceProvider serviceProvider,
     ILogger<AgentLogicServiceFactory> logger,
     SemanticKernelAgentLogicServiceFactory semanticKernelAgentLogicServiceFactory)
 {
@@ -17,22 +17,22 @@ public sealed class AgentLogicServiceFactory(
     /// </summary>
     /// <param name="agent">The agent to get the service for.</param>
     /// <returns>A AgentLogicService instance.</returns>
-    public async Task<IAgentLogicService> GetService(AgentMetadata agent)
+    public async Task<IAgentLogicService> GetService(AgentMetadata agent, ITurnContext turnContext)
     {
         // Note: We should not cache the service per bot.
         // The service must be created per turn. Context is not desined to be shared across turns.
-        return await CreateServiceAsync(agent);
+        return await CreateServiceAsync(agent, turnContext);
     }
 
-    private async Task<IAgentLogicService> CreateServiceAsync(AgentMetadata agent)
+    private async Task<IAgentLogicService> CreateServiceAsync(AgentMetadata agent, ITurnContext turnContext)
     {
         switch (implementationType.ToUpperInvariant())
         {
             case "SK":
             case "SEMANTICKERNEL":
             default:
                 logger.LogInformation("Creating Semantic Kernel-based AgentLogicService for agent {AgentId}", agent.AgentId);
-                return await semanticKernelAgentLogicServiceFactory.CreateAsync(agent);
+                return await semanticKernelAgentLogicServiceFactory.CreateAsync(agent, turnContext);
 
         }
     }
diff --git a/samples/microsoft/csharp/FoundryA365/src/hello_world_a365_agent/AgentLogic/SemanticKernel/SemanticKernelAgentLogicService.cs b/samples/microsoft/csharp/FoundryA365/src/hello_world_a365_agent/AgentLogic/SemanticKernel/SemanticKernelAgentLogicService.cs
@@ -18,6 +18,7 @@ namespace HelloWorldA365.AgentLogic.SemanticKernel;
 using Microsoft.Agents.A365.Observability.Runtime.Common;
 using Microsoft.Agents.A365.Observability.Extensions.SemanticKernel;
 using Microsoft.Agents.A365.Notifications.Models;
+using Microsoft.Agents.A365.Observability.Common;
 
 /// <summary>
 /// Semantic Kernel-based implementation of AgentLogicService.
diff --git a/samples/microsoft/csharp/FoundryA365/src/hello_world_a365_agent/AgentLogic/SemanticKernel/SemanticKernelAgentLogicServiceFactory.cs b/samples/microsoft/csharp/FoundryA365/src/hello_world_a365_agent/AgentLogic/SemanticKernel/SemanticKernelAgentLogicServiceFactory.cs
@@ -31,12 +31,12 @@ public sealed class SemanticKernelAgentLogicServiceFactory(
 {
     private readonly string certificateData = configuration.GetCertificateData() ?? string.Empty;
 
-    public async Task<IAgentLogicService> CreateAsync(AgentMetadata agent)
+    public async Task<IAgentLogicService> CreateAsync(AgentMetadata agent, ITurnContext turnContext)
     {
         var kernelBuilder = Kernel.CreateBuilder();
         AddModel(kernelBuilder);
         var kernel = kernelBuilder.Build();
-        await ConfigureKernelPlugins(agent, kernel);
+        await ConfigureKernelPlugins(agent, kernel, turnContext);
         // Resolve GraphService for constructor injection
         var scopedServiceProvider = serviceProvider.CreateScope().ServiceProvider;
 
@@ -45,7 +45,7 @@ public async Task<IAgentLogicService> CreateAsync(AgentMetadata agent)
         return new SemanticKernelAgentLogicService(tokenHelper, agent, kernel, certificateData, configuration, logger, mcpToolRegistrationService, tokenCache);
     }
 
-    private async Task ConfigureKernelPlugins(AgentMetadata agent, Kernel kernel)
+    private async Task ConfigureKernelPlugins(AgentMetadata agent, Kernel kernel, ITurnContext turnContext)
     {
         var scopedServiceProvider = serviceProvider.CreateScope().ServiceProvider;
         // Prod scope for MCP servers.
@@ -61,8 +61,9 @@ private async Task ConfigureKernelPlugins(AgentMetadata agent, Kernel kernel)
             environmentId = $"Default-{agent.TenantId.ToString()}";
         }
         UserAuthorization userAuthorization = null;
-        ITurnContext turnContext = null;
-        mcpToolRegistrationService.AddToolServersToAgent(kernel, agentUserId, environmentId, userAuthorization, turnContext, accessToken.Token);
+        string authHandlerName = string.Empty;
+
+        await mcpToolRegistrationService.AddToolServersToAgentAsync(kernel, userAuthorization, authHandlerName, turnContext, accessToken.Token);
     }
 
     private IKernelBuilder AddModel(IKernelBuilder kernelBuilder)
diff --git a/samples/microsoft/csharp/FoundryA365/src/hello_world_a365_agent/HelloWorldA365Agent.csproj b/samples/microsoft/csharp/FoundryA365/src/hello_world_a365_agent/HelloWorldA365Agent.csproj
@@ -13,23 +13,11 @@
         <OpenTelemetryVersion>1.12.0</OpenTelemetryVersion>
     </PropertyGroup>
         
-	<!--<ItemGroup>
-		<PackageReference Include="Microsoft.Kairo.Sdk.Observability" Version="*-preview.*" />
-		<PackageReference Include="Microsoft.Kairo.Sdk.Observability.OpenAI" Version="*-preview.*" />
-		<PackageReference Include="Microsoft.Kairo.Sdk.Observability.SemanticKernel" Version="*-preview.*" />
-		<PackageReference Include="Microsoft.Kairo.Sdk.Runtime.Common" Version="*-preview.*" />
-		<PackageReference Include="Microsoft.Kairo.Sdk.Tooling.SemanticKernel" Version="*-preview.*" />
-	</ItemGroup>-->
-
-	<!-- Use the A365 packages for production code https://msazure.visualstudio.com/OneAgile/_artifacts/feed/Agent365@Local 
-	https://github.com/microsoft/Agent365/blob/main/dotnet/sdk/publish.ps1#L35 -->
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Agents.A365.Observability" Version="2025.11.6-preview.1903" />
-		<PackageReference Include="Microsoft.Agents.A365.Observability.OpenAI" Version="2025.11.6-preview.1903" />
-		<PackageReference Include="Microsoft.Agents.A365.Observability.SemanticKernel" Version="2025.11.6-preview.1903" />
-		<PackageReference Include="Microsoft.Agents.A365.Tooling.SemanticKernel" Version="2025.10.27-preview.1758" />
-		<PackageReference Include="Microsoft.Agents.A365.Notifications" Version="2025.11.6-preview.1903" />
-		<PackageReference Include="Microsoft.Agents.A365.Runtime.Common" Version="2025.11.6-preview.1903" />
+		<PackageReference Include="Microsoft.Agents.A365.Observability" Version="0.1.75-beta" />
+		<PackageReference Include="Microsoft.Agents.A365.Observability.Extensions.SemanticKernel" Version="0.1.75-beta" />
+		<PackageReference Include="Microsoft.Agents.A365.Tooling.Extensions.SemanticKernel" Version="0.1.75-beta" />
+		<PackageReference Include="Microsoft.Agents.A365.Notifications" Version="0.1.75-beta" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/samples/microsoft/csharp/FoundryA365/src/hello_world_a365_agent/Program.cs b/samples/microsoft/csharp/FoundryA365/src/hello_world_a365_agent/Program.cs
@@ -89,8 +89,7 @@
         };
     });
 
-    builder.Services
-        .AddTracing(config => config
+    builder.AddA365Tracing(config => config
             .WithSemanticKernel());
 }
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ private void ConfigureMessageHandling()`
`35`	`35`	`this.OnAgenticEmailNotification(async (turnContext, turnState, agentNotificationActivity, cancellationToken) =>`
`36`	`36`	`{`
`37`	`37`	`var agent = await GetAgentFromRecipient(turnContext.Activity);`
`38`		`- var agentService = await _factory.GetService(agent);`
	`38`	`+ var agentService = await _factory.GetService(agent, turnContext);`
`39`	`39`	`if (agent.IsMessagingEnabled \|\| true)`
`40`	`40`	`{`
`41`	`41`	`// Use the specific email notification handler`
`@@ -51,7 +51,7 @@ private void ConfigureMessageHandling()`
`51`	`51`	`this.OnAgenticWordNotification(async (turnContext, turnState, agentNotificationActivity, cancellationToken) =>`
`52`	`52`	`{`
`53`	`53`	`var agent = await GetAgentFromRecipient(turnContext.Activity);`
`54`		`- var agentService = await _factory.GetService(agent);`
	`54`	`+ var agentService = await _factory.GetService(agent, turnContext);`
`55`	`55`
`56`	`56`	`if (agent.IsMessagingEnabled)`
`57`	`57`	`{`
`@@ -68,7 +68,7 @@ private void ConfigureMessageHandling()`
`68`	`68`	`this.OnAgenticExcelNotification(async (turnContext, turnState, agentNotificationActivity, cancellationToken) =>`
`69`	`69`	`{`
`70`	`70`	`var agent = await GetAgentFromRecipient(turnContext.Activity);`
`71`		`- var agentService = await _factory.GetService(agent);`
	`71`	`+ var agentService = await _factory.GetService(agent, turnContext);`
`72`	`72`
`73`	`73`	`if (agent.IsMessagingEnabled)`
`74`	`74`	`{`
`@@ -85,7 +85,7 @@ private void ConfigureMessageHandling()`
`85`	`85`	`this.OnAgenticPowerPointNotification(async (turnContext, turnState, agentNotificationActivity, cancellationToken) =>`
`86`	`86`	`{`
`87`	`87`	`var agent = await GetAgentFromRecipient(turnContext.Activity);`
`88`		`- var agentService = await _factory.GetService(agent);`
	`88`	`+ var agentService = await _factory.GetService(agent, turnContext);`
`89`	`89`
`90`	`90`	`if (agent.IsMessagingEnabled)`
`91`	`91`	`{`
`@@ -104,7 +104,7 @@ private void ConfigureMessageHandling()`
`104`	`104`	`var agent = await GetAgentFromRecipient(turnContext.Activity);`
`105`	`105`
`106`	`106`	`// Get agent logic service from factory`
`107`		`- var agentService = await _factory.GetService(agent);`
	`107`	`+ var agentService = await _factory.GetService(agent, turnContext);`
`108`	`108`
`109`	`109`	`// Ignoring all other channel Ids to prevent duplicate notifications.`
`110`	`110`	`if (agent.IsMessagingEnabled && turnContext.Activity.ChannelId != "msteams")`
`@@ -120,16 +120,16 @@ private void ConfigureMessageHandling()`
`120`	`120`	`OnActivity(ActivityTypes.Event, async (turnContext, turnState, cancellationToken) =>`
`121`	`121`	`{`
`122`	`122`	`var agent = await GetAgentFromRecipient(turnContext.Activity);`
`123`		`- var agentService = await _factory.GetService(agent);`
	`123`	`+ var agentService = await _factory.GetService(agent, turnContext);`
`124`	`124`
`125`	`125`	`await agentService.NewActivityReceived(turnContext, turnState, cancellationToken);`
`126`	`126`	`});`
`127`	`127`
`128`	`128`	`OnActivity(ActivityTypes.InstallationUpdate, async (turnContext, turnState, cancellationToken) =>`
`129`	`129`	`{`
`130`	`130`	`var agent = await GetAgentFromRecipient(turnContext.Activity);`
`131`		`- var agentService = await _factory.GetService(agent);`
`132`		`-`
	`131`	`+ var agentService = await _factory.GetService(agent, turnContext);`
	`132`	`+`
`133`	`133`	`if (agent.IsMessagingEnabled)`
`134`	`134`	`{`
`135`	`135`	`// Create AgentNotificationActivity for installation updates`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@ namespace HelloWorldA365.AgentLogic;`
`2`	`2`
`3`	`3`	`using HelloWorldA365.AgentLogic.SemanticKernel;`
`4`	`4`	`using HelloWorldA365.Models;`
	`5`	`+using Microsoft.Agents.Builder;`
`5`	`6`
`6`	`7`	`public sealed class AgentLogicServiceFactory(`
`7`	`8`	`IConfiguration configuration,`
`8`		`- IServiceProvider serviceProvider,`
`9`	`9`	`ILogger<AgentLogicServiceFactory> logger,`
`10`	`10`	`SemanticKernelAgentLogicServiceFactory semanticKernelAgentLogicServiceFactory)`
`11`	`11`	`{`
`@@ -17,22 +17,22 @@ public sealed class AgentLogicServiceFactory(`
`17`	`17`	`/// </summary>`
`18`	`18`	`/// <param name="agent">The agent to get the service for.</param>`
`19`	`19`	`/// <returns>A AgentLogicService instance.</returns>`
`20`		`- public async Task<IAgentLogicService> GetService(AgentMetadata agent)`
	`20`	`+ public async Task<IAgentLogicService> GetService(AgentMetadata agent, ITurnContext turnContext)`
`21`	`21`	`{`
`22`	`22`	`// Note: We should not cache the service per bot.`
`23`	`23`	`// The service must be created per turn. Context is not desined to be shared across turns.`
`24`		`- return await CreateServiceAsync(agent);`
	`24`	`+ return await CreateServiceAsync(agent, turnContext);`
`25`	`25`	`}`
`26`	`26`
`27`		`- private async Task<IAgentLogicService> CreateServiceAsync(AgentMetadata agent)`
	`27`	`+ private async Task<IAgentLogicService> CreateServiceAsync(AgentMetadata agent, ITurnContext turnContext)`
`28`	`28`	`{`
`29`	`29`	`switch (implementationType.ToUpperInvariant())`
`30`	`30`	`{`
`31`	`31`	`case "SK":`
`32`	`32`	`case "SEMANTICKERNEL":`
`33`	`33`	`default:`
`34`	`34`	`logger.LogInformation("Creating Semantic Kernel-based AgentLogicService for agent {AgentId}", agent.AgentId);`
`35`		`- return await semanticKernelAgentLogicServiceFactory.CreateAsync(agent);`
	`35`	`+ return await semanticKernelAgentLogicServiceFactory.CreateAsync(agent, turnContext);`
`36`	`36`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,12 @@ public sealed class SemanticKernelAgentLogicServiceFactory(`
`31`	`31`	`{`
`32`	`32`	`private readonly string certificateData = configuration.GetCertificateData() ?? string.Empty;`
`33`	`33`
`34`		`- public async Task<IAgentLogicService> CreateAsync(AgentMetadata agent)`
	`34`	`+ public async Task<IAgentLogicService> CreateAsync(AgentMetadata agent, ITurnContext turnContext)`
`35`	`35`	`{`
`36`	`36`	`var kernelBuilder = Kernel.CreateBuilder();`
`37`	`37`	`AddModel(kernelBuilder);`
`38`	`38`	`var kernel = kernelBuilder.Build();`
`39`		`- await ConfigureKernelPlugins(agent, kernel);`
	`39`	`+ await ConfigureKernelPlugins(agent, kernel, turnContext);`
`40`	`40`	`// Resolve GraphService for constructor injection`
`41`	`41`	`var scopedServiceProvider = serviceProvider.CreateScope().ServiceProvider;`
`42`	`42`
`@@ -45,7 +45,7 @@ public async Task<IAgentLogicService> CreateAsync(AgentMetadata agent)`
`45`	`45`	`return new SemanticKernelAgentLogicService(tokenHelper, agent, kernel, certificateData, configuration, logger, mcpToolRegistrationService, tokenCache);`
`46`	`46`	`}`
`47`	`47`
`48`		`- private async Task ConfigureKernelPlugins(AgentMetadata agent, Kernel kernel)`
	`48`	`+ private async Task ConfigureKernelPlugins(AgentMetadata agent, Kernel kernel, ITurnContext turnContext)`
`49`	`49`	`{`
`50`	`50`	`var scopedServiceProvider = serviceProvider.CreateScope().ServiceProvider;`
`51`	`51`	`// Prod scope for MCP servers.`
`@@ -61,8 +61,9 @@ private async Task ConfigureKernelPlugins(AgentMetadata agent, Kernel kernel)`
`61`	`61`	`environmentId = $"Default-{agent.TenantId.ToString()}";`
`62`	`62`	`}`
`63`	`63`	`UserAuthorization userAuthorization = null;`
`64`		`- ITurnContext turnContext = null;`
`65`		`- mcpToolRegistrationService.AddToolServersToAgent(kernel, agentUserId, environmentId, userAuthorization, turnContext, accessToken.Token);`
	`64`	`+ string authHandlerName = string.Empty;`
	`65`	`+`
	`66`	`+ await mcpToolRegistrationService.AddToolServersToAgentAsync(kernel, userAuthorization, authHandlerName, turnContext, accessToken.Token);`
`66`	`67`	`}`
`67`	`68`
`68`	`69`	`private IKernelBuilder AddModel(IKernelBuilder kernelBuilder)`
Original file line number	Diff line number	Diff line change
`@@ -89,8 +89,7 @@`
`89`	`89`	`};`
`90`	`90`	`});`
`91`	`91`
`92`		`- builder.Services`
`93`		`- .AddTracing(config => config`
	`92`	`+ builder.AddA365Tracing(config => config`
`94`	`93`	`.WithSemanticKernel());`
`95`	`94`	`}`
`96`	`95`