Merge pull request #12788 from OfficeDev/release/VS17.13P2

build: merge back to dev after vs17.13P2 release
OfficeDev · Nov 26, 2024 · a2c09e8 · a2c09e8
2 parents ec0d089 + 273a414
commit a2c09e8
Show file tree

Hide file tree

Showing 31 changed files with 206 additions and 212 deletions.
diff --git 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/') && (github.event.inputs.preid != 'stable' && github.event.inputs.preid != 'rc')}}
-        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: |
@@ -104,7 +98,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
 

diff --git 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
@@ -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
@@ -1,6 +1,6 @@
 {
-    "version": "~4.3",
-    "localVersion": "4.3.1",
+    "version": "0.0.0-rc",
+    "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/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
@@ -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
@@ -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/csharp/notification-http-timer-trigger/{{ProjectName}}.csproj.tpl b/templates/csharp/notification-http-timer-trigger/{{ProjectName}}.csproj.tpl
@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.7" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.5.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.33" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.36.0" />
     <PackageReference Include="Microsoft.TeamsFx" Version="2.5.*">

diff --git a/templates/csharp/notification-http-trigger/{{ProjectName}}.csproj.tpl b/templates/csharp/notification-http-trigger/{{ProjectName}}.csproj.tpl
@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.7" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.5.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.33" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.36.0" />
     <PackageReference Include="Microsoft.TeamsFx" Version="2.5.*">

diff --git a/templates/csharp/notification-timer-trigger/{{ProjectName}}.csproj.tpl b/templates/csharp/notification-timer-trigger/{{ProjectName}}.csproj.tpl
@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.7" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.5.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.33" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.36.0" />
     <PackageReference Include="Microsoft.TeamsFx" Version="2.5.*">

diff --git 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
@@ -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
@@ -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
@@ -24,12 +24,12 @@
     "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"
     },
     "devDependencies": {
         "nodemon": "^3.1.7",
         "env-cmd": "^10.1.0"
     }
-}
+}
diff --git 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"
     }
-}
+}
diff --git 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"
     }
-}
+}
diff --git 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"
     }
-}
+}
diff --git 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"
+    }
+}
diff --git 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": "."
+}
diff --git 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
@@ -1,6 +1,6 @@
 {
     "name": "templates",
-    "version": "4.3.1",
+    "version": "4.3.2-rc-hotfix.1",
     "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
@@ -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
@@ -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"