Merge pull request #1378 from OfficeDev/v-hrajandira/UpdateT2.1Images

Updating T2.1 Images

samples/bot-proactive-messaging-teamsfx/appPackage/manifest.json

@@ -63,9 +63,5 @@
     ],
     "validDomains": [
         "${{PROVISIONOUTPUT__BOTOUTPUT__VALIDDOMAIN}}"
-    ],
-    "webApplicationInfo": {
-        "id": "${{AAD_APP_CLIENT_ID}}",
-        "resource": "api://botid-${{BOT_ID}}"
-    }
+    ]
 }

samples/bot-proactive-messaging-teamsfx/teamsapp.local.yml

@@ -7,19 +7,6 @@ additionalMetadata:
   sampleTag: Microsoft-Teams-Samples:bot-proactive-messaging-teamsfx
 
 provision:
-  - uses: aadApp/create # Creates a new Azure Active Directory (AAD) app to authenticate users if the environment variable that stores clientId is empty
-    with:
-      name: ${{CONFIG__MANIFEST__APPNAME__SHORT}}-aad # Note: when you run aadApp/update, the AAD app name will be updated based on the definition in manifest. If you don't want to change the name, make sure the name in AAD manifest is the same with the name defined here.
-      generateClientSecret: true # If the value is false, the action will not generate client secret for you
-      signInAudience: "AzureADMyOrg" # Authenticate users with a Microsoft work or school account in your organization's Azure AD tenant (for example, single tenant).
-    writeToEnvironmentFile: # Write the information of created resources into environment file for the specified environment variable(s).
-      clientId: AAD_APP_CLIENT_ID
-      clientSecret: SECRET_AAD_APP_CLIENT_SECRET # Environment variable that starts with `SECRET_` will be stored to the .env.{envName}.user environment file
-      objectId: AAD_APP_OBJECT_ID
-      tenantId: AAD_APP_TENANT_ID
-      authority: AAD_APP_OAUTH_AUTHORITY
-      authorityHost: AAD_APP_OAUTH_AUTHORITY_HOST
-
   - uses: teamsApp/create # Creates a Teams app
     with:
       name: proactive-messages-demo${{APP_NAME_SUFFIX}} # Teams app name
@@ -44,11 +31,6 @@ provision:
       channels:
         - name: msteams
 
-  - uses: aadApp/update # Apply the AAD manifest to an existing AAD app. Will use the object id in manifest file to determine which AAD app to update.
-    with:
-      manifestPath: ./aad.manifest.json # Relative path to this file. Environment variables in manifest will be replaced before apply to AAD app
-      outputFilePath : ./build/aad.manifest.${{TEAMSFX_ENV}}.json
-
   - uses: teamsApp/validateManifest # Validate using manifest schema
     with:
       manifestPath: ./appPackage/manifest.json # Path to manifest template
@@ -77,10 +59,6 @@ deploy:
     with:
       target: ./bot/.env.teamsfx.local
       envs:
-        M365_CLIENT_ID: ${{AAD_APP_CLIENT_ID}}
-        M365_CLIENT_SECRET: ${{SECRET_AAD_APP_CLIENT_SECRET}}
-        M365_TENANT_ID: ${{AAD_APP_TENANT_ID}}
-        M365_AUTHORITY_HOST: ${{AAD_APP_OAUTH_AUTHORITY_HOST}}
         INITIATE_LOGIN_ENDPOINT: ${{PROVISIONOUTPUT__BOTOUTPUT__SITEENDPOINT}}/auth-start.html
         M365_APPLICATION_ID_URI: api://botid-${{BOT_ID}}
 

samples/bot-proactive-messaging-teamsfx/teamsapp.yml

@@ -10,19 +10,6 @@ environmentFolderPath: ./env
 
 # Triggered when 'teamsfx provision' is executed
 provision:
-  - uses: aadApp/create # Creates a new Azure Active Directory (AAD) app to authenticate users if the environment variable that stores clientId is empty
-    with:
-      name: ${{CONFIG__MANIFEST__APPNAME__SHORT}}-aad # Note: when you run aadApp/update, the AAD app name will be updated based on the definition in manifest. If you don't want to change the name, make sure the name in AAD manifest is the same with the name defined here.
-      generateClientSecret: true # If the value is false, the action will not generate client secret for you
-      signInAudience: "AzureADMyOrg" # Authenticate users with a Microsoft work or school account in your organization's Azure AD tenant (for example, single tenant).
-    writeToEnvironmentFile:
-      # Write the information of created resources into environment file for the specified environment variable(s).
-      clientId: AAD_APP_CLIENT_ID
-      clientSecret: SECRET_AAD_APP_CLIENT_SECRET # Environment variable that starts with `SECRET_` will be stored to the .env.{envName}.user environment file
-      objectId: AAD_APP_OBJECT_ID
-      tenantId: AAD_APP_TENANT_ID
-      authority: AAD_APP_OAUTH_AUTHORITY
-      authorityHost: AAD_APP_OAUTH_AUTHORITY_HOST
   - uses: teamsApp/create # Creates a Teams app
     with:
       name: proactive-messages-demo${{APP_NAME_SUFFIX}} # Teams app name
@@ -44,10 +31,6 @@ provision:
           parameters: ./templates/azure/azure.parameters.${{TEAMSFX_ENV}}.json # Relative path to this file. Placeholders will be replaced with corresponding environment variable before ARM deployment.
           deploymentName: teams_toolkit_deployment # Required when deploy ARM template
       bicepCliVersion: v0.4.613 # Teams Toolkit will download this bicep CLI version from github for you, will use bicep CLI in PATH if you remove this config.
-  - uses: aadApp/update # Apply the AAD manifest to an existing AAD app. Will use the object id in manifest file to determine which AAD app to update.
-    with:
-      manifestPath: ./aad.manifest.json # Relative path to this file. Environment variables in manifest will be replaced before apply to AAD app
-      outputFilePath: ./build/aad.manifest.${{TEAMSFX_ENV}}.json
   - uses: teamsApp/validateManifest # Validate using manifest schema
     with:
       manifestPath: ./appPackage/manifest.json # Path to manifest template
@@ -106,3 +89,4 @@ publish:
     writeToEnvironmentFile:
       # Write the information of created resources into environment file for the specified environment variable(s).
       publishedAppId: TEAMS_APP_PUBLISHED_APP_ID
+projectId: ae7e0236-af43-44f3-a316-2af1b7cac1d6

samples/bot-sharepoint-list/csharp/README.md

@@ -19,6 +19,11 @@ Bot Framework v4 SPListBot sample.
 
 This bot has been created using [Bot Framework](https://dev.botframework.com), it shows how to create a simple bot that accepts input from the user and save it into sharepoint's List.
 
+## Interaction with app
+
+![SPListBot](SPListBot/Images/Preview.gif)
+
+
 ## Prerequisites
 
 - [.NET Core SDK](https://dotnet.microsoft.com/download) version 6.0
@@ -116,15 +121,15 @@ This bot has been created using [Bot Framework](https://dev.botframework.com), i
 ### Screenshots
 **Upload the custom app in Teams**
 
-![image](https://user-images.githubusercontent.com/50989436/109759882-c36f3480-7c13-11eb-9a38-e69d2c7139e7.png)
+![image](SPListBot/Images/1.Install.png)
 
 **Interaction with the Bot**
 
-![image](https://user-images.githubusercontent.com/50989436/109759972-eb5e9800-7c13-11eb-9246-e8fa02fbef64.png)
+![image](SPListBot/Images/2.Installed.png)
 
 **Ping the Bot**
 
-![image](https://user-images.githubusercontent.com/50989436/109760014-fe716800-7c13-11eb-932d-9c692d4a67ae.png)
+![image](SPListBot/Images/3.Interaction_with_bot.png)
 
 
 ## Further reading

samples/meeting-tabs/nodejs/Readme.md

@@ -136,39 +136,36 @@ You can interact with Teams Tab meeting sidepanel.
 4. **Add meeting tab**
 ![AddMeeting](Images/AddMeeting.png)
 
-5. **Join meeting**
-![JoinMeeting](Images/JoinMeeting.png)
-
-6. **Select your app**
+5. **Select your app**
 ![appAddMeeting](Images/appAddMeeting.png)
 
-7. **Add meeting tab**
+6. **Add meeting tab**
 ![appAddMeetingTabs](Images/appAddMeetingTabs.png)
 
-8. **Home page**
+7. **Home page**
 ![HomePage](Images/HomePage.png)
 
-9. **Click share To stage view**
+8. **Click share To stage view**
 ![clickShareStageView](Images/clickShareStageView.png)
 
-10. **Share To stage view**
+9. **Share To stage view**
 ![NextTenant](Images/NextTenant.png)
 
-11. **Toggle To Mute**
+10. **Toggle To Mute**
 Toggle button to mute state its looks like below.
 ![audioCall](Images/audioCall.png)
 
-12. **Toggle To Unmute**
+11. **Toggle To Unmute**
 Toggle button to Unmute state it will unmute client audio.
 ![audioCallTrue](Images/audioCallTrue.png)
 
-13. **App theme when dark**
+12. **App theme when dark**
 ![Dark](Images/dark-with-timer.PNG)
 
-14. **App theme when light**
+13. **App theme when light**
 ![Light](Images/light-with-timer.PNG)
 
-15. **App theme when contrast**
+14. **App theme when contrast**
 ![Contrast](Images/contrast-with-timer.PNG)
 
 ## Further reading

samples/msgext-link-unfurling-meeting/csharp/README.md

@@ -203,10 +203,6 @@ This sample illustrates a common scenario where a user shares a link to a resour
 
 ![InstallApp](Docs/InstallApp.png)
 
-**SignIn UI :**
-
-![SignIn](Docs/SignIn.png)
-
 **Create link - https://<your_tunnel_domain>/dashboard1:**
 
 ![MsgextLinkMeeting](Docs/MsgextLinkMeeting.png)