Merge pull request #10256 from OfficeDev/zhiyou/merge-back

build: merge main to dev (after VS 17.9 P1 released)
OfficeDev · Nov 1, 2023 · dab103f · dab103f
2 parents 543c58a + af0cb07
commit dab103f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/packages/fx-core/src/core/FxCore.ts b/packages/fx-core/src/core/FxCore.ts
@@ -113,6 +113,7 @@ import {
 } from "./middleware/utils/v3MigrationUtils";
 import { CoreTelemetryComponentName, CoreTelemetryEvent, CoreTelemetryProperty } from "./telemetry";
 import { CoreHookContext, PreProvisionResForVS, VersionCheckRes } from "./types";
+import "../component/feature/sso";
 
 export type CoreCallbackFunc = (name: string, err?: FxError, data?: any) => void | Promise<void>;
 

diff --git a/templates/csharp/copilot-plugin-existing-api/{{ProjectName}}.csproj.tpl b/templates/csharp/copilot-plugin-existing-api/{{ProjectName}}.csproj.tpl
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <ProjectCapability Include="TeamsFx" />
-    <ProjectCapability Include="CopilotPlugin" />
+    <ProjectCapability Include="APIME" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/templates/csharp/copilot-plugin-from-oai-plugin/{{ProjectName}}.csproj.tpl b/templates/csharp/copilot-plugin-from-oai-plugin/{{ProjectName}}.csproj.tpl
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <ProjectCapability Include="TeamsFx" />
-    <ProjectCapability Include="CopilotPlugin" />
+    <ProjectCapability Include="APIME" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/templates/csharp/copilot-plugin-from-scratch/{{ProjectName}}.csproj.tpl b/templates/csharp/copilot-plugin-from-scratch/{{ProjectName}}.csproj.tpl
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <ProjectCapability Include="TeamsFx" />
-    <ProjectCapability Include="CopilotPlugin" />
+    <ProjectCapability Include="APIME" />
   </ItemGroup>
 
   <ItemGroup>