Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: hotfix/5.8.2 #12478

Closed
wants to merge 20 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/teamsapp-cli",
"version": "3.0.2",
"version": "3.0.3",
"author": "Microsoft Corporation",
"description": "",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/fx-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/teamsfx-core",
"version": "2.0.9",
"version": "2.0.10",
"main": "build/index.js",
"types": "build/index.d.ts",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/fx-core/src/common/templates-config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "~4.2",
"localVersion": "4.2.3",
"localVersion": "4.2.4",
"tagPrefix": "templates@",
"tagListURL": "https://github.com/OfficeDev/TeamsFx/releases/download/template-tag-list/template-tags.txt",
"templateDownloadBaseURL": "https://github.com/OfficeDev/TeamsFx/releases/download",
Expand Down
2 changes: 1 addition & 1 deletion packages/fx-core/src/component/configManager/parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function parseRawProjectModel(obj: Record<string, unknown>): Result<RawProjectMo
if (typeof obj[environmentFolderPath] !== "string") {
return err(new YamlFieldTypeError("environmentFolderPath", "string"));
}
result.environmentFolderPath = obj[environmentFolderPath] as string;
result.environmentFolderPath = obj[environmentFolderPath];
}

if ("version" in obj) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,6 @@ export namespace AppStudioClient {
const apiPath = "/api/usersettings/mtUserAppPolicy";
const instance = axios.create({
baseURL: region ?? getAppStudioEndpoint(),
timeout: 30000,
});
instance.defaults.headers.common["Authorization"] = `Bearer ${appStudioToken}`;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

import fs from "fs-extra";
import * as path from "path";
import * as os from "os";
import {
ConfigFolderName,
Context,
Expand All @@ -15,14 +12,17 @@ import {
SystemError,
UserError,
} from "@microsoft/teamsfx-api";
import { DependencyChecker } from "./dependencyChecker";
import fs from "fs-extra";
import * as os from "os";
import * as path from "path";
import { NpmInstallError } from "../../../../error";
import { cpUtils } from "../../../deps-checker/util/cpUtils";
import { DependencyValidateError } from "../error";
import { Constants } from "../utils/constants";
import { telemetryHelper } from "../utils/telemetry-helper";
import { TelemetryEvents, TelemetryProperty } from "../utils/telemetryEvents";
import { DependencyValidateError } from "../error";
import { cpUtils } from "../../../deps-checker/util/cpUtils";
import { getExecCommand, getShellOptionValue, Utils } from "../utils/utils";
import { Constants } from "../utils/constants";
import { NpmInstallError } from "../../../../error";
import { DependencyChecker } from "./dependencyChecker";

const name = Constants.YeomanPackageName;
const displayName = `${name}`;
Expand Down
10 changes: 5 additions & 5 deletions packages/fx-core/src/component/generator/spfx/utils/utils.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.
import lodash from "lodash";
import * as fs from "fs-extra";
import { glob } from "glob";
import { exec, execSync } from "child_process";
import { LogProvider } from "@microsoft/teamsfx-api";
import axios, { AxiosInstance } from "axios";
import { cpUtils, DebugLogger } from "../../../deps-checker/util/cpUtils";
import { exec, execSync } from "child_process";
import * as fs from "fs-extra";
import { glob } from "glob";
import lodash from "lodash";
import os from "os";
import { cpUtils, DebugLogger } from "../../../deps-checker/util/cpUtils";
import { Constants } from "./constants";

export class Utils {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import fs, { CopyOptions, EnsureOptions, PathLike, WriteFileOptions } from "fs-e
import path from "path";
import { MetadataV2 } from "../../../common/versionMetadata";
import { CoreHookContext } from "../../types";
import { getParameterFromCxt } from "./v3MigrationUtils";
import { Inputs } from "@microsoft/teamsfx-api";

export const backupFolder = ".backup";
export interface MigrationContext extends CoreHookContext {
Expand Down Expand Up @@ -129,3 +129,9 @@ export class MigrationContext {
this.telemetryProperties = { ...properties, ...this.telemetryProperties };
}
}

function getParameterFromCxt(ctx: CoreHookContext, key: string, defaultValue?: string): string {
const inputs = ctx.arguments[ctx.arguments.length - 1] as Inputs;
const value = (inputs[key] as string) || defaultValue || "";
return value;
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import * as chai from "chai";
import fs from "fs-extra";
import "mocha";
import mockedEnv, { RestoreFn } from "mocked-env";
import os from "os";
import * as path from "path";
import * as sinon from "sinon";
import * as uuid from "uuid";
Expand All @@ -31,7 +32,6 @@ import {
SPFxVersionOptionIds,
} from "../../../src/question";
import { MockTools } from "../../core/utils";
import os from "os";

describe("SPFxGenerator", function () {
const testFolder = path.resolve("./tmp");
Expand Down
2 changes: 1 addition & 1 deletion packages/server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/teamsfx-server",
"version": "2.0.8",
"version": "2.0.9",
"author": "Microsoft Corporation",
"description": "",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/tests/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/teamsfx-test",
"version": "0.0.6",
"version": "0.0.7",
"description": "A UI Test Project of Teams Toolkit Extension",
"private": true,
"author": "Microsoft Corporation",
Expand Down
8 changes: 8 additions & 0 deletions packages/vscode-extension/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

> Note: This changelog only includes the changes for the stable versions of Teams Toolkit. For the changelog of pre-released versions, please refer to the [Teams Toolkit Pre-release Changelog](https://github.com/OfficeDev/TeamsFx/blob/dev/packages/vscode-extension/PRERELEASE.md).

## 5.8.2 - Sep 26, 2024

Hotfix version.

- Fixed an issue ([#12143](https://github.com/OfficeDev/teams-toolkit/issues/12143)) where users may encounter an error (`SPFx.LatestPackageInstallFailed`) when creating a Tab with SPFx project.
- Resolved an issue ([#12384](https://github.com/OfficeDev/teams-toolkit/issues/12384)) where users may encounter an error (`AppStudioPlugin.TeamsAppCreateConflict`) during local debugging.
- Updated TypeScript from `4.4.4` to `5.5.4` to avoid build failures for `Custom Engine Agent` templates in [#12462](https://github.com/OfficeDev/teams-toolkit/pull/12462).

## 5.8.1 - May 27, 2024

Hotfix version.
Expand Down
2 changes: 1 addition & 1 deletion packages/vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "ms-teams-vscode-extension",
"displayName": "Teams Toolkit",
"description": "Create, debug, and deploy Teams apps with Teams Toolkit",
"version": "5.8.1",
"version": "5.8.2",
"publisher": "TeamsDevApp",
"author": "Microsoft Corporation",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion templates/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "templates",
"version": "4.2.3",
"version": "4.2.4",
"private": "true",
"license": "MIT",
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@types/node": "^18.0.0",
"env-cmd": "^10.1.0",
"ts-node": "^10.4.0",
"typescript": "^4.4.4",
"typescript": "^5.5.4",
"nodemon": "^2.0.7",
"shx": "^0.3.3"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@types/node": "^18.0.0",
"env-cmd": "^10.1.0",
"ts-node": "^10.4.0",
"typescript": "^4.4.4",
"typescript": "^5.5.4",
"nodemon": "^2.0.7",
"shx": "^0.3.3"
}
Expand Down
2 changes: 1 addition & 1 deletion templates/ts/custom-copilot-basic/package.json.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@types/node": "^18.0.0",
"env-cmd": "^10.1.0",
"ts-node": "^10.4.0",
"typescript": "^4.4.4",
"typescript": "^5.5.4",
"nodemon": "^2.0.7",
"shx": "^0.3.3"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
},
"devDependencies": {
"@types/restify": "^8.5.5",
"@types/node": "^14.0.0",
"@types/node": "^18.0.0",
"env-cmd": "^10.1.0",
"ts-node": "^10.4.0",
"typescript": "^4.4.4",
"typescript": "^5.5.4",
"nodemon": "^2.0.7",
"shx": "^0.3.3"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@types/node": "^18.0.0",
"env-cmd": "^10.1.0",
"ts-node": "^10.4.0",
"typescript": "^4.4.4",
"typescript": "^5.5.4",
"nodemon": "^2.0.7",
"shx": "^0.3.3"
}
Expand Down
4 changes: 2 additions & 2 deletions templates/ts/custom-copilot-rag-customize/package.json.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
},
"devDependencies": {
"@types/restify": "^8.5.5",
"@types/node": "^14.0.0",
"@types/node": "^18.0.0",
"env-cmd": "^10.1.0",
"ts-node": "^10.4.0",
"typescript": "^4.4.4",
"typescript": "^5.5.4",
"nodemon": "^2.0.7",
"shx": "^0.3.3"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
},
"devDependencies": {
"@types/restify": "^8.5.5",
"@types/node": "^16.0.0",
"@types/node": "^18.0.0",
"env-cmd": "^10.1.0",
"ts-node": "^10.4.0",
"typescript": "^4.4.4",
"typescript": "^5.5.4",
"nodemon": "^2.0.7",
"shx": "^0.3.3"
}
Expand Down
Loading