Merge pull request #902 from andrewconnell/fy23q4-refresh-msteams-mes…

…saging-extensions FY23Q4 refresh - msteams-messaging-extensions
OfficeDev · Jun 19, 2023 · 30c48b2 · 30c48b2
2 parents 89b85de + 320ee10
commit 30c48b2
Show file tree

Hide file tree

Showing 92 changed files with 4,302 additions and 3,585 deletions.
diff --git a/...ons/Demos/01-msteams-msgext/.eslintignore → ...mos/01-learn-msteams-msgext/.eslintignore b/...ons/Demos/01-msteams-msgext/.eslintignore → ...mos/01-learn-msteams-msgext/.eslintignore
diff --git a/...ns/Demos/01-msteams-msgext/.eslintrc.json → ...os/01-learn-msteams-msgext/.eslintrc.json b/...ns/Demos/01-msteams-msgext/.eslintrc.json → ...os/01-learn-msteams-msgext/.eslintrc.json
diff --git a/...nsions/Demos/01-msteams-msgext/.gitignore → .../Demos/01-learn-msteams-msgext/.gitignore b/...nsions/Demos/01-msteams-msgext/.gitignore → .../Demos/01-learn-msteams-msgext/.gitignore
diff --git a/...sions/Demos/02-msteams-msgext/.yo-rc.json → ...Demos/01-learn-msteams-msgext/.yo-rc.json b/...sions/Demos/02-msteams-msgext/.yo-rc.json → ...Demos/01-learn-msteams-msgext/.yo-rc.json
@@ -4,6 +4,6 @@
       "developer": "Contoso"
     },
     "libraryName": "messagingExt",
-    "generator-version": "4.0.1"
+    "generator-version": "4.1.0"
   }
 }
diff --git a/...nsions/Demos/01-msteams-msgext/Dockerfile → .../Demos/01-learn-msteams-msgext/Dockerfile b/...nsions/Demos/01-msteams-msgext/Dockerfile → .../Demos/01-learn-msteams-msgext/Dockerfile
diff --git a/...ensions/Demos/01-msteams-msgext/README.md → ...s/Demos/01-learn-msteams-msgext/README.md b/...ensions/Demos/01-msteams-msgext/README.md → ...s/Demos/01-learn-msteams-msgext/README.md
diff --git a/...sions/Demos/01-msteams-msgext/gulpfile.js → ...Demos/01-learn-msteams-msgext/gulpfile.js b/...sions/Demos/01-msteams-msgext/gulpfile.js → ...Demos/01-learn-msteams-msgext/gulpfile.js
diff --git a/...Demos/02-msteams-msgext/package-lock.json → ...01-learn-msteams-msgext/package-lock.json b/...Demos/02-msteams-msgext/package-lock.json → ...01-learn-msteams-msgext/package-lock.json
diff --git a/...ions/Demos/01-msteams-msgext/package.json → ...emos/01-learn-msteams-msgext/package.json b/...ions/Demos/01-msteams-msgext/package.json → ...emos/01-learn-msteams-msgext/package.json
@@ -55,8 +55,8 @@
     "webpack": "^5.72.0",
     "webpack-node-externals": "^3.0.0",
     "yargs": "^17.5.1",
-    "yoteams-build-core": "^1.7.0",
-    "yoteams-deploy": "^1.2.0"
+    "yoteams-build-core": "^1.8.0",
+    "yoteams-deploy": "^1.4.0"
   },
   "browserslist": [
     "> 1%",

diff --git a/...-msteams-msgext/src/client/.eslintrc.json → ...-msteams-msgext/src/client/.eslintrc.json b/...-msteams-msgext/src/client/.eslintrc.json → ...-msteams-msgext/src/client/.eslintrc.json
diff --git a/...os/01-msteams-msgext/src/client/client.ts → ...learn-msteams-msgext/src/client/client.ts b/...os/01-msteams-msgext/src/client/client.ts → ...learn-msteams-msgext/src/client/client.ts
diff --git a/...1-msteams-msgext/src/client/tsconfig.json → ...n-msteams-msgext/src/client/tsconfig.json b/...1-msteams-msgext/src/client/tsconfig.json → ...n-msteams-msgext/src/client/tsconfig.json
diff --git a/...steams-msgext/src/manifest/icon-color.png → ...steams-msgext/src/manifest/icon-color.png b/...steams-msgext/src/manifest/icon-color.png → ...steams-msgext/src/manifest/icon-color.png
diff --git a/...eams-msgext/src/manifest/icon-outline.png → ...eams-msgext/src/manifest/icon-outline.png b/...eams-msgext/src/manifest/icon-outline.png → ...eams-msgext/src/manifest/icon-outline.png
diff --git a/...msteams-msgext/src/manifest/manifest.json → ...msteams-msgext/src/manifest/manifest.json b/...msteams-msgext/src/manifest/manifest.json → ...msteams-msgext/src/manifest/manifest.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.13/MicrosoftTeams.schema.json",
-  "manifestVersion": "1.13",
+  "$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.15/MicrosoftTeams.schema.json",
+  "manifestVersion": "1.15",
   "id": "{{APPLICATION_ID}}",
   "version": "{{VERSION}}",
   "packageName": "{{PACKAGE_NAME}}",
@@ -29,7 +29,7 @@
   "connectors": [],
   "composeExtensions": [
     {
-      "botId": "{{APPLICATION_ID}}",
+      "botId": "{{MICROSOFT_APP_ID}}",
       "canUpdateConfiguration": false,
       "commands": [
         {

diff --git a/...msteams-msgext/src/public/assets/icon.png → ...msteams-msgext/src/public/assets/icon.png b/...msteams-msgext/src/public/assets/icon.png → ...msteams-msgext/src/public/assets/icon.png
diff --git a/...s/01-msteams-msgext/src/public/index.html → ...earn-msteams-msgext/src/public/index.html b/...s/01-msteams-msgext/src/public/index.html → ...earn-msteams-msgext/src/public/index.html
diff --git a/...01-msteams-msgext/src/public/privacy.html → ...rn-msteams-msgext/src/public/privacy.html b/...01-msteams-msgext/src/public/privacy.html → ...rn-msteams-msgext/src/public/privacy.html
diff --git a/...steams-msgext/src/public/styles/main.scss → ...steams-msgext/src/public/styles/main.scss b/...steams-msgext/src/public/styles/main.scss → ...steams-msgext/src/public/styles/main.scss
diff --git a/...mos/01-msteams-msgext/src/public/tou.html → ...-learn-msteams-msgext/src/public/tou.html b/...mos/01-msteams-msgext/src/public/tou.html → ...-learn-msteams-msgext/src/public/tou.html
diff --git a/...-msteams-msgext/src/server/.eslintrc.json → ...-msteams-msgext/src/server/.eslintrc.json b/...-msteams-msgext/src/server/.eslintrc.json → ...-msteams-msgext/src/server/.eslintrc.json
diff --git a/...-msgext/src/server/TeamsAppsComponents.ts → ...-msgext/src/server/TeamsAppsComponents.ts b/...-msgext/src/server/TeamsAppsComponents.ts → ...-msgext/src/server/TeamsAppsComponents.ts
diff --git a/...-msgext/src/server/planetBot/planetBot.ts → ...-msgext/src/server/planetBot/planetBot.ts b/...-msgext/src/server/planetBot/planetBot.ts → ...-msgext/src/server/planetBot/planetBot.ts
@@ -7,6 +7,7 @@ import {
 
 import * as Util from "util";
 import * as debug from "debug";
+
 import { find, sortBy } from "lodash";
 
 const TextEncoder = Util.TextEncoder;
@@ -88,4 +89,5 @@ export class PlanetBot extends TeamsActivityHandler {
     // return the adaptive card
     return CardFactory.adaptiveCard(adaptiveCardSource);
   }
+
 }
diff --git a/...c/server/planetBot/planetDisplayCard.json → ...c/server/planetBot/planetDisplayCard.json b/...c/server/planetBot/planetDisplayCard.json → ...c/server/planetBot/planetDisplayCard.json
diff --git a/.../server/planetBot/planetSelectorCard.json → .../server/planetBot/planetSelectorCard.json b/.../server/planetBot/planetSelectorCard.json → .../server/planetBot/planetSelectorCard.json
diff --git a/...-msgext/src/server/planetBot/planets.json → ...-msgext/src/server/planetBot/planets.json b/...-msgext/src/server/planetBot/planets.json → ...-msgext/src/server/planetBot/planets.json
diff --git a/...os/01-msteams-msgext/src/server/server.ts → ...learn-msteams-msgext/src/server/server.ts b/...os/01-msteams-msgext/src/server/server.ts → ...learn-msteams-msgext/src/server/server.ts
diff --git a/...1-msteams-msgext/src/server/tsconfig.json → ...n-msteams-msgext/src/server/tsconfig.json b/...1-msteams-msgext/src/server/tsconfig.json → ...n-msteams-msgext/src/server/tsconfig.json
diff --git a/...Demos/01-msteams-msgext/webpack.config.js → ...01-learn-msteams-msgext/webpack.config.js b/...Demos/01-msteams-msgext/webpack.config.js → ...01-learn-msteams-msgext/webpack.config.js
diff --git a/Teams/20 Messaging Extensions/Demos/01-msteams-msgext/.env.example b/Teams/20 Messaging Extensions/Demos/01-msteams-msgext/.env.example
diff --git a/...ons/Demos/02-msteams-msgext/.eslintignore → ...mos/02-learn-msteams-msgext/.eslintignore b/...ons/Demos/02-msteams-msgext/.eslintignore → ...mos/02-learn-msteams-msgext/.eslintignore
diff --git a/...ns/Demos/02-msteams-msgext/.eslintrc.json → ...os/02-learn-msteams-msgext/.eslintrc.json b/...ns/Demos/02-msteams-msgext/.eslintrc.json → ...os/02-learn-msteams-msgext/.eslintrc.json
diff --git a/...nsions/Demos/02-msteams-msgext/.gitignore → .../Demos/02-learn-msteams-msgext/.gitignore b/...nsions/Demos/02-msteams-msgext/.gitignore → .../Demos/02-learn-msteams-msgext/.gitignore
diff --git a/...sions/Demos/01-msteams-msgext/.yo-rc.json → ...Demos/02-learn-msteams-msgext/.yo-rc.json b/...sions/Demos/01-msteams-msgext/.yo-rc.json → ...Demos/02-learn-msteams-msgext/.yo-rc.json
@@ -4,6 +4,6 @@
       "developer": "Contoso"
     },
     "libraryName": "messagingExt",
-    "generator-version": "4.0.1"
+    "generator-version": "4.1.0"
   }
 }
diff --git a/...nsions/Demos/02-msteams-msgext/Dockerfile → .../Demos/02-learn-msteams-msgext/Dockerfile b/...nsions/Demos/02-msteams-msgext/Dockerfile → .../Demos/02-learn-msteams-msgext/Dockerfile
diff --git a/...ensions/Demos/02-msteams-msgext/README.md → ...s/Demos/02-learn-msteams-msgext/README.md b/...ensions/Demos/02-msteams-msgext/README.md → ...s/Demos/02-learn-msteams-msgext/README.md
diff --git a/...sions/Demos/02-msteams-msgext/gulpfile.js → ...Demos/02-learn-msteams-msgext/gulpfile.js b/...sions/Demos/02-msteams-msgext/gulpfile.js → ...Demos/02-learn-msteams-msgext/gulpfile.js