From 123c81fa9170a8df4de5d9b63957a9adb10e1843 Mon Sep 17 00:00:00 2001 From: supkasar <157565053+supkasar@users.noreply.github.com> Date: Tue, 27 Feb 2024 13:41:28 +0530 Subject: [PATCH 1/3] Docs: Update package.nls.json Corrected the grammar in the content. Simplified it to make it concise, clear, and consistent throughout. --- packages/fx-core/resource/package.nls.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/fx-core/resource/package.nls.json b/packages/fx-core/resource/package.nls.json index 8a915df631..4c3b5a12d1 100644 --- a/packages/fx-core/resource/package.nls.json +++ b/packages/fx-core/resource/package.nls.json @@ -27,17 +27,17 @@ "core.progress.runCommand": "Run command %s at %s", "core.progress.deployToAzure": "Deploying %s to %s.", "core.migrationV3.confirmOnly.Message": "Please confirm the upgrade", - "core.migrationV3.Message": "Upgrade your Teams Toolkit project to stay compatible with the latest version. A backup directory will be created along with an Upgrade Summary.", - "core.migrationV3.VS.Message": "Upgrade your solution to stay compatible with the latest Teams Toolkit version. A backup directory will be generated in which it contains an upgrade report.", + "core.migrationV3.Message": "Upgrade your Teams Toolkit project to stay up-to-date. A backup directory will be created with an Upgrade Summary.", + "core.migrationV3.VS.Message": "Upgrade your solution to stay up-to-date. A backup directory will be created containing an upgrade report.", "core.migrationV3.aadManifestNotExist": "templates/appPackage/aad.manifest.template.json does not exist. You may be trying to upgrade a project created by Teams Toolkit for Visual Studio Code v3.x / Teams Toolkit CLI v0.x / Teams Toolkit for Visual Studio v17.3. Please install Teams Toolkit for Visual Studio Code v4.x / Teams Toolkit CLI v1.x / Teams Toolkit for Visual Studio v17.4 and run upgrade first.", - "core.migrationV3.manifestNotExist": "templates/appPackage/manifest.template.json does not exist. You may be trying to upgrade a project created by Teams Toolkit for Visual Studio Code v3.x / Teams Toolkit CLI v0.x / Teams Toolkit for Visual Studio v17.3. Please install Teams Toolkit for Visual Studio Code v4.x / Teams Toolkit CLI v1.x / Teams Toolkit for Visual Studio v17.4 and run upgrade first.", + "core.migrationV3.manifestNotExist": "templates/appPackage/manifest.template.json does not exist. You may be trying to upgrade a project created by Teams Toolkit for Visual Studio Code v3.x / Teams Toolkit CLI v0.x / Teams Toolkit for Visual Studio v17.3. Install Teams Toolkit for Visual Studio Code v4.x / Teams Toolkit CLI v1.x / Teams Toolkit for Visual Studio v17.4 and run upgrade first.", "core.migrationV3.manifestInvalid": "templates/appPackage/manifest.template.json is invalid.", - "core.migrationV3.abandonedProject": "This project is only for previewing and will not be supported by Teams Toolkit. Please try Teams Toolkit by creating a new project", - "core.migrationV3.notAllowedMigration": "Teams Toolkit's Pre-Release version supports new project configuration and is incompatible with previous versions. Try it by creating a new project or run \"teamsapp upgrade\" to upgrade your project first.", - "core.projectVersionChecker.cliUseNewVersion": "Your TeamFx CLI version is old and it doesn't support current project, please upgrade to the latest version using command below:\nnpm install -g @microsoft/teamsapp-cli@latest", - "core.projectVersionChecker.incompatibleProject": "The current project is incompatible with the installed version of Teams Toolkit.", - "core.projectVersionChecker.vs.incompatibleProject": "The project in the solution is created with Teams Toolkit preview feature - Teams App Configuration Improvements. You can turn on the preview feature to continue.", - "core.deployArmTemplates.ActionSuccess": "Successfully deployed ARM templates. Resource group name: %s. Deployment name: %s", + "core.migrationV3.abandonedProject": "This project is for previewing only and won't be supported by Teams Toolkit. To use Teams Toolkit, create a new project", + "core.migrationV3.notAllowedMigration": "The Teams Toolkit Pre-Release version has new project settings and doesn't work with older versions. Create a new project to try it, or run \"teamsapp upgrade\" to update your existing project.", + "core.projectVersionChecker.cliUseNewVersion": "Your TeamFx CLI version is outdated and doesn't support current project. Upgrade to the latest version using command below:\nnpm install -g @microsoft/teamsapp-cli@latest", + "core.projectVersionChecker.incompatibleProject": "The project isn't compatible with the current Teams Toolkit version.", + "core.projectVersionChecker.vs.incompatibleProject": "The project contains a preview feature - "Teams App Configuration Improvements." Turn on the preview feature to continue.", + "core.deployArmTemplates.ActionSuccess": "ARM templates deployed successfully. Resource group name: %s. Deployment name: %s", "core.collaboration.ListCollaboratorsSuccess": "'List Microsoft 365 App owners' succeeded, you can view it in [Output panel](%s).", "core.collaboration.GrantingPermission": "Granting permission", "core.collaboration.EmailCannotBeEmptyOrSame": "Collaborator's email cannot be null or same as current user", From 2fa8f01a02554736ac00445262c433e32dff9f5a Mon Sep 17 00:00:00 2001 From: Yiqing Zhao Date: Wed, 28 Feb 2024 13:37:39 +0800 Subject: [PATCH 2/3] docs: Update package.nls.json --- packages/fx-core/resource/package.nls.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fx-core/resource/package.nls.json b/packages/fx-core/resource/package.nls.json index 4c3b5a12d1..b9b0092c2c 100644 --- a/packages/fx-core/resource/package.nls.json +++ b/packages/fx-core/resource/package.nls.json @@ -36,7 +36,7 @@ "core.migrationV3.notAllowedMigration": "The Teams Toolkit Pre-Release version has new project settings and doesn't work with older versions. Create a new project to try it, or run \"teamsapp upgrade\" to update your existing project.", "core.projectVersionChecker.cliUseNewVersion": "Your TeamFx CLI version is outdated and doesn't support current project. Upgrade to the latest version using command below:\nnpm install -g @microsoft/teamsapp-cli@latest", "core.projectVersionChecker.incompatibleProject": "The project isn't compatible with the current Teams Toolkit version.", - "core.projectVersionChecker.vs.incompatibleProject": "The project contains a preview feature - "Teams App Configuration Improvements." Turn on the preview feature to continue.", + "core.projectVersionChecker.vs.incompatibleProject": "The project contains a preview feature - \"Teams App Configuration Improvements.\" Turn on the preview feature to continue.", "core.deployArmTemplates.ActionSuccess": "ARM templates deployed successfully. Resource group name: %s. Deployment name: %s", "core.collaboration.ListCollaboratorsSuccess": "'List Microsoft 365 App owners' succeeded, you can view it in [Output panel](%s).", "core.collaboration.GrantingPermission": "Granting permission", From a46643b4ca3cb4518e5abeb5f899fec9adab3529 Mon Sep 17 00:00:00 2001 From: supkasar <157565053+supkasar@users.noreply.github.com> Date: Wed, 28 Feb 2024 12:43:11 +0530 Subject: [PATCH 3/3] Update projectMigrationV3.test.ts Unit test updated --- .../tests/core/middleware/migration/projectMigrationV3.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fx-core/tests/core/middleware/migration/projectMigrationV3.test.ts b/packages/fx-core/tests/core/middleware/migration/projectMigrationV3.test.ts index 687f8967ec..8dabbc77c5 100644 --- a/packages/fx-core/tests/core/middleware/migration/projectMigrationV3.test.ts +++ b/packages/fx-core/tests/core/middleware/migration/projectMigrationV3.test.ts @@ -552,7 +552,7 @@ describe("manifestsMigration", () => { assert.equal(error.name, errorNames.manifestTemplateNotExist); assert.equal( error.innerError.message, - "templates/appPackage/manifest.template.json does not exist. You may be trying to upgrade a project created by Teams Toolkit for Visual Studio Code v3.x / Teams Toolkit CLI v0.x / Teams Toolkit for Visual Studio v17.3. Please install Teams Toolkit for Visual Studio Code v4.x / Teams Toolkit CLI v1.x / Teams Toolkit for Visual Studio v17.4 and run upgrade first." + "templates/appPackage/manifest.template.json does not exist. You may be trying to upgrade a project created by Teams Toolkit for Visual Studio Code v3.x / Teams Toolkit CLI v0.x / Teams Toolkit for Visual Studio v17.3. Install Teams Toolkit for Visual Studio Code v4.x / Teams Toolkit CLI v1.x / Teams Toolkit for Visual Studio v17.4 and run upgrade first." ); } });