Merge pull request #944 from OfficeDev/dev

build(release): merge dev into v3 branch

.config/samples-config-v3.json

@@ -247,10 +247,7 @@
             ],
             "time": "5min to run",
             "configuration": "Manual configurations required",
-            "suggested": false,
-            "url": "https://github.com/OfficeDev/teams-chef-sample/tree/main/teams-chef-bot",
-            "packageLink": "https://github.com/OfficeDev/teams-chef-sample/archive/refs/heads/main.zip",
-            "relativePath": "teams-chef-sample-main/teams-chef-bot"
+            "suggested": false
         }
     ]
 }

.github/CODEOWNERS

@@ -22,7 +22,7 @@
 /hello-world-bot-with-tab @eriolchan @hund030
 /hello-world-in-meeting @eriolchan @JerryYangKai
 /hello-world-tab-codespaces @kimizhu @dooriya @qinezh
-/hello-world-tab-with-backend @eriolchan @hund030
+/hello-world-tab-with-backend @adashen @SLdragon @KennethBWSong
 /hello-world-teams-tab-and-outlook-add-in @MSFT-yiz @1yefuwang1 @HuihuiWu-Microsoft
 /incoming-webhook-notification @kimizhu @dooriya @swatDong @XiaofuHuang
 /notification-codespaces @kimizhu @dooriya @qinezh
@@ -35,4 +35,6 @@
 /todo-list-with-Azure-backend @adashen @formulahendry
 /todo-list-with-Azure-backend-M365 @kimizhu @swatDong @kuojianlu
 /developer-assist-dashboard @eriolchan @huimiu @hund030 @JerryYangKai
+/whos-next-meeting-app @MSFT-yiz @HuihuiWu-Microsoft
+/teams-chef-bot @MSFT-yiz @HuihuiWu-Microsoft
 /.github/workflows/cd.yml @adashen @LongOddCode @Siglud @qinezh @wenytang-ms

NPM-search-connector-M365/.webappignore

@@ -17,12 +17,10 @@ tsconfig.json
 teamsapp.yml
 teamsapp.*.yml
 /env/
-/script/
 /node_modules/.bin
 /node_modules/ts-node
 /node_modules/typescript
 /appPackage/
 /infra/
-/teamsfx/
 /images/
 cli.md

NPM-search-connector-M365/cli.md

@@ -7,12 +7,15 @@
     ```
     teamsfx new template npm-search-connector-m365
     ```
-1. For local env, install [ngrok](https://ngrok.com/download) and start your local tunnel service by running the command `ngrok http 3978`.
-1. For local env, fill in the values for `BOT_DOMAIN` and `BOT_ENDPOINT` with your ngrok URL in the `env/.env.local` file.
-   ```
-   BOT_DOMAIN=sample-id.ngrok.io
-   BOT_ENDPOINT=https://sample-id.ngrok.io
-   ```
+1. For local env, start your local tunnel service.
+    1. Install [dev tunnel cli](https://aka.ms/teamsfx-install-dev-tunnel).
+    1. Login with your M365 Account using the command `devtunnel user login`.
+    1. Start your local tunnel service by running the command `devtunnel host -p 3978 --protocol http --allow-anonymous`.
+    1. In the `env/.env.local` file, fill in the values for `BOT_DOMAIN` and `BOT_ENDPOINT` with your dev tunnel URL.
+       ```
+       BOT_DOMAIN=sample-id-3978.devtunnels.ms
+       BOT_ENDPOINT=https://sample-id-3978.devtunnels.ms
+       ```
 1. Provision.
     ```
     teamsfx provision --env <env>

NPM-search-connector-M365/web.config

@@ -8,7 +8,6 @@
 
 <configuration>
   <system.webServer>
-    <!-- Visit http://blogs.msdn.com/b/windowsazure/archive/2013/11/14/introduction-to-websockets-on-windows-azure-web-sites.aspx for more information on WebSocket support -->
     <webSocket enabled="false" />
     <handlers>
       <!-- Indicates that the server.js file is a node.js site to be handled by the iisnode module -->

NPM-search-message-extension-codespaces/.webappignore

@@ -17,10 +17,8 @@ tsconfig.json
 teamsapp.yml
 teamsapp.*.yml
 /env/
-/script/
 /node_modules/.bin
 /node_modules/ts-node
 /node_modules/typescript
 /appPackage/
 /infra/
-/teamsfx/

NPM-search-message-extension-codespaces/web.config

@@ -3,12 +3,11 @@
      This configuration file is required if iisnode is used to run node processes behind
      IIS or IIS Express.  For more information, visit:
 
-     https://github.com/tjanczuk/iisnode/blob/master/samples/configuration/web.config
+     https://github.com/tjanczuk/iisnode/blob/master/src/samples/configuration/web.config
 -->
 
 <configuration>
   <system.webServer>
-    <!-- Visit http://blogs.msdn.com/b/windowsazure/archive/2013/11/14/introduction-to-websockets-on-windows-azure-web-sites.aspx for more information on WebSocket support -->
     <webSocket enabled="false" />
     <handlers>
       <!-- Indicates that the server.js file is a node.js site to be handled by the iisnode module -->
@@ -54,7 +53,7 @@
         * node_env: will be propagated to node as NODE_ENV environment variable
         * debuggingEnabled - controls whether the built-in debugger is enabled
 
-      See https://github.com/tjanczuk/iisnode/blob/master/samples/configuration/web.config for a full list of options
+      See https://github.com/tjanczuk/iisnode/blob/master/src/samples/configuration/web.config for a full list of options
     -->
     <!--<iisnode watchedFiles="web.config;*.js"/>-->
   </system.webServer>

adaptive-card-notification/.funcignore

@@ -19,5 +19,4 @@ tsconfig.json
 teamsapp.yml
 teamsapp.*.yml
 /env/
-/script/
 /devTools/