Skip to content

Commit 1fa7ff0

Browse files
authored
feat: Teams AI CSharp batch 2 (#14572)
* refactor: rename * refactor: more * refactor: more * refactor: more * refactor: more
1 parent 52f5833 commit 1fa7ff0

File tree

54 files changed

+554
-826
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+554
-826
lines changed

packages/fx-core/src/component/generator/templates/metadata/special.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export const specialTemplates: Template[] = [
4444
description: "",
4545
},
4646
{
47-
id: "custom-copilot-rag-custom-api-v2-csharp",
47+
id: "teams-agent-with-data-custom-api-v2-csharp",
4848
name: TemplateNames.CustomCopilotRagCustomApi,
4949
language: "csharp",
5050
description: "",

templates/vs/csharp/basic-tab/{{ProjectName}}.csproj.tpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<ItemGroup>
1616
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
1717
<PackageReference Include="Azure.Identity" Version="1.13.1" />
18-
<PackageReference Include="Microsoft.Teams.Api" Version="2.0.0" />
19-
<PackageReference Include="Microsoft.Teams.Apps" Version="2.0.0" />
20-
<PackageReference Include="Microsoft.Teams.Plugins.AspNetCore" Version="2.0.0" />
21-
<PackageReference Include="Microsoft.Teams.Common" Version="2.0.0" />
18+
<PackageReference Include="Microsoft.Teams.Api" Version="2.0.*" />
19+
<PackageReference Include="Microsoft.Teams.Apps" Version="2.0.*" />
20+
<PackageReference Include="Microsoft.Teams.Plugins.AspNetCore" Version="2.0.*" />
21+
<PackageReference Include="Microsoft.Teams.Common" Version="2.0.*" />
2222
</ItemGroup>
2323

2424
<!-- Exclude local settings from publish -->

templates/vs/csharp/custom-copilot-basic/Utils/TextUtils.cs.tpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
using Microsoft.Teams.Api.Activities;
22
using Microsoft.Teams.Api.Entities;
33

4-
namespace {{SafeProjectName}}.Utils
4+
namespace {{SafeProjectName}}.Utils
5+
{
56
public static class Utils
67
{
78
public static string StripMentionsText(MessageActivity activity)

templates/vs/csharp/custom-copilot-basic/{{ProjectName}}.csproj.tpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
{{/isNewProjectTypeEnabled}}
2222
<ItemGroup>
2323
<PackageReference Include="Azure.Identity" Version="1.13.1" />
24-
<PackageReference Include="Microsoft.Teams.Api" Version="2.0.0" />
25-
<PackageReference Include="Microsoft.Teams.Apps" Version="2.0.0" />
26-
<PackageReference Include="Microsoft.Teams.Plugins.AspNetCore" Version="2.0.0" />
27-
<PackageReference Include="Microsoft.Teams.Common" Version="2.0.0" />
24+
<PackageReference Include="Microsoft.Teams.Api" Version="2.0.*" />
25+
<PackageReference Include="Microsoft.Teams.Apps" Version="2.0.*" />
26+
<PackageReference Include="Microsoft.Teams.Plugins.AspNetCore" Version="2.0.*" />
27+
<PackageReference Include="Microsoft.Teams.Common" Version="2.0.*" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

templates/vs/csharp/custom-copilot-rag-azure-ai-search/Program.cs.tpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ var appBuilder = App.Builder();
3232

3333
if (config.Teams.BotType == "UserAssignedMsi")
3434
{
35-
Console.WriteLine($"Using UserAssignedMSI");
3635
appBuilder.AddCredentials(new TokenCredentials(
3736
config.Teams.ClientId ?? string.Empty,
3837
async (tenantId, scopes) =>

templates/vs/csharp/custom-copilot-rag-azure-ai-search/{{ProjectName}}.csproj.tpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
<ItemGroup>
2323
<PackageReference Include="Azure.Identity" Version="1.13.1" />
2424
<PackageReference Include="Azure.Search.Documents" Version="11.6.0" />
25-
<PackageReference Include="Microsoft.Teams.Api" Version="2.0.0" />
26-
<PackageReference Include="Microsoft.Teams.Apps" Version="2.0.0" />
27-
<PackageReference Include="Microsoft.Teams.Plugins.AspNetCore" Version="2.0.0" />
28-
<PackageReference Include="Microsoft.Teams.Common" Version="2.0.0" />
25+
<PackageReference Include="Microsoft.Teams.Api" Version="2.0.*" />
26+
<PackageReference Include="Microsoft.Teams.Apps" Version="2.0.*" />
27+
<PackageReference Include="Microsoft.Teams.Plugins.AspNetCore" Version="2.0.*" />
28+
<PackageReference Include="Microsoft.Teams.Common" Version="2.0.*" />
2929
</ItemGroup>
3030

3131
<ItemGroup>

templates/vs/csharp/custom-copilot-rag-custom-api-v2/AdapterWithErrorHandler.cs.tpl

Lines changed: 0 additions & 33 deletions
This file was deleted.

templates/vs/csharp/custom-copilot-rag-custom-api-v2/Controllers/BotController.cs.tpl

Lines changed: 0 additions & 26 deletions
This file was deleted.

templates/vs/csharp/custom-copilot-rag-custom-api-v2/Models/AppState.cs.tpl

Lines changed: 0 additions & 61 deletions
This file was deleted.

templates/vs/csharp/custom-copilot-rag-custom-api-v2/Program.cs.tpl

Lines changed: 0 additions & 130 deletions
This file was deleted.

0 commit comments

Comments
 (0)