Merge pull request #15413 from OfficeDev/nintan/bugfix

fix: "upgrade manifest" and advanced da error message

Author: wh-alice

packages/fx-core/resource/package.nls.json

@@ -251,7 +251,7 @@
   "error.apime.noExtraAPICanBeAdded": "Unable to add API because only GET and POST methods are supported, with a maximum of 5 required parameters and no authentication. Also, methods defined in the manifest are not listed.",
   "error.copilot.noExtraAPICanBeAdded": "Unable to add API because no authentication is supported. Also, methods defined in the current OpenAPI description document are not listed.",
   "error.m365.NotExtendedToM365Error": "Unable to extend the app to Microsoft 365. Use 'teamsApp/extendToM365' action to extend the app to Microsoft 365.",
-  "error.m365.SharedScopeAdvancedDADisabled": "Deployment blocked: Advanced declarative agent can't be deployed due to tenant permission settings. Get more info: [Manage agents for Microsoft 365 Copilot in the Microsoft 365 admin center - Microsoft 365 admin | Microsoft Learn](%s)",
+  "error.m365.SharedScopeAdvancedDADisabled": "Deployment blocked: Advanced declarative agent can't be deployed as 'shared' scope due to tenant permission settings. Get more info: [Known limitation of Advanced Declarative Agent](%s)",
   "error.share.yamlConfigNotFound": "Unable to find the \"provision\" or \"deploy\" config in the m365agents.yml",
   "error.share.yamlConfigNotSupported": "Share feature only supports m365agents.yml version v1.10 or above, follow [the guide](https://github.com/OfficeDev/microsoft-365-agents-toolkit/wiki/Share-Declarative-Agents-with-Others#About-YAML-schema) to upgrade and proceed.",
   "error.share.shareActionConfigNotFound": "Unable to find the \"%s\" action config in the m365agents.yml",

packages/vscode-extension/package.json

@@ -715,12 +715,6 @@
         "enablement": "fx-extension.isTeamsFx && fx-extension.isAadManifestEnabled && isWorkspaceTrusted && !fx-extension.isSPFx",
         "category": "Microsoft 365 Agents"
       },
-      {
-        "command": "fx-extension.migrateTeamsManifest",
-        "title": "%teamstoolkit.commands.migrateManifest.title%",
-        "enablement": "isWorkspaceTrusted",
-        "category": "Microsoft 365 Agents"
-      },
       {
         "command": "fx-extension.migrateTeamsTabApp",
         "title": "%teamstoolkit.commands.migrateApp.title%",

packages/vscode-extension/package.nls.json

@@ -96,7 +96,6 @@
   "teamstoolkit.commands.debugInTestTool.title": "Debug in Microsoft 365 Agents Playground",
   "teamstoolkit.commands.m365AccountSettings.title": "Microsoft 365 Portal",
   "teamstoolkit.commands.migrateApp.title": "Upgrade Teams JS SDK and Code References",
-  "teamstoolkit.commands.migrateManifest.title": "Upgrade App Manifest",
   "teamstoolkit.commands.openDocumentLink.title": "Get More Info",
   "teamstoolkit.commands.openInPortal.title": "Open in Portal",
   "teamstoolkit.commands.openManifestSchema.title": "Open Manifest Schema",
@@ -651,4 +650,4 @@
   "teamstoolkit.MCP.LocalMcpCommandMissing": "Local MCP command is missing.",
   "teamstoolkit.MCP.ToolsNotFound": "No tools found for the MCP server. Please run the server first.",
   "teamstoolkit.MCP.SelectServerFailed": "Failed to select MCP server."
-}
+}

packages/vscode-extension/src/extension.ts

@@ -137,10 +137,7 @@ import {
   updatePreviewManifest,
   validateManifestHandler,
 } from "./handlers/manifestHandlers";
-import {
-  migrateTeamsManifestHandler,
-  migrateTeamsTabAppHandler,
-} from "./handlers/migrationHandler";
+import { migrateTeamsTabAppHandler } from "./handlers/migrationHandler";
 import * as officeDevHandlers from "./handlers/officeDevHandlers";
 import {
   findGitHubSimilarIssue,
@@ -192,7 +189,6 @@ import { signOutAzure, signOutM365 } from "./utils/accountUtils";
 import { acpInstalled, delay, hasAdaptiveCardInWorkspace } from "./utils/commonUtils";
 import { updateAutoOpenGlobalKey } from "./utils/globalStateUtils";
 import { loadLocalizedStrings } from "./utils/localizeUtils";
-import { setupMCPServer } from "./utils/mcpUtils";
 import { checkProjectTypeAndSendTelemetry, isM365Project } from "./utils/projectChecker";
 import { ReleaseNote } from "./utils/releaseNote";
 import { ExtensionSurvey } from "./utils/survey";
@@ -458,13 +454,6 @@ function registerActivateCommands(context: vscode.ExtensionContext) {
   // commmand: check copilot access
   registerInCommandController(context, CommandKeys.CheckCopilotAccess, checkCopilotAccessHandler);
 
-  // Upgrade command to update Teams manifest
-  const migrateTeamsManifestCmd = vscode.commands.registerCommand(
-    "fx-extension.migrateTeamsManifest",
-    () => Correlator.run(migrateTeamsManifestHandler)
-  );
-  context.subscriptions.push(migrateTeamsManifestCmd);
-
   // Upgrade command to update Teams Client SDK
   const migrateTeamsTabAppCmd = vscode.commands.registerCommand(
     "fx-extension.migrateTeamsTabApp",