From bcb03445744831dfc82f284c47d3cc3d657abf73 Mon Sep 17 00:00:00 2001 From: MSFT-yiz Date: Wed, 20 Nov 2024 06:47:57 +0000 Subject: [PATCH 1/5] build(release): publish detail - @microsoft/teamsfx-api@0.23.4-rc-hotfix.0 - @microsoft/teamsfx-core@2.0.13-rc-hotfix.0 - @microsoft/teams-manifest@0.1.8-rc-hotfix.0 - @microsoft/teamsfx-server@2.0.12-rc-hotfix.0 - @microsoft/m365-spec-parser@0.2.4-rc-hotfix.0 - templates@4.3.2-rc-hotfix.0 --- packages/api/package.json | 2 +- packages/fx-core/package.json | 2 +- .../fx-core/src/common/templates-config.json | 4 +- packages/manifest/package.json | 2 +- packages/server/package.json | 2 +- packages/spec-parser/package.json | 2 +- .../js/command-and-response/package.json.tpl | 2 +- templates/js/dashboard-tab/package.json.tpl | 4 +- .../tab/package.json.tpl | 4 +- .../js/notification-express/package.json.tpl | 4 +- .../package.json.tpl | 4 +- .../package.json.tpl | 4 +- .../package.json.tpl | 4 +- .../js/sso-tab-with-obo-flow/api/package.json | 44 +++---- .../js/sso-tab-with-obo-flow/package.json.tpl | 114 ++++++++--------- templates/js/workflow/package.json.tpl | 2 +- templates/package.json | 2 +- .../ts/command-and-response/package.json.tpl | 2 +- templates/ts/dashboard-tab/package.json.tpl | 4 +- .../tab/package.json.tpl | 4 +- .../ts/notification-express/package.json.tpl | 4 +- .../package.json.tpl | 4 +- .../package.json.tpl | 4 +- .../package.json.tpl | 4 +- .../ts/sso-tab-with-obo-flow/api/package.json | 58 ++++----- .../ts/sso-tab-with-obo-flow/package.json.tpl | 116 +++++++++--------- templates/ts/workflow/package.json.tpl | 2 +- 27 files changed, 202 insertions(+), 202 deletions(-) diff --git a/packages/api/package.json b/packages/api/package.json index 855ca9fe3b..6967d35ec0 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/teamsfx-api", - "version": "0.23.3", + "version": "0.23.4-rc-hotfix.0", "description": "teamsfx framework api", "main": "build/index.js", "types": "build/index.d.ts", diff --git a/packages/fx-core/package.json b/packages/fx-core/package.json index a0a94c360d..11eab4510b 100644 --- a/packages/fx-core/package.json +++ b/packages/fx-core/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/teamsfx-core", - "version": "2.0.12", + "version": "2.0.13-rc-hotfix.0", "main": "build/index.js", "types": "build/index.d.ts", "license": "MIT", diff --git a/packages/fx-core/src/common/templates-config.json b/packages/fx-core/src/common/templates-config.json index ed032801c9..e556762f93 100644 --- a/packages/fx-core/src/common/templates-config.json +++ b/packages/fx-core/src/common/templates-config.json @@ -1,6 +1,6 @@ { - "version": "~4.3", - "localVersion": "4.3.1", + "version": "0.0.0-rc", + "localVersion": "4.3.2-rc-hotfix.0", "tagPrefix": "templates@", "tagListURL": "https://github.com/OfficeDev/TeamsFx/releases/download/template-tag-list/template-tags.txt", "templateDownloadBaseURL": "https://github.com/OfficeDev/TeamsFx/releases/download", diff --git a/packages/manifest/package.json b/packages/manifest/package.json index 3ac183c495..3a19c4788e 100644 --- a/packages/manifest/package.json +++ b/packages/manifest/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/teams-manifest", - "version": "0.1.7", + "version": "0.1.8-rc-hotfix.0", "main": "build/index.js", "types": "build/index.d.ts", "license": "MIT", diff --git a/packages/server/package.json b/packages/server/package.json index f20c1c4bd2..067f651967 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/teamsfx-server", - "version": "2.0.11", + "version": "2.0.12-rc-hotfix.0", "author": "Microsoft Corporation", "description": "", "license": "MIT", diff --git a/packages/spec-parser/package.json b/packages/spec-parser/package.json index 6e63079f85..f53653496e 100644 --- a/packages/spec-parser/package.json +++ b/packages/spec-parser/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/m365-spec-parser", - "version": "0.2.3", + "version": "0.2.4-rc-hotfix.0", "description": "OpenAPI specification files Parser for M365 Apps", "main": "dist/index.node.cjs.js", "browser": "dist/index.esm2017.js", diff --git a/templates/js/command-and-response/package.json.tpl b/templates/js/command-and-response/package.json.tpl index 89c7c29459..159927254c 100644 --- a/templates/js/command-and-response/package.json.tpl +++ b/templates/js/command-and-response/package.json.tpl @@ -24,7 +24,7 @@ "dependencies": { "adaptivecards-templating": "^2.3.1", "adaptive-expressions": "^4.23.1", - "@microsoft/teamsfx": "^3.0.0-alpha", + "@microsoft/teamsfx": "^3.0.0-rc", "botbuilder": "^4.23.1", "express": "^5.0.1" }, diff --git a/templates/js/dashboard-tab/package.json.tpl b/templates/js/dashboard-tab/package.json.tpl index 6c2ad8178f..cbc5d42dbe 100644 --- a/templates/js/dashboard-tab/package.json.tpl +++ b/templates/js/dashboard-tab/package.json.tpl @@ -11,8 +11,8 @@ "@fluentui/react-components": "^9.55.1", "@fluentui/react-icons": "^2.0.186", "@microsoft/teams-js": "^2.22.0", - "@microsoft/teamsfx": "^3.0.0-alpha", - "@microsoft/teamsfx-react": "^4.0.0-alpha", + "@microsoft/teamsfx": "^3.0.0-rc", + "@microsoft/teamsfx-react": "^4.0.0-rc", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.8.0" diff --git a/templates/js/non-sso-tab-default-bot/tab/package.json.tpl b/templates/js/non-sso-tab-default-bot/tab/package.json.tpl index f707dde8c3..d176fa0d14 100644 --- a/templates/js/non-sso-tab-default-bot/tab/package.json.tpl +++ b/templates/js/non-sso-tab-default-bot/tab/package.json.tpl @@ -8,8 +8,8 @@ "dependencies": { "@fluentui/react-components": "^9.55.1", "@microsoft/teams-js": "^2.22.0", - "@microsoft/teamsfx": "^3.0.0-alpha", - "@microsoft/teamsfx-react": "^4.0.0-alpha", + "@microsoft/teamsfx": "^3.0.0-rc", + "@microsoft/teamsfx-react": "^4.0.0-rc", "axios": "^0.21.1", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/templates/js/notification-express/package.json.tpl b/templates/js/notification-express/package.json.tpl index 45903cac85..d126f7425c 100644 --- a/templates/js/notification-express/package.json.tpl +++ b/templates/js/notification-express/package.json.tpl @@ -24,7 +24,7 @@ "dependencies": { "adaptivecards-templating": "^2.3.1", "adaptive-expressions": "^4.23.1", - "@microsoft/teamsfx": "^3.0.0-alpha", + "@microsoft/teamsfx": "^3.0.0-rc", "botbuilder": "^4.23.1", "express": "^5.0.1" }, @@ -32,4 +32,4 @@ "nodemon": "^3.1.7", "env-cmd": "^10.1.0" } -} +} \ No newline at end of file diff --git a/templates/js/notification-http-timer-trigger/package.json.tpl b/templates/js/notification-http-timer-trigger/package.json.tpl index 839ae8c333..208e061805 100644 --- a/templates/js/notification-http-timer-trigger/package.json.tpl +++ b/templates/js/notification-http-timer-trigger/package.json.tpl @@ -23,11 +23,11 @@ "dependencies": { "adaptivecards-templating": "^2.3.1", "adaptive-expressions": "^4.23.1", - "@microsoft/teamsfx": "^3.0.0-alpha", + "@microsoft/teamsfx": "^3.0.0-rc", "botbuilder": "^4.23.1" }, "devDependencies": { "azurite": "^3.16.0", "env-cmd": "^10.1.0" } -} +} \ No newline at end of file diff --git a/templates/js/notification-http-trigger/package.json.tpl b/templates/js/notification-http-trigger/package.json.tpl index 839ae8c333..208e061805 100644 --- a/templates/js/notification-http-trigger/package.json.tpl +++ b/templates/js/notification-http-trigger/package.json.tpl @@ -23,11 +23,11 @@ "dependencies": { "adaptivecards-templating": "^2.3.1", "adaptive-expressions": "^4.23.1", - "@microsoft/teamsfx": "^3.0.0-alpha", + "@microsoft/teamsfx": "^3.0.0-rc", "botbuilder": "^4.23.1" }, "devDependencies": { "azurite": "^3.16.0", "env-cmd": "^10.1.0" } -} +} \ No newline at end of file diff --git a/templates/js/notification-timer-trigger/package.json.tpl b/templates/js/notification-timer-trigger/package.json.tpl index 839ae8c333..208e061805 100644 --- a/templates/js/notification-timer-trigger/package.json.tpl +++ b/templates/js/notification-timer-trigger/package.json.tpl @@ -23,11 +23,11 @@ "dependencies": { "adaptivecards-templating": "^2.3.1", "adaptive-expressions": "^4.23.1", - "@microsoft/teamsfx": "^3.0.0-alpha", + "@microsoft/teamsfx": "^3.0.0-rc", "botbuilder": "^4.23.1" }, "devDependencies": { "azurite": "^3.16.0", "env-cmd": "^10.1.0" } -} +} \ No newline at end of file diff --git a/templates/js/sso-tab-with-obo-flow/api/package.json b/templates/js/sso-tab-with-obo-flow/api/package.json index 7191eabe6d..48bd9475d2 100644 --- a/templates/js/sso-tab-with-obo-flow/api/package.json +++ b/templates/js/sso-tab-with-obo-flow/api/package.json @@ -1,23 +1,23 @@ { - "name": "teamsfx-template-api", - "version": "1.0.0", - "engines": { - "node": "18 || 20" - }, - "main": "src/functions/*.js", - "scripts": { - "dev:teamsfx": "env-cmd --silent -f .localConfigs npm run dev", - "dev": "func start --javascript --language-worker=\"--inspect=9229\" --port \"7071\" --cors \"*\"", - "start": "npx func start", - "test": "echo \"Error: no test specified\" && exit 1" - }, - "dependencies": { - "@azure/functions": "^4.0.0", - "@microsoft/teamsfx": "^3.0.0-alpha", - "@microsoft/microsoft-graph-client": "^3.0.1", - "isomorphic-fetch": "^3.0.0" - }, - "devDependencies": { - "env-cmd": "^10.1.0" - } -} + "name": "teamsfx-template-api", + "version": "1.0.0", + "engines": { + "node": "18 || 20" + }, + "main": "src/functions/*.js", + "scripts": { + "dev:teamsfx": "env-cmd --silent -f .localConfigs npm run dev", + "dev": "func start --javascript --language-worker=\"--inspect=9229\" --port \"7071\" --cors \"*\"", + "start": "npx func start", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "dependencies": { + "@azure/functions": "^4.0.0", + "@microsoft/teamsfx": "^3.0.0-rc", + "@microsoft/microsoft-graph-client": "^3.0.1", + "isomorphic-fetch": "^3.0.0" + }, + "devDependencies": { + "env-cmd": "^10.1.0" + } +} \ No newline at end of file diff --git a/templates/js/sso-tab-with-obo-flow/package.json.tpl b/templates/js/sso-tab-with-obo-flow/package.json.tpl index 724aaa07f7..505cf03e29 100644 --- a/templates/js/sso-tab-with-obo-flow/package.json.tpl +++ b/templates/js/sso-tab-with-obo-flow/package.json.tpl @@ -1,58 +1,58 @@ { - "name": "{{SafeProjectNameLowerCase}}", - "version": "0.1.0", - "engines": { - "node": "18 || 20" - }, - "type": "module", - "private": true, - "dependencies": { - "@fluentui/react-components": "^9.55.1", - "@microsoft/teams-js": "^2.22.0", - "@microsoft/teamsfx": "^3.0.0-alpha", - "@microsoft/teamsfx-react": "^4.0.0-alpha", - "axios": "^0.21.1", - "react": "^18.2.0", - "react-dom": "^18.2.0", - "react-router-dom": "^6.8.0" - }, - "devDependencies": { - "@types/node": "^18.0.0", - "@types/react": "^18.0.0", - "@types/react-dom": "^18.0.0", - "@types/react-router-dom": "^5.3.3", - "concurrently": "^8.2.2", - "env-cmd": "^10.1.0", - "vite": "^5.4.2", - "@vitejs/plugin-basic-ssl": "^1.1.0", - "@vitejs/plugin-react": "^4.3.1" - }, - "scripts": { - "dev:teamsfx": "concurrently \"npm run dev-tab:teamsfx\" \"npm run dev-api:teamsfx\"", - "dev-tab:teamsfx": "env-cmd --silent -f .localConfigs npm run start", - "dev-api:teamsfx": "cd api && npm run dev:teamsfx", - "start": "vite", - "build": "vite build", - "test": "echo \"Error: no test specified\" && exit 1", - "serve": "vite preview" - }, - "eslintConfig": { - "extends": [ - "react-app", - "react-app/jest" - ] - }, - "browserslist": { - "production": [ - ">0.2%", - "not dead", - "not op_mini all" - ], - "development": [ - "last 1 chrome version", - "last 1 firefox version", - "last 1 safari version" - ] - }, - "homepage": "." -} + "name": "{{SafeProjectNameLowerCase}}", + "version": "0.1.0", + "engines": { + "node": "18 || 20" + }, + "type": "module", + "private": true, + "dependencies": { + "@fluentui/react-components": "^9.55.1", + "@microsoft/teams-js": "^2.22.0", + "@microsoft/teamsfx": "^3.0.0-rc", + "@microsoft/teamsfx-react": "^4.0.0-rc", + "axios": "^0.21.1", + "react": "^18.2.0", + "react-dom": "^18.2.0", + "react-router-dom": "^6.8.0" + }, + "devDependencies": { + "@types/node": "^18.0.0", + "@types/react": "^18.0.0", + "@types/react-dom": "^18.0.0", + "@types/react-router-dom": "^5.3.3", + "concurrently": "^8.2.2", + "env-cmd": "^10.1.0", + "vite": "^5.4.2", + "@vitejs/plugin-basic-ssl": "^1.1.0", + "@vitejs/plugin-react": "^4.3.1" + }, + "scripts": { + "dev:teamsfx": "concurrently \"npm run dev-tab:teamsfx\" \"npm run dev-api:teamsfx\"", + "dev-tab:teamsfx": "env-cmd --silent -f .localConfigs npm run start", + "dev-api:teamsfx": "cd api && npm run dev:teamsfx", + "start": "vite", + "build": "vite build", + "test": "echo \"Error: no test specified\" && exit 1", + "serve": "vite preview" + }, + "eslintConfig": { + "extends": [ + "react-app", + "react-app/jest" + ] + }, + "browserslist": { + "production": [ + ">0.2%", + "not dead", + "not op_mini all" + ], + "development": [ + "last 1 chrome version", + "last 1 firefox version", + "last 1 safari version" + ] + }, + "homepage": "." +} \ No newline at end of file diff --git a/templates/js/workflow/package.json.tpl b/templates/js/workflow/package.json.tpl index 42934c289c..b8d446d9ee 100644 --- a/templates/js/workflow/package.json.tpl +++ b/templates/js/workflow/package.json.tpl @@ -24,7 +24,7 @@ "dependencies": { "adaptivecards-templating": "^2.3.1", "adaptive-expressions": "^4.23.1", - "@microsoft/teamsfx": "^3.0.0-alpha", + "@microsoft/teamsfx": "^3.0.0-rc", "botbuilder": "^4.23.1", "express": "^5.0.1" }, diff --git a/templates/package.json b/templates/package.json index 85f1c7b376..f08e4e4cac 100644 --- a/templates/package.json +++ b/templates/package.json @@ -1,6 +1,6 @@ { "name": "templates", - "version": "4.3.1", + "version": "4.3.2-rc-hotfix.0", "private": "true", "license": "MIT", "scripts": { diff --git a/templates/ts/command-and-response/package.json.tpl b/templates/ts/command-and-response/package.json.tpl index 1a4612d74b..9aab800959 100644 --- a/templates/ts/command-and-response/package.json.tpl +++ b/templates/ts/command-and-response/package.json.tpl @@ -25,7 +25,7 @@ "dependencies": { "adaptivecards-templating": "^2.3.1", "adaptive-expressions": "^4.23.1", - "@microsoft/teamsfx": "^3.0.0-alpha", + "@microsoft/teamsfx": "^3.0.0-rc", "botbuilder": "^4.23.1", "express": "^5.0.1" }, diff --git a/templates/ts/dashboard-tab/package.json.tpl b/templates/ts/dashboard-tab/package.json.tpl index 8e0011bc3e..6cdfb532f3 100644 --- a/templates/ts/dashboard-tab/package.json.tpl +++ b/templates/ts/dashboard-tab/package.json.tpl @@ -11,8 +11,8 @@ "@fluentui/react-components": "^9.55.1", "@fluentui/react-icons": "^2.0.186", "@microsoft/teams-js": "^2.22.0", - "@microsoft/teamsfx": "^3.0.0-alpha", - "@microsoft/teamsfx-react": "^4.0.0-alpha", + "@microsoft/teamsfx": "^3.0.0-rc", + "@microsoft/teamsfx-react": "^4.0.0-rc", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.8.0" diff --git a/templates/ts/non-sso-tab-default-bot/tab/package.json.tpl b/templates/ts/non-sso-tab-default-bot/tab/package.json.tpl index cf75cad808..156468b0f9 100644 --- a/templates/ts/non-sso-tab-default-bot/tab/package.json.tpl +++ b/templates/ts/non-sso-tab-default-bot/tab/package.json.tpl @@ -8,8 +8,8 @@ "dependencies": { "@fluentui/react-components": "^9.55.1", "@microsoft/teams-js": "^2.22.0", - "@microsoft/teamsfx": "^3.0.0-alpha", - "@microsoft/teamsfx-react": "^4.0.0-alpha", + "@microsoft/teamsfx": "^3.0.0-rc", + "@microsoft/teamsfx-react": "^4.0.0-rc", "axios": "^0.21.1", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/templates/ts/notification-express/package.json.tpl b/templates/ts/notification-express/package.json.tpl index ddd96cce86..75fb48689c 100644 --- a/templates/ts/notification-express/package.json.tpl +++ b/templates/ts/notification-express/package.json.tpl @@ -25,7 +25,7 @@ "dependencies": { "adaptivecards-templating": "^2.3.1", "adaptive-expressions": "^4.23.1", - "@microsoft/teamsfx": "^3.0.0-alpha", + "@microsoft/teamsfx": "^3.0.0-rc", "botbuilder": "^4.23.1", "express": "^5.0.1" }, @@ -39,4 +39,4 @@ "typescript": "^4.4.4", "shx": "^0.3.4" } -} +} \ No newline at end of file diff --git a/templates/ts/notification-http-timer-trigger/package.json.tpl b/templates/ts/notification-http-timer-trigger/package.json.tpl index 957171e2b2..0ba77b128e 100644 --- a/templates/ts/notification-http-timer-trigger/package.json.tpl +++ b/templates/ts/notification-http-timer-trigger/package.json.tpl @@ -27,7 +27,7 @@ "dependencies": { "adaptivecards-templating": "^2.3.1", "adaptive-expressions": "^4.23.1", - "@microsoft/teamsfx": "^3.0.0-alpha", + "@microsoft/teamsfx": "^3.0.0-rc", "botbuilder": "^4.23.1" }, "devDependencies": { @@ -39,4 +39,4 @@ "typescript": "^4.4.4", "shx": "^0.3.4" } -} +} \ No newline at end of file diff --git a/templates/ts/notification-http-trigger/package.json.tpl b/templates/ts/notification-http-trigger/package.json.tpl index 957171e2b2..0ba77b128e 100644 --- a/templates/ts/notification-http-trigger/package.json.tpl +++ b/templates/ts/notification-http-trigger/package.json.tpl @@ -27,7 +27,7 @@ "dependencies": { "adaptivecards-templating": "^2.3.1", "adaptive-expressions": "^4.23.1", - "@microsoft/teamsfx": "^3.0.0-alpha", + "@microsoft/teamsfx": "^3.0.0-rc", "botbuilder": "^4.23.1" }, "devDependencies": { @@ -39,4 +39,4 @@ "typescript": "^4.4.4", "shx": "^0.3.4" } -} +} \ No newline at end of file diff --git a/templates/ts/notification-timer-trigger/package.json.tpl b/templates/ts/notification-timer-trigger/package.json.tpl index 957171e2b2..0ba77b128e 100644 --- a/templates/ts/notification-timer-trigger/package.json.tpl +++ b/templates/ts/notification-timer-trigger/package.json.tpl @@ -27,7 +27,7 @@ "dependencies": { "adaptivecards-templating": "^2.3.1", "adaptive-expressions": "^4.23.1", - "@microsoft/teamsfx": "^3.0.0-alpha", + "@microsoft/teamsfx": "^3.0.0-rc", "botbuilder": "^4.23.1" }, "devDependencies": { @@ -39,4 +39,4 @@ "typescript": "^4.4.4", "shx": "^0.3.4" } -} +} \ No newline at end of file diff --git a/templates/ts/sso-tab-with-obo-flow/api/package.json b/templates/ts/sso-tab-with-obo-flow/api/package.json index 0c57a6afba..78d68aa0ee 100644 --- a/templates/ts/sso-tab-with-obo-flow/api/package.json +++ b/templates/ts/sso-tab-with-obo-flow/api/package.json @@ -1,30 +1,30 @@ { - "name": "teamsfx-template-api", - "version": "1.0.0", - "engines": { - "node": "18 || 20" - }, - "main": "dist/src/functions/*.js", - "scripts": { - "dev:teamsfx": "env-cmd --silent -f .localConfigs npm run dev", - "dev": "func start --typescript --language-worker=\"--inspect=9229\" --port \"7071\" --cors \"*\"", - "build": "tsc", - "watch:teamsfx": "tsc -w", - "clean": "rimraf dist", - "prestart": "npm run clean && npm run build", - "start": "npx func start", - "test": "echo \"Error: no test specified\" && exit 1" - }, - "dependencies": { - "@azure/functions": "^4.0.0", - "@microsoft/teamsfx": "^3.0.0-alpha", - "@microsoft/microsoft-graph-client": "^3.0.1", - "isomorphic-fetch": "^3.0.0" - }, - "devDependencies": { - "@types/node": "^18.x", - "env-cmd": "^10.1.0", - "typescript": "^4.4.4", - "rimraf": "^5.0.0" - } -} + "name": "teamsfx-template-api", + "version": "1.0.0", + "engines": { + "node": "18 || 20" + }, + "main": "dist/src/functions/*.js", + "scripts": { + "dev:teamsfx": "env-cmd --silent -f .localConfigs npm run dev", + "dev": "func start --typescript --language-worker=\"--inspect=9229\" --port \"7071\" --cors \"*\"", + "build": "tsc", + "watch:teamsfx": "tsc -w", + "clean": "rimraf dist", + "prestart": "npm run clean && npm run build", + "start": "npx func start", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "dependencies": { + "@azure/functions": "^4.0.0", + "@microsoft/teamsfx": "^3.0.0-rc", + "@microsoft/microsoft-graph-client": "^3.0.1", + "isomorphic-fetch": "^3.0.0" + }, + "devDependencies": { + "@types/node": "^18.x", + "env-cmd": "^10.1.0", + "typescript": "^4.4.4", + "rimraf": "^5.0.0" + } +} \ No newline at end of file diff --git a/templates/ts/sso-tab-with-obo-flow/package.json.tpl b/templates/ts/sso-tab-with-obo-flow/package.json.tpl index 057ccdc5b3..9ad88d941a 100644 --- a/templates/ts/sso-tab-with-obo-flow/package.json.tpl +++ b/templates/ts/sso-tab-with-obo-flow/package.json.tpl @@ -1,59 +1,59 @@ { - "name": "{{SafeProjectNameLowerCase}}", - "version": "0.1.0", - "engines": { - "node": "18 || 20" - }, - "type": "module", - "private": true, - "dependencies": { - "@fluentui/react-components": "^9.55.1", - "@microsoft/teams-js": "^2.22.0", - "@microsoft/teamsfx": "^3.0.0-alpha", - "@microsoft/teamsfx-react": "^4.0.0-alpha", - "axios": "^0.21.1", - "react": "^18.2.0", - "react-dom": "^18.2.0", - "react-router-dom": "^6.8.0" - }, - "devDependencies": { - "@types/node": "^18.0.0", - "@types/react": "^18.0.0", - "@types/react-dom": "^18.0.0", - "@types/react-router-dom": "^5.3.3", - "concurrently": "^8.2.2", - "env-cmd": "^10.1.0", - "typescript": "^4.1.2", - "vite": "^5.4.2", - "@vitejs/plugin-basic-ssl": "^1.1.0", - "@vitejs/plugin-react": "^4.3.1" - }, - "scripts": { - "dev:teamsfx": "concurrently \"npm run dev-tab:teamsfx\" \"npm run dev-api:teamsfx\"", - "dev-tab:teamsfx": "env-cmd --silent -f .localConfigs npm run start", - "dev-api:teamsfx": "cd api && npm run dev:teamsfx", - "start": "vite", - "build": "tsc && vite build", - "test": "echo \"Error: no test specified\" && exit 1", - "serve": "vite preview" - }, - "eslintConfig": { - "extends": [ - "react-app", - "react-app/jest" - ] - }, - "browserslist": { - "production": [ - ">0.2%", - "not dead", - "not op_mini all" - ], - "development": [ - "last 1 chrome version", - "last 1 firefox version", - "last 1 safari version" - ] - }, - "homepage": "." -} + "name": "{{SafeProjectNameLowerCase}}", + "version": "0.1.0", + "engines": { + "node": "18 || 20" + }, + "type": "module", + "private": true, + "dependencies": { + "@fluentui/react-components": "^9.55.1", + "@microsoft/teams-js": "^2.22.0", + "@microsoft/teamsfx": "^3.0.0-rc", + "@microsoft/teamsfx-react": "^4.0.0-rc", + "axios": "^0.21.1", + "react": "^18.2.0", + "react-dom": "^18.2.0", + "react-router-dom": "^6.8.0" + }, + "devDependencies": { + "@types/node": "^18.0.0", + "@types/react": "^18.0.0", + "@types/react-dom": "^18.0.0", + "@types/react-router-dom": "^5.3.3", + "concurrently": "^8.2.2", + "env-cmd": "^10.1.0", + "typescript": "^4.1.2", + "vite": "^5.4.2", + "@vitejs/plugin-basic-ssl": "^1.1.0", + "@vitejs/plugin-react": "^4.3.1" + }, + "scripts": { + "dev:teamsfx": "concurrently \"npm run dev-tab:teamsfx\" \"npm run dev-api:teamsfx\"", + "dev-tab:teamsfx": "env-cmd --silent -f .localConfigs npm run start", + "dev-api:teamsfx": "cd api && npm run dev:teamsfx", + "start": "vite", + "build": "tsc && vite build", + "test": "echo \"Error: no test specified\" && exit 1", + "serve": "vite preview" + }, + "eslintConfig": { + "extends": [ + "react-app", + "react-app/jest" + ] + }, + "browserslist": { + "production": [ + ">0.2%", + "not dead", + "not op_mini all" + ], + "development": [ + "last 1 chrome version", + "last 1 firefox version", + "last 1 safari version" + ] + }, + "homepage": "." +} \ No newline at end of file diff --git a/templates/ts/workflow/package.json.tpl b/templates/ts/workflow/package.json.tpl index 495b58b3fe..1c1455f6e7 100644 --- a/templates/ts/workflow/package.json.tpl +++ b/templates/ts/workflow/package.json.tpl @@ -25,7 +25,7 @@ "dependencies": { "adaptivecards-templating": "^2.3.1", "adaptive-expressions": "^4.23.1", - "@microsoft/teamsfx": "^3.0.0-alpha", + "@microsoft/teamsfx": "^3.0.0-rc", "botbuilder": "^4.23.1", "express": "^5.0.1" }, From 3077006b27f13f25ebc8c69a8f0f2f98a46b0535 Mon Sep 17 00:00:00 2001 From: swatDong Date: Mon, 25 Nov 2024 15:17:41 +0800 Subject: [PATCH 2/5] fix: upgrade func sdk version --- .../notification-http-timer-trigger/{{ProjectName}}.csproj.tpl | 2 +- .../csharp/notification-http-trigger/{{ProjectName}}.csproj.tpl | 2 +- .../notification-timer-trigger/{{ProjectName}}.csproj.tpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/csharp/notification-http-timer-trigger/{{ProjectName}}.csproj.tpl b/templates/csharp/notification-http-timer-trigger/{{ProjectName}}.csproj.tpl index 064f882b97..780ba8f5c2 100644 --- a/templates/csharp/notification-http-timer-trigger/{{ProjectName}}.csproj.tpl +++ b/templates/csharp/notification-http-timer-trigger/{{ProjectName}}.csproj.tpl @@ -30,7 +30,7 @@ - + diff --git a/templates/csharp/notification-http-trigger/{{ProjectName}}.csproj.tpl b/templates/csharp/notification-http-trigger/{{ProjectName}}.csproj.tpl index 064f882b97..780ba8f5c2 100644 --- a/templates/csharp/notification-http-trigger/{{ProjectName}}.csproj.tpl +++ b/templates/csharp/notification-http-trigger/{{ProjectName}}.csproj.tpl @@ -30,7 +30,7 @@ - + diff --git a/templates/csharp/notification-timer-trigger/{{ProjectName}}.csproj.tpl b/templates/csharp/notification-timer-trigger/{{ProjectName}}.csproj.tpl index 064f882b97..780ba8f5c2 100644 --- a/templates/csharp/notification-timer-trigger/{{ProjectName}}.csproj.tpl +++ b/templates/csharp/notification-timer-trigger/{{ProjectName}}.csproj.tpl @@ -30,7 +30,7 @@ - + From 06965b6cbca60cf82031f2894df1473d8f2dff8f Mon Sep 17 00:00:00 2001 From: MSFT-yiz Date: Mon, 25 Nov 2024 07:36:34 +0000 Subject: [PATCH 3/5] build(release): publish detail - templates@4.3.2-rc-hotfix.1 --- packages/fx-core/src/common/templates-config.json | 2 +- templates/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fx-core/src/common/templates-config.json b/packages/fx-core/src/common/templates-config.json index e556762f93..be9c2fcd80 100644 --- a/packages/fx-core/src/common/templates-config.json +++ b/packages/fx-core/src/common/templates-config.json @@ -1,6 +1,6 @@ { "version": "0.0.0-rc", - "localVersion": "4.3.2-rc-hotfix.0", + "localVersion": "4.3.2-rc-hotfix.1", "tagPrefix": "templates@", "tagListURL": "https://github.com/OfficeDev/TeamsFx/releases/download/template-tag-list/template-tags.txt", "templateDownloadBaseURL": "https://github.com/OfficeDev/TeamsFx/releases/download", diff --git a/templates/package.json b/templates/package.json index f08e4e4cac..b11aef374d 100644 --- a/templates/package.json +++ b/templates/package.json @@ -1,6 +1,6 @@ { "name": "templates", - "version": "4.3.2-rc-hotfix.0", + "version": "4.3.2-rc-hotfix.1", "private": "true", "license": "MIT", "scripts": { From e581fa93b6bb51b34b6341b2357665b72af083a3 Mon Sep 17 00:00:00 2001 From: wenyutang Date: Mon, 25 Nov 2024 16:32:44 +0800 Subject: [PATCH 4/5] ci: update the cd policy for release to beta pkg --- .github/workflows/cd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 40e6ee7bca..d6d2923cb6 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -46,7 +46,7 @@ jobs: exit 1 - name: Validate inputs for release - if: ${{ github.event_name == 'workflow_dispatch' && startsWith(github.ref, 'refs/heads/release/') && (github.event.inputs.preid != 'stable' && github.event.inputs.preid != 'rc')}} + if: ${{ github.event_name == 'workflow_dispatch' && startsWith(github.ref, 'refs/heads/release/')}} run: | echo It's only allowed to release stable on release branch exit 1 @@ -104,7 +104,7 @@ jobs: npx lerna version prerelease --preid=alpha.$(git rev-parse --short HEAD) --exact --no-push --allow-branch dev --yes - name: release beta packages to npmjs.org - if: ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/hotfix/')) && github.event_name == 'workflow_dispatch' && github.event.inputs.preid == 'beta' }} + if: ${{ github.ref != 'refs/heads/dev' && github.event_name == 'workflow_dispatch' && github.event.inputs.preid == 'beta' }} run: | npx lerna version prerelease --preid=beta.$(date "+%Y%m%d%H") --exact --no-push --allow-branch ${GITHUB_REF#refs/*/} --yes From cb1fdb13b09164cb31bec0222e957a9da406b11a Mon Sep 17 00:00:00 2001 From: wenyutang Date: Mon, 25 Nov 2024 19:03:50 +0800 Subject: [PATCH 5/5] ci: update cd pipeline --- .github/workflows/cd.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index d6d2923cb6..b174ee8cb5 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -45,12 +45,6 @@ jobs: echo It's only allowed to release RC and stable on main branch. exit 1 - - name: Validate inputs for release - if: ${{ github.event_name == 'workflow_dispatch' && startsWith(github.ref, 'refs/heads/release/')}} - run: | - echo It's only allowed to release stable on release branch - exit 1 - - name: Valiadte inputs for dev if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/dev' && github.event.inputs.preid != 'alpha' }} run: |