From 8d3d6f3538178bd2ffdbd98a1d3fb9122abbdcfa Mon Sep 17 00:00:00 2001 From: Prithvi-MSFT <87962396+Prithvi-MSFT@users.noreply.github.com> Date: Wed, 20 Sep 2023 11:15:42 +0530 Subject: [PATCH] Changed readme and sample folders to have app-manifest name (#935) * added changes for manifest files * added manifest and readme changes * added more samples for manifest changes * added meeting samples * added changes for messaging extension sample * added changes for tab samples * updated root readme * Update README.md * added manifest name changes * feedback changes * feedback changes * added feedback changes * added build pipeline fixes --------- Co-authored-by: ChetanSharma-MSFT <59052547+ChetanSharma-msft@users.noreply.github.com> --- README.md | 14 ++++---- samples/account-linking/csharp/.gitignore | 2 +- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin samples/account-linking/csharp/README.md | 6 ++-- .../color.png | Bin .../manifest.json | 0 .../outline.png | Bin samples/app-anonymous-users/csharp/Readme.md | 4 +-- samples/app-auth/nodejs/README.md | 10 +++--- .../{Manifest_Hub => appManifest}/color.png | Bin .../{manifest => appManifest}/manifest.json | 0 .../{Manifest_Hub => appManifest}/outline.png | Bin .../{manifest => appManifestHub}/color.png | Bin .../manifest.json | 0 .../{manifest => appManifestHub}/outline.png | Bin samples/app-auth/nodejs/gulpfile.js | 2 +- .../{AppPackage => AppManifest}/color.png | Bin .../{AppPackage => AppManifest}/manifest.json | 0 .../{AppPackage => AppManifest}/outline.png | Bin samples/app-checkin-location/csharp/README.md | 6 ++-- .../color.png | Bin .../manifest.json | 0 .../outline.png | Bin samples/app-complete-auth/csharp/README.md | 6 ++-- samples/app-complete-sample/csharp/.gitignore | 2 +- .../{manifest => AppManifest_Hub}/color.png | Bin .../manifest.json | 0 .../{manifest => AppManifest_Hub}/outline.png | Bin samples/app-complete-sample/csharp/README.md | 14 ++++---- .../{manifest_hub => appManifest}/color.png | Bin .../{manifest => appManifest}/manifest.json | 0 .../{manifest_hub => appManifest}/outline.png | Bin samples/app-hello-world/csharp/.gitignore | 2 +- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin .../color.png | Bin .../manifest.json | 0 .../outline.png | Bin ...rosoft.Teams.Samples.HelloWorld.Web.csproj | 6 ---- samples/app-hello-world/csharp/README.md | 8 ++--- .../{AppPackage => AppManifest}/color.png | Bin .../{AppPackage => AppManifest}/manifest.json | 0 .../{AppPackage => AppManifest}/outline.png | Bin .../csharp/README.md | 6 ++-- .../csharp/README.md | 6 ++-- samples/app-localization/csharp/.gitignore | 2 +- .../contoso20x20.png | Bin .../contoso96x96.png | Bin .../{Manifest => AppManifest}/es-mx.json | 0 .../{Manifest => AppManifest}/fr-ca.json | 0 .../{Manifest => AppManifest}/hi-in.json | 0 .../{Manifest => AppManifest}/manifest.json | 0 .../contoso20x20.png | Bin .../contoso96x96.png | Bin .../es-mx.json | 0 .../fr-ca.json | 0 .../hi-in.json | 0 .../manifest.json | 0 .../csharp/Localization/Localization.csproj | 30 ++++++++---------- samples/app-localization/csharp/README.md | 8 ++--- .../color.png | Bin .../manifest.json | 0 .../outline.png | Bin .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 samples/app-sso/csharp/README.md | 4 +-- samples/app-task-module/csharp/.gitignore | 2 +- .../{Manifest => AppManifest}/color_icon.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../outline_icon.png | Bin .../color_icon.png | Bin .../manifest.json | 0 .../outline_icon.png | Bin samples/app-task-module/csharp/README.md | 10 +++--- .../{AppPackage => AppManifest}/color.png | Bin .../{AppPackage => AppManifest}/manifest.json | 0 .../{AppPackage => AppManifest}/outline.png | Bin .../csharp/README.md | 6 ++-- .../csharp/.gitignore | 2 +- .../{AppPackage => AppManifest}/color.png | Bin .../{AppPackage => AppManifest}/manifest.json | 0 .../{AppPackage => AppManifest}/outline.png | Bin .../csharp/README.md | 4 +-- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin samples/bot-all-cards/csharp/README.md | 6 ++-- .../csharp/FetchGroupChatMessages/README.md | 2 +- .../csharp/README.md | 8 +++-- samples/bot-calling-meeting/csharp/.gitignore | 2 +- samples/bot-calling-meeting/csharp/README.md | 2 +- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin .../{appPackage => AppManifest}/README.md | 0 .../{appPackage => AppManifest}/color.png | Bin .../{appPackage => AppManifest}/manifest.json | 0 .../{appPackage => AppManifest}/outline.png | Bin .../BotConversationSsoQuickstart/README.md | 4 +-- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 .../{AppPackage => AppManifest}/color.png | Bin .../{AppPackage => AppManifest}/manifest.json | 0 .../{AppPackage => AppManifest}/outline.png | Bin .../bot-daily-task-reminder/csharp/README.md | 8 ++--- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 samples/bot-file-upload/csharp/README.md | 6 ++-- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 samples/bot-file-upload/java/README.md | 6 ++-- samples/bot-file-upload/python/README.md | 6 ++-- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin samples/bot-formatting-cards/csharp/README.md | 4 +-- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 .../csharp/README.md | 2 +- .../java/README.md | 4 +-- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 .../python/README.md | 6 ++-- .../icon-color.png | Bin .../icon-outline.png | Bin .../icon-outline.zip | Bin .../manifest.json | 0 .../csharp/README.md | 3 +- .../color.png | Bin .../manifest.json | 0 .../outline.png | Bin samples/bot-message-reaction/csharp/README.md | 2 +- samples/bot-message-reaction/java/README.md | 2 +- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 .../{AppPackage => AppManifest}/color.png | Bin .../{AppPackage => AppManifest}/manifest.json | 0 .../{AppPackage => AppManifest}/outline.png | Bin .../{AppPackage => AppManifest}/peoplep.zip | Bin .../csharp/README.md | 8 ++--- .../bot-proactive-messaging/csharp/.gitignore | 2 +- .../color.png | Bin .../manifest.json | 0 .../outline.png | Bin .../bot-proactive-messaging/csharp/README.md | 4 +-- .../csharp/README.md | 2 +- .../csharp/ReceiveMessagesWithRSC/README.md | 4 +-- .../bot-release-management/csharp/.gitignore | 2 +- .../{AppPackage => AppManifest}/color.png | Bin .../{AppPackage => AppManifest}/manifest.json | 0 .../{AppPackage => AppManifest}/outline.png | Bin samples/bot-request-approval/csharp/README.md | 10 +++--- .../csharp/README.md | 8 ++--- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin samples/bot-sharepoint-list/csharp/README.md | 2 +- .../color.png | Bin .../manifest.json | 0 .../outline.png | Bin .../color.png | Bin .../manifest.json | 0 .../outline.png | Bin .../csharp/BotSsoAdaptivecard/README.md | 3 +- .../bot-suggested-actions/csharp/README.md | 8 ++--- .../{AppPackage => AppManifest}/color.png | Bin .../{AppPackage => AppManifest}/manifest.json | 0 .../{AppPackage => AppManifest}/outline.png | Bin .../bot-tab-conversations/csharp/.gitignore | 2 +- .../bot-tab-conversations/csharp/README.md | 4 +-- .../{Manifest => AppManifest}/.gitignore | 0 .../{Manifest => AppManifest}/icon-color.png | Bin .../icon-outline.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 samples/bot-task-module/csharp/README.md | 2 +- samples/bot-task-module/java/README.md | 2 +- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 samples/bot-task-module/python/README.md | 6 ++-- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 .../manifest.zip | Bin .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 .../bot-teams-authentication/csharp/README.md | 2 +- .../bot-teams-authentication/java/README.md | 2 +- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 .../bot-teams-authentication/python/README.md | 4 +-- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 .../{Manifest => AppManifest}/color.png | 0 .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | 0 .../csharp/README.md | 8 ++--- .../{AppPackage => AppManifest}/color.png | Bin .../{AppPackage => AppManifest}/manifest.json | 0 .../{AppPackage => AppManifest}/outline.png | Bin .../csharp/.gitignore | 2 +- .../color_icon.png | Bin .../manifest.json | 0 .../outline_icon.png | Bin .../csharp/README.md | 2 +- .../{AppPackage => AppManifest}/color.png | Bin .../{AppPackage => AppManifest}/manifest.json | 0 .../{AppPackage => AppManifest}/outline.png | Bin .../csharp/README.md | 6 ++-- .../color.png | Bin .../manifest.json | 0 .../outline.png | Bin samples/graph-activity-feed/csharp/README.md | 4 +-- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin .../csharp/README.md | 8 ++--- .../{Manifest => AppManifest}/icon-color.png | Bin .../icon-outline.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../csharp/README.md | 6 ++-- .../csharp/EventMeeting.gitignore | 2 +- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin samples/graph-bulk-meetings/csharp/README.md | 4 +-- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin .../csharp/README.md | 4 +-- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin .../csharp/README.md | 4 +-- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin .../graph-channel-lifecycle/csharp/README.md | 6 ++-- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin .../color.png | Bin .../manifest.json | 0 .../outline.png | Bin samples/graph-chat-lifecycle/csharp/README.md | 8 ++--- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin .../csharp/README.md | 6 ++-- .../graph-pinned-messages/csharp/.gitignore | 2 +- .../color.png | Bin .../manifest.json | 0 .../outline.png | Bin .../csharp/README.md | 6 ++-- samples/graph-rsc/csharp/README.md | 6 ++-- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin samples/graph-teams-tag/csharp/.gitignore | 2 +- samples/graph-teams-tag/csharp/README.md | 4 +-- .../{AppPackage => AppManifest}/color.png | Bin .../{AppPackage => AppManifest}/manifest.json | 0 .../{AppPackage => AppManifest}/outline.png | Bin samples/incoming-webhook/csharp/README.md | 5 ++- .../icon-color.png | Bin .../icon-outline.png | Bin .../{AppPackage => AppManifest}/manifest.json | 0 .../meeting-recruitment-app/csharp/README.md | 8 ++--- .../meeting-recruitment-app/nodejs/.gitignore | 2 +- .../{AppPackage => AppManifest}/color.png | Bin .../{AppPackage => AppManifest}/manifest.json | 0 .../{AppPackage => AppManifest}/outline.png | Bin samples/meeting-tabs/csharp/README.md | 6 ++-- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin .../csharp/README.md | 6 ++-- samples/meetings-context-app/csharp/README.md | 2 +- .../{Manifest => AppManifest}/icon-color.png | Bin .../icon-outline.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../csharp/DetailsTab/DetailsTab.csproj | 4 --- samples/meetings-details-tab/csharp/README.md | 8 ++--- .../{AppPackage => AppManifest}/color.png | Bin .../{AppPackage => AppManifest}/manifest.json | 0 .../{AppPackage => AppManifest}/outline.png | Bin samples/meetings-events/csharp/README.md | 8 ++--- .../meetings-live-caption/csharp/README.md | 2 +- .../{AppPackage => AppManifest}/color.png | Bin .../{AppPackage => AppManifest}/manifest.json | 0 .../{AppPackage => AppManifest}/outline.png | Bin .../csharp/README.md | 8 ++--- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin .../meetings-notification/csharp/README.md | 8 ++--- .../csharp/README.md | 4 +-- .../{Manifest => AppManifest}/.gitignore | 0 .../{Manifest => AppManifest}/colorIcon.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outlineIcon.png | Bin samples/meetings-sidepanel/csharp/README.md | 4 +-- .../{AppPackage => AppManifest}/color.png | Bin .../{AppPackage => AppManifest}/manifest.json | 0 .../{AppPackage => AppManifest}/outline.png | Bin .../{AppPackage => AppManifest}/color.png | Bin .../{AppPackage => AppManifest}/manifest.json | 0 .../{AppPackage => AppManifest}/outline.png | Bin samples/meetings-stage-view/csharp/README.md | 8 ++--- .../Manifest => AppManifest}/icon-color.png | Bin .../Manifest => AppManifest}/icon-outline.png | Bin .../Manifest => AppManifest}/manifest.json | 0 samples/meetings-token-app/csharp/README.md | 8 ++--- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 .../msgext-action-preview/csharp/README.md | 6 ++-- samples/msgext-action-preview/java/README.md | 6 ++-- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 .../msgext-action-preview/python/README.md | 4 +-- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 samples/msgext-action/csharp/README.md | 4 +-- samples/msgext-action/java/README.md | 6 ++-- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 samples/msgext-action/python/README.md | 6 ++-- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin .../csharp/README.md | 4 +-- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 .../msgext-link-unfurling/csharp/README.md | 6 ++-- samples/msgext-link-unfurling/java/README.md | 6 ++-- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 .../msgext-link-unfurling/python/README.md | 6 ++-- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 .../{AppPackage => AppManifest}/color.png | Bin .../{AppPackage => AppManifest}/manifest.json | 0 .../{AppPackage => AppManifest}/outline.png | Bin .../msgext-message-reminder/csharp/README.md | 8 ++--- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 .../csharp/README.md | 6 ++-- .../python/README.md | 6 ++-- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 samples/msgext-search/csharp/README.md | 6 ++-- samples/msgext-search/java/README.md | 4 +-- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 samples/msgext-search/python/README.md | 4 +-- .../icon-color.png | Bin .../icon-outline.png | Bin .../manifest.json | 0 .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin samples/tab-adaptive-cards/csharp/README.md | 8 ++--- .../{AppPackage => AppManifest}/color.png | Bin .../{AppPackage => AppManifest}/manifest.json | 0 .../{AppPackage => AppManifest}/outline.png | Bin .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin .../csharp/README.md | 8 ++--- .../{appPackage => AppManifest}/color.png | Bin .../{appPackage => AppManifest}/manifest.json | 0 .../{appPackage => AppManifest}/outline.png | Bin .../csharp_dotnetcore/README.md | 6 ++-- .../tab-channel-group/mvc-csharp/README.md | 2 +- .../tab-channel-group/razor-csharp/README.md | 2 +- samples/tab-conversations/csharp/README.md | 2 +- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin .../color.png | Bin .../manifest.json | 0 .../outline.png | Bin samples/tab-deeplink/csharp/README.md | 6 ++-- samples/tab-graph-toolkit/csharp/README.md | 6 ++-- .../{appPackage => AppManifest}/color.png | Bin .../{appPackage => AppManifest}/manifest.json | 0 .../{appPackage => AppManifest}/outline.png | Bin samples/tab-people-picker/csharp/README.md | 4 +-- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/color.zip | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin .../color.png | Bin .../manifest.json | 0 .../outline.png | Bin .../csharp_dotnetcore/README.md | 8 ++--- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin .../color.png | Bin .../manifest.json | 0 .../outline.png | Bin .../tab-product-inspection/csharp/README.md | 10 +++--- .../{AppPackage => AppManifest}/color.png | Bin .../{AppPackage => AppManifest}/manifest.json | 0 .../{AppPackage => AppManifest}/outline.png | Bin samples/tab-sso/csharp/README.md | 8 ++--- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin .../color.png | Bin .../manifest.json | 0 .../outline.png | Bin samples/tab-sso/nodejs/README.md | 4 +-- samples/tab-stage-view/csharp/README.md | 10 +++--- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin .../color.png | Bin .../manifest.json | 0 .../outline.png | Bin samples/tab-stage-view/nodejs/Readme.md | 4 +-- .../tab-staggered-permission/csharp/README.md | 10 +++--- .../{Manifest => AppManifest}/color.png | Bin .../{Manifest => AppManifest}/manifest.json | 0 .../{Manifest => AppManifest}/outline.png | Bin .../color.png | Bin .../manifest.json | 0 .../outline.png | Bin .../tab-staggered-permission/nodejs/README.md | 2 +- 480 files changed, 335 insertions(+), 346 deletions(-) rename samples/account-linking/csharp/{Manifest => AppManifest}/color.png (100%) rename samples/account-linking/csharp/{Manifest => AppManifest}/manifest.json (100%) rename samples/account-linking/csharp/{Manifest => AppManifest}/outline.png (100%) rename samples/app-anonymous-users/csharp/{TeamsAppManifest => AppManifest}/color.png (100%) rename samples/app-anonymous-users/csharp/{TeamsAppManifest => AppManifest}/manifest.json (100%) rename samples/app-anonymous-users/csharp/{TeamsAppManifest => AppManifest}/outline.png (100%) rename samples/app-auth/nodejs/{Manifest_Hub => appManifest}/color.png (100%) rename samples/app-auth/nodejs/{manifest => appManifest}/manifest.json (100%) rename samples/app-auth/nodejs/{Manifest_Hub => appManifest}/outline.png (100%) rename samples/app-auth/nodejs/{manifest => appManifestHub}/color.png (100%) rename samples/app-auth/nodejs/{Manifest_Hub => appManifestHub}/manifest.json (100%) rename samples/app-auth/nodejs/{manifest => appManifestHub}/outline.png (100%) rename samples/app-checkin-location/csharp/AppCheckinLocation/{AppPackage => AppManifest}/color.png (100%) rename samples/app-checkin-location/csharp/AppCheckinLocation/{AppPackage => AppManifest}/manifest.json (100%) rename samples/app-checkin-location/csharp/AppCheckinLocation/{AppPackage => AppManifest}/outline.png (100%) rename samples/app-complete-auth/csharp/AppCompleteAuth/{Manifest_Hub => AppManifest_Hub}/color.png (100%) rename samples/app-complete-auth/csharp/AppCompleteAuth/{Manifest_Hub => AppManifest_Hub}/manifest.json (100%) rename samples/app-complete-auth/csharp/AppCompleteAuth/{Manifest_Hub => AppManifest_Hub}/outline.png (100%) rename samples/app-complete-sample/csharp/{manifest => AppManifest_Hub}/color.png (100%) rename samples/app-complete-sample/csharp/{manifest_hub => AppManifest_Hub}/manifest.json (100%) rename samples/app-complete-sample/csharp/{manifest => AppManifest_Hub}/outline.png (100%) rename samples/app-complete-sample/csharp/{manifest_hub => appManifest}/color.png (100%) rename samples/app-complete-sample/csharp/{manifest => appManifest}/manifest.json (100%) rename samples/app-complete-sample/csharp/{manifest_hub => appManifest}/outline.png (100%) rename samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/{Manifest => AppManifest}/color.png (100%) rename samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/{Manifest => AppManifest}/manifest.json (100%) rename samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/{Manifest => AppManifest}/outline.png (100%) rename samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/{Manifest_Hub => AppManifest_Hub}/color.png (100%) rename samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/{Manifest_Hub => AppManifest_Hub}/manifest.json (100%) rename samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/{Manifest_Hub => AppManifest_Hub}/outline.png (100%) rename samples/app-installation-using-qr-code/csharp/QRAppInstallation/{AppPackage => AppManifest}/color.png (100%) rename samples/app-installation-using-qr-code/csharp/QRAppInstallation/{AppPackage => AppManifest}/manifest.json (100%) rename samples/app-installation-using-qr-code/csharp/QRAppInstallation/{AppPackage => AppManifest}/outline.png (100%) rename samples/app-localization/csharp/Localization/{Manifest => AppManifest}/contoso20x20.png (100%) rename samples/app-localization/csharp/Localization/{Manifest => AppManifest}/contoso96x96.png (100%) rename samples/app-localization/csharp/Localization/{Manifest => AppManifest}/es-mx.json (100%) rename samples/app-localization/csharp/Localization/{Manifest => AppManifest}/fr-ca.json (100%) rename samples/app-localization/csharp/Localization/{Manifest => AppManifest}/hi-in.json (100%) rename samples/app-localization/csharp/Localization/{Manifest => AppManifest}/manifest.json (100%) rename samples/app-localization/csharp/Localization/{Manifest_hub => AppManifest_Hub}/contoso20x20.png (100%) rename samples/app-localization/csharp/Localization/{Manifest_hub => AppManifest_Hub}/contoso96x96.png (100%) rename samples/app-localization/csharp/Localization/{Manifest_hub => AppManifest_Hub}/es-mx.json (100%) rename samples/app-localization/csharp/Localization/{Manifest_hub => AppManifest_Hub}/fr-ca.json (100%) rename samples/app-localization/csharp/Localization/{Manifest_hub => AppManifest_Hub}/hi-in.json (100%) rename samples/app-localization/csharp/Localization/{Manifest_hub => AppManifest_Hub}/manifest.json (100%) rename samples/app-region-selection/csharp/RegionSectionApp/{TeamsAppManifest => AppManifest}/color.png (100%) rename samples/app-region-selection/csharp/RegionSectionApp/{TeamsAppManifest => AppManifest}/manifest.json (100%) rename samples/app-region-selection/csharp/RegionSectionApp/{TeamsAppManifest => AppManifest}/outline.png (100%) rename samples/app-sso/csharp/App SSO Sample/{Manifest_Hub => AppManifest}/icon-color.png (100%) rename samples/app-sso/csharp/App SSO Sample/{Manifest_Hub => AppManifest}/icon-outline.png (100%) rename samples/app-sso/csharp/App SSO Sample/{TeamsAppManifest => AppManifest}/manifest.json (100%) rename samples/app-sso/csharp/App SSO Sample/{TeamsAppManifest => AppManifest_Hub}/icon-color.png (100%) rename samples/app-sso/csharp/App SSO Sample/{TeamsAppManifest => AppManifest_Hub}/icon-outline.png (100%) rename samples/app-sso/csharp/App SSO Sample/{Manifest_Hub => AppManifest_Hub}/manifest.json (100%) rename samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/{Manifest => AppManifest}/color_icon.png (100%) rename samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/{Manifest => AppManifest}/manifest.json (100%) rename samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/{Manifest => AppManifest}/outline_icon.png (100%) rename samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/{Manifest_Hub => AppManifest_Hub}/color_icon.png (100%) rename samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/{Manifest_Hub => AppManifest_Hub}/manifest.json (100%) rename samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/{Manifest_Hub => AppManifest_Hub}/outline_icon.png (100%) rename samples/bot-adaptive-card-actions/csharp/AdaptiveCardActions/{AppPackage => AppManifest}/color.png (100%) rename samples/bot-adaptive-card-actions/csharp/AdaptiveCardActions/{AppPackage => AppManifest}/manifest.json (100%) rename samples/bot-adaptive-card-actions/csharp/AdaptiveCardActions/{AppPackage => AppManifest}/outline.png (100%) rename samples/bot-adaptivecards-user-specific-views/csharp/{AppPackage => AppManifest}/color.png (100%) rename samples/bot-adaptivecards-user-specific-views/csharp/{AppPackage => AppManifest}/manifest.json (100%) rename samples/bot-adaptivecards-user-specific-views/csharp/{AppPackage => AppManifest}/outline.png (100%) rename samples/bot-all-cards/csharp/BotAllCards/{Manifest => AppManifest}/color.png (100%) rename samples/bot-all-cards/csharp/BotAllCards/{Manifest => AppManifest}/manifest.json (100%) rename samples/bot-all-cards/csharp/BotAllCards/{Manifest => AppManifest}/outline.png (100%) rename samples/bot-calling-meeting/csharp/Source/CallingBotSample/{Manifest => AppManifest}/color.png (100%) rename samples/bot-calling-meeting/csharp/Source/CallingBotSample/{Manifest => AppManifest}/manifest.json (100%) rename samples/bot-calling-meeting/csharp/Source/CallingBotSample/{Manifest => AppManifest}/outline.png (100%) rename samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/{appPackage => AppManifest}/README.md (100%) rename samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/{appPackage => AppManifest}/color.png (100%) rename samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/{appPackage => AppManifest}/manifest.json (100%) rename samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/{appPackage => AppManifest}/outline.png (100%) rename samples/bot-conversation/csharp/{TeamsAppManifest => AppManifest}/icon-color.png (100%) rename samples/bot-conversation/csharp/{TeamsAppManifest => AppManifest}/icon-outline.png (100%) rename samples/bot-conversation/csharp/{TeamsAppManifest => AppManifest}/manifest.json (100%) rename samples/bot-daily-task-reminder/csharp/BotDailyTaskReminder/{AppPackage => AppManifest}/color.png (100%) rename samples/bot-daily-task-reminder/csharp/BotDailyTaskReminder/{AppPackage => AppManifest}/manifest.json (100%) rename samples/bot-daily-task-reminder/csharp/BotDailyTaskReminder/{AppPackage => AppManifest}/outline.png (100%) rename samples/bot-file-upload/csharp/{TeamsAppManifest => AppManifest}/icon-color.png (100%) rename samples/bot-file-upload/csharp/{TeamsAppManifest => AppManifest}/icon-outline.png (100%) rename samples/bot-file-upload/csharp/{TeamsAppManifest => AppManifest}/manifest.json (100%) rename samples/bot-file-upload/java/{teamsAppManifest => AppManifest}/icon-color.png (100%) rename samples/bot-file-upload/java/{teamsAppManifest => AppManifest}/icon-outline.png (100%) rename samples/bot-file-upload/java/{teamsAppManifest => AppManifest}/manifest.json (100%) rename samples/bot-file-upload/python/{teams_app_manifest => appManifest}/icon-color.png (100%) rename samples/bot-file-upload/python/{teams_app_manifest => appManifest}/icon-outline.png (100%) rename samples/bot-file-upload/python/{teams_app_manifest => appManifest}/manifest.json (100%) rename samples/bot-formatting-cards/csharp/BotFormattingCards/{Manifest => AppManifest}/color.png (100%) rename samples/bot-formatting-cards/csharp/BotFormattingCards/{Manifest => AppManifest}/manifest.json (100%) rename samples/bot-formatting-cards/csharp/BotFormattingCards/{Manifest => AppManifest}/outline.png (100%) rename samples/bot-initiate-thread-in-channel/csharp/{TeamsAppManifest => AppManifest}/icon-color.png (100%) rename samples/bot-initiate-thread-in-channel/csharp/{TeamsAppManifest => AppManifest}/icon-outline.png (100%) rename samples/bot-initiate-thread-in-channel/csharp/{TeamsAppManifest => AppManifest}/manifest.json (100%) rename samples/bot-initiate-thread-in-channel/java/{teamsAppManifest => appManifest}/icon-color.png (100%) rename samples/bot-initiate-thread-in-channel/java/{teamsAppManifest => appManifest}/icon-outline.png (100%) rename samples/bot-initiate-thread-in-channel/java/{teamsAppManifest => appManifest}/manifest.json (100%) rename samples/bot-initiate-thread-in-channel/python/{teams_app_manifest => appManifest}/icon-color.png (100%) rename samples/bot-initiate-thread-in-channel/python/{teams_app_manifest => appManifest}/icon-outline.png (100%) rename samples/bot-initiate-thread-in-channel/python/{teams_app_manifest => appManifest}/icon-outline.zip (100%) rename samples/bot-initiate-thread-in-channel/python/{teams_app_manifest => appManifest}/manifest.json (100%) rename samples/bot-message-reaction/csharp/{TeamsAppManifest => AppManifest}/color.png (100%) rename samples/bot-message-reaction/csharp/{TeamsAppManifest => AppManifest}/manifest.json (100%) rename samples/bot-message-reaction/csharp/{TeamsAppManifest => AppManifest}/outline.png (100%) rename samples/bot-message-reaction/java/{TeamsAppManifest => appManifest}/icon-color.png (100%) rename samples/bot-message-reaction/java/{TeamsAppManifest => appManifest}/icon-outline.png (100%) rename samples/bot-message-reaction/java/{TeamsAppManifest => appManifest}/manifest.json (100%) rename samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/{AppPackage => AppManifest}/color.png (100%) rename samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/{AppPackage => AppManifest}/manifest.json (100%) rename samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/{AppPackage => AppManifest}/outline.png (100%) rename samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/{AppPackage => AppManifest}/peoplep.zip (100%) rename samples/bot-proactive-messaging/csharp/{teamsAppManifest => AppManifest}/color.png (100%) rename samples/bot-proactive-messaging/csharp/{teamsAppManifest => AppManifest}/manifest.json (100%) rename samples/bot-proactive-messaging/csharp/{teamsAppManifest => AppManifest}/outline.png (100%) rename samples/bot-request-approval/csharp/BotRequestApproval/{AppPackage => AppManifest}/color.png (100%) rename samples/bot-request-approval/csharp/BotRequestApproval/{AppPackage => AppManifest}/manifest.json (100%) rename samples/bot-request-approval/csharp/BotRequestApproval/{AppPackage => AppManifest}/outline.png (100%) rename samples/bot-sequential-flow-adaptive-cards/csharp/SequentialUserSpecificFlow/{Manifest => AppManifest}/color.png (100%) rename samples/bot-sequential-flow-adaptive-cards/csharp/SequentialUserSpecificFlow/{Manifest => AppManifest}/manifest.json (100%) rename samples/bot-sequential-flow-adaptive-cards/csharp/SequentialUserSpecificFlow/{Manifest => AppManifest}/outline.png (100%) rename samples/bot-sharepoint-list/csharp/SPListBot/{teamsAppManifest => AppManifest}/color.png (100%) rename samples/bot-sharepoint-list/csharp/SPListBot/{teamsAppManifest => AppManifest}/manifest.json (100%) rename samples/bot-sharepoint-list/csharp/SPListBot/{teamsAppManifest => AppManifest}/outline.png (100%) rename samples/bot-sso-adaptivecard/csharp/BotSsoAdaptivecard/{TeamsAppManifest => AppManifest}/color.png (100%) rename samples/bot-sso-adaptivecard/csharp/BotSsoAdaptivecard/{TeamsAppManifest => AppManifest}/manifest.json (100%) rename samples/bot-sso-adaptivecard/csharp/BotSsoAdaptivecard/{TeamsAppManifest => AppManifest}/outline.png (100%) rename samples/bot-suggested-actions/csharp/SuggestedActions/{AppPackage => AppManifest}/color.png (100%) rename samples/bot-suggested-actions/csharp/SuggestedActions/{AppPackage => AppManifest}/manifest.json (100%) rename samples/bot-suggested-actions/csharp/SuggestedActions/{AppPackage => AppManifest}/outline.png (100%) rename samples/bot-tab-conversations/csharp/Source/ConversationalTabs.Web/{Manifest => AppManifest}/.gitignore (100%) rename samples/bot-tab-conversations/csharp/Source/ConversationalTabs.Web/{Manifest => AppManifest}/icon-color.png (100%) rename samples/bot-tab-conversations/csharp/Source/ConversationalTabs.Web/{Manifest => AppManifest}/icon-outline.png (100%) rename samples/bot-tab-conversations/csharp/Source/ConversationalTabs.Web/{Manifest => AppManifest}/manifest.json (100%) rename samples/bot-task-module/csharp/{TeamsAppManifest => AppManifest}/icon-color.png (100%) rename samples/bot-task-module/csharp/{TeamsAppManifest => AppManifest}/icon-outline.png (100%) rename samples/bot-task-module/csharp/{TeamsAppManifest => AppManifest}/manifest.json (100%) rename samples/bot-task-module/java/{teamsAppManifest => appManifest}/icon-color.png (100%) rename samples/bot-task-module/java/{teamsAppManifest => appManifest}/icon-outline.png (100%) rename samples/bot-task-module/java/{teamsAppManifest => appManifest}/manifest.json (100%) rename samples/bot-task-module/python/{teams_app_manifest => appManifest}/icon-color.png (100%) rename samples/bot-task-module/python/{teams_app_manifest => appManifest}/icon-outline.png (100%) rename samples/bot-task-module/python/{teams_app_manifest => appManifest}/manifest.json (100%) rename samples/bot-task-module/python/{teams_app_manifest => appManifest}/manifest.zip (100%) rename samples/bot-teams-authentication/csharp/{TeamsAppManifest => AppManifest}/icon-color.png (100%) rename samples/bot-teams-authentication/csharp/{TeamsAppManifest => AppManifest}/icon-outline.png (100%) rename samples/bot-teams-authentication/csharp/{TeamsAppManifest => AppManifest}/manifest.json (100%) rename samples/bot-teams-authentication/java/{teamsAppManifest => appManifest}/icon-color.png (100%) rename samples/bot-teams-authentication/java/{teamsAppManifest => appManifest}/icon-outline.png (100%) rename samples/bot-teams-authentication/java/{teamsAppManifest => appManifest}/manifest.json (100%) rename samples/bot-teams-authentication/python/{teams_app_manifest => appManifest}/icon-color.png (100%) rename samples/bot-teams-authentication/python/{teams_app_manifest => appManifest}/icon-outline.png (100%) rename samples/bot-teams-authentication/python/{teams_app_manifest => appManifest}/manifest.json (100%) rename samples/bot-teams-catering/csharp/{Manifest => AppManifest}/color.png (100%) rename samples/bot-teams-catering/csharp/{Manifest => AppManifest}/manifest.json (100%) rename samples/bot-teams-catering/csharp/{Manifest => AppManifest}/outline.png (100%) rename samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/{AppPackage => AppManifest}/color.png (100%) rename samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/{AppPackage => AppManifest}/manifest.json (100%) rename samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/{AppPackage => AppManifest}/outline.png (100%) rename samples/connector-todo-notification/csharp/{TeamsAppPackages => AppManifest}/color_icon.png (100%) rename samples/connector-todo-notification/csharp/{TeamsAppPackages => AppManifest}/manifest.json (100%) rename samples/connector-todo-notification/csharp/{TeamsAppPackages => AppManifest}/outline_icon.png (100%) rename samples/graph-activity-feed-broadcast/csharp/ActivityFeedBroadcast/{AppPackage => AppManifest}/color.png (100%) rename samples/graph-activity-feed-broadcast/csharp/ActivityFeedBroadcast/{AppPackage => AppManifest}/manifest.json (100%) rename samples/graph-activity-feed-broadcast/csharp/ActivityFeedBroadcast/{AppPackage => AppManifest}/outline.png (100%) rename samples/graph-activity-feed/csharp/ActivityFeedNotification/{TabNotificationApp => AppManifest}/color.png (100%) rename samples/graph-activity-feed/csharp/ActivityFeedNotification/{TabNotificationApp => AppManifest}/manifest.json (100%) rename samples/graph-activity-feed/csharp/ActivityFeedNotification/{TabNotificationApp => AppManifest}/outline.png (100%) rename samples/graph-app-installation-lifecycle/csharp/AppInstallation/{Manifest => AppManifest}/color.png (100%) rename samples/graph-app-installation-lifecycle/csharp/AppInstallation/{Manifest => AppManifest}/manifest.json (100%) rename samples/graph-app-installation-lifecycle/csharp/AppInstallation/{Manifest => AppManifest}/outline.png (100%) rename samples/graph-appcatalog-lifecycle/csharp/AppCatalogSample/{Manifest => AppManifest}/icon-color.png (100%) rename samples/graph-appcatalog-lifecycle/csharp/AppCatalogSample/{Manifest => AppManifest}/icon-outline.png (100%) rename samples/graph-appcatalog-lifecycle/csharp/AppCatalogSample/{Manifest => AppManifest}/manifest.json (100%) rename samples/graph-bulk-meetings/csharp/EventMeeting/{Manifest => AppManifest}/color.png (100%) rename samples/graph-bulk-meetings/csharp/EventMeeting/{Manifest => AppManifest}/manifest.json (100%) rename samples/graph-bulk-meetings/csharp/EventMeeting/{Manifest => AppManifest}/outline.png (100%) rename samples/graph-change-notification-team-channel/csharp/ChangeNotification/{Manifest => AppManifest}/color.png (100%) rename samples/graph-change-notification-team-channel/csharp/ChangeNotification/{Manifest => AppManifest}/manifest.json (100%) rename samples/graph-change-notification-team-channel/csharp/ChangeNotification/{Manifest => AppManifest}/outline.png (100%) rename samples/graph-change-notification/csharp/ChangeNotification/{Manifest => AppManifest}/color.png (100%) rename samples/graph-change-notification/csharp/ChangeNotification/{Manifest => AppManifest}/manifest.json (100%) rename samples/graph-change-notification/csharp/ChangeNotification/{Manifest => AppManifest}/outline.png (100%) rename samples/graph-channel-lifecycle/csharp/ChannelLifecycle/{Manifest => AppManifest}/color.png (100%) rename samples/graph-channel-lifecycle/csharp/ChannelLifecycle/{Manifest => AppManifest}/manifest.json (100%) rename samples/graph-channel-lifecycle/csharp/ChannelLifecycle/{Manifest => AppManifest}/outline.png (100%) rename samples/graph-chat-lifecycle/csharp/ChatLifecycle/{Manifest => AppManifest}/color.png (100%) rename samples/graph-chat-lifecycle/csharp/ChatLifecycle/{Manifest => AppManifest}/manifest.json (100%) rename samples/graph-chat-lifecycle/csharp/ChatLifecycle/{Manifest => AppManifest}/outline.png (100%) rename samples/graph-chat-lifecycle/csharp/ChatLifecycle/{Manifest_Hub => AppManifest_Hub}/color.png (100%) rename samples/graph-chat-lifecycle/csharp/ChatLifecycle/{Manifest_Hub => AppManifest_Hub}/manifest.json (100%) rename samples/graph-chat-lifecycle/csharp/ChatLifecycle/{Manifest_Hub => AppManifest_Hub}/outline.png (100%) rename samples/graph-meeting-notification/csharp/MeetingNotification/{Manifest => AppManifest}/color.png (100%) rename samples/graph-meeting-notification/csharp/MeetingNotification/{Manifest => AppManifest}/manifest.json (100%) rename samples/graph-meeting-notification/csharp/MeetingNotification/{Manifest => AppManifest}/outline.png (100%) rename samples/graph-proactive-installation/csharp/ProactiveAppInstallation/{TeamsAppManifest => AppManifest}/color.png (100%) rename samples/graph-proactive-installation/csharp/ProactiveAppInstallation/{TeamsAppManifest => AppManifest}/manifest.json (100%) rename samples/graph-proactive-installation/csharp/ProactiveAppInstallation/{TeamsAppManifest => AppManifest}/outline.png (100%) rename samples/graph-rsc/csharp/RSCDemo/{Manifest => AppManifest}/color.png (100%) rename samples/graph-rsc/csharp/RSCDemo/{Manifest => AppManifest}/manifest.json (100%) rename samples/graph-rsc/csharp/RSCDemo/{Manifest => AppManifest}/outline.png (100%) rename samples/incoming-webhook/csharp/IncomingWebhook/{AppPackage => AppManifest}/color.png (100%) rename samples/incoming-webhook/csharp/IncomingWebhook/{AppPackage => AppManifest}/manifest.json (100%) rename samples/incoming-webhook/csharp/IncomingWebhook/{AppPackage => AppManifest}/outline.png (100%) rename samples/meeting-recruitment-app/csharp/MeetingApp/{AppPackage => AppManifest}/icon-color.png (100%) rename samples/meeting-recruitment-app/csharp/MeetingApp/{AppPackage => AppManifest}/icon-outline.png (100%) rename samples/meeting-recruitment-app/csharp/MeetingApp/{AppPackage => AppManifest}/manifest.json (100%) rename samples/meeting-tabs/csharp/MeetingTabs/{AppPackage => AppManifest}/color.png (100%) rename samples/meeting-tabs/csharp/MeetingTabs/{AppPackage => AppManifest}/manifest.json (100%) rename samples/meeting-tabs/csharp/MeetingTabs/{AppPackage => AppManifest}/outline.png (100%) rename samples/meetings-app-icon-badging/csharp/AppIconBadgingInMeetings/{Manifest => AppManifest}/color.png (100%) rename samples/meetings-app-icon-badging/csharp/AppIconBadgingInMeetings/{Manifest => AppManifest}/manifest.json (100%) rename samples/meetings-app-icon-badging/csharp/AppIconBadgingInMeetings/{Manifest => AppManifest}/outline.png (100%) rename samples/meetings-details-tab/csharp/DetailsTab/{Manifest => AppManifest}/icon-color.png (100%) rename samples/meetings-details-tab/csharp/DetailsTab/{Manifest => AppManifest}/icon-outline.png (100%) rename samples/meetings-details-tab/csharp/DetailsTab/{Manifest => AppManifest}/manifest.json (100%) rename samples/meetings-events/csharp/MeetingEvents/{AppPackage => AppManifest}/color.png (100%) rename samples/meetings-events/csharp/MeetingEvents/{AppPackage => AppManifest}/manifest.json (100%) rename samples/meetings-events/csharp/MeetingEvents/{AppPackage => AppManifest}/outline.png (100%) rename samples/meetings-live-code-interview/csharp/MeetingLiveCoding/{AppPackage => AppManifest}/color.png (100%) rename samples/meetings-live-code-interview/csharp/MeetingLiveCoding/{AppPackage => AppManifest}/manifest.json (100%) rename samples/meetings-live-code-interview/csharp/MeetingLiveCoding/{AppPackage => AppManifest}/outline.png (100%) rename samples/meetings-notification/csharp/InMeetingNotifications/{Manifest => AppManifest}/color.png (100%) rename samples/meetings-notification/csharp/InMeetingNotifications/{Manifest => AppManifest}/manifest.json (100%) rename samples/meetings-notification/csharp/InMeetingNotifications/{Manifest => AppManifest}/outline.png (100%) rename samples/meetings-share-to-stage-signing/csharp/Source/MeetingSigning.Web/{Manifest => AppManifest}/.gitignore (100%) rename samples/meetings-share-to-stage-signing/csharp/Source/MeetingSigning.Web/{Manifest => AppManifest}/colorIcon.png (100%) rename samples/meetings-share-to-stage-signing/csharp/Source/MeetingSigning.Web/{Manifest => AppManifest}/manifest.json (100%) rename samples/meetings-share-to-stage-signing/csharp/Source/MeetingSigning.Web/{Manifest => AppManifest}/outlineIcon.png (100%) rename samples/meetings-sidepanel/csharp/SidePanel/{AppPackage => AppManifest}/color.png (100%) rename samples/meetings-sidepanel/csharp/SidePanel/{AppPackage => AppManifest}/manifest.json (100%) rename samples/meetings-sidepanel/csharp/SidePanel/{AppPackage => AppManifest}/outline.png (100%) rename samples/meetings-stage-view/csharp/AppInMeeting/{AppPackage => AppManifest}/color.png (100%) rename samples/meetings-stage-view/csharp/AppInMeeting/{AppPackage => AppManifest}/manifest.json (100%) rename samples/meetings-stage-view/csharp/AppInMeeting/{AppPackage => AppManifest}/outline.png (100%) rename samples/meetings-token-app/csharp/{Resources/Manifest => AppManifest}/icon-color.png (100%) rename samples/meetings-token-app/csharp/{Resources/Manifest => AppManifest}/icon-outline.png (100%) rename samples/meetings-token-app/csharp/{Resources/Manifest => AppManifest}/manifest.json (100%) rename samples/msgext-action-preview/csharp/{TeamsAppManifest => AppManifest}/icon-color.png (100%) rename samples/msgext-action-preview/csharp/{TeamsAppManifest => AppManifest}/icon-outline.png (100%) rename samples/msgext-action-preview/csharp/{TeamsAppManifest => AppManifest}/manifest.json (100%) rename samples/msgext-action-preview/java/{teamsAppManifest => appManifest}/icon-color.png (100%) rename samples/msgext-action-preview/java/{teamsAppManifest => appManifest}/icon-outline.png (100%) rename samples/msgext-action-preview/java/{teamsAppManifest => appManifest}/manifest.json (100%) rename samples/msgext-action-preview/python/{teams_app_manifest => appManifest}/icon-color.png (100%) rename samples/msgext-action-preview/python/{teams_app_manifest => appManifest}/icon-outline.png (100%) rename samples/msgext-action-preview/python/{teams_app_manifest => appManifest}/manifest.json (100%) rename samples/msgext-action/csharp/{TeamsAppManifest => AppManifest}/icon-color.png (100%) rename samples/msgext-action/csharp/{TeamsAppManifest => AppManifest}/icon-outline.png (100%) rename samples/msgext-action/csharp/{TeamsAppManifest => AppManifest}/manifest.json (100%) rename samples/msgext-action/java/{teamsAppManifest => appManifest}/icon-color.png (100%) rename samples/msgext-action/java/{teamsAppManifest => appManifest}/icon-outline.png (100%) rename samples/msgext-action/java/{teamsAppManifest => appManifest}/manifest.json (100%) rename samples/msgext-action/python/{teams_app_manifest => appManifest}/icon-color.png (100%) rename samples/msgext-action/python/{teams_app_manifest => appManifest}/icon-outline.png (100%) rename samples/msgext-action/python/{teams_app_manifest => appManifest}/manifest.json (100%) rename samples/msgext-link-unfurling-meeting/csharp/{Manifest => AppManifest}/color.png (100%) rename samples/msgext-link-unfurling-meeting/csharp/{Manifest => AppManifest}/manifest.json (100%) rename samples/msgext-link-unfurling-meeting/csharp/{Manifest => AppManifest}/outline.png (100%) rename samples/msgext-link-unfurling-reddit/csharp/{Manifest => AppManifest}/color.png (100%) rename samples/msgext-link-unfurling-reddit/csharp/{Manifest => AppManifest}/manifest.json (100%) rename samples/msgext-link-unfurling-reddit/csharp/{Manifest => AppManifest}/outline.png (100%) rename samples/msgext-link-unfurling/csharp/{TeamsAppManifest => AppManifest}/icon-color.png (100%) rename samples/msgext-link-unfurling/csharp/{TeamsAppManifest => AppManifest}/icon-outline.png (100%) rename samples/msgext-link-unfurling/csharp/{TeamsAppManifest => AppManifest}/manifest.json (100%) rename samples/msgext-link-unfurling/java/{TeamsAppManifest => appManifest}/icon-color.png (100%) rename samples/msgext-link-unfurling/java/{TeamsAppManifest => appManifest}/icon-outline.png (100%) rename samples/msgext-link-unfurling/java/{TeamsAppManifest => appManifest}/manifest.json (100%) rename samples/msgext-link-unfurling/python/{teams_app_manifest => appManifest}/icon-color.png (100%) rename samples/msgext-link-unfurling/python/{teams_app_manifest => appManifest}/icon-outline.png (100%) rename samples/msgext-link-unfurling/python/{teams_app_manifest => appManifest}/manifest.json (100%) rename samples/msgext-message-reminder/csharp/MessagingExtensionReminder/{AppPackage => AppManifest}/color.png (100%) rename samples/msgext-message-reminder/csharp/MessagingExtensionReminder/{AppPackage => AppManifest}/manifest.json (100%) rename samples/msgext-message-reminder/csharp/MessagingExtensionReminder/{AppPackage => AppManifest}/outline.png (100%) rename samples/msgext-search-auth-config/csharp/{TeamsAppManifest => AppManifest}/icon-color.png (100%) rename samples/msgext-search-auth-config/csharp/{TeamsAppManifest => AppManifest}/icon-outline.png (100%) rename samples/msgext-search-auth-config/csharp/{TeamsAppManifest => AppManifest}/manifest.json (100%) rename samples/msgext-search-auth-config/python/{teams_app_manifest => appManifest}/icon-color.png (100%) rename samples/msgext-search-auth-config/python/{teams_app_manifest => appManifest}/icon-outline.png (100%) rename samples/msgext-search-auth-config/python/{teams_app_manifest => appManifest}/manifest.json (100%) rename samples/msgext-search/csharp/{TeamsAppManifest => AppManifest}/icon-color.png (100%) rename samples/msgext-search/csharp/{TeamsAppManifest => AppManifest}/icon-outline.png (100%) rename samples/msgext-search/csharp/{TeamsAppManifest => AppManifest}/manifest.json (100%) rename samples/msgext-search/java/{teamsAppManifest => appManifest}/icon-color.png (100%) rename samples/msgext-search/java/{teamsAppManifest => appManifest}/icon-outline.png (100%) rename samples/msgext-search/java/{teamsAppManifest => appManifest}/manifest.json (100%) rename samples/msgext-search/python/{teams_app_manifest => appManifest}/icon-color.png (100%) rename samples/msgext-search/python/{teams_app_manifest => appManifest}/icon-outline.png (100%) rename samples/msgext-search/python/{teams_app_manifest => appManifest}/manifest.json (100%) rename samples/msteams-application-qbot/{Manifest => AppManifest}/color.png (100%) rename samples/msteams-application-qbot/{Manifest => AppManifest}/manifest.json (100%) rename samples/msteams-application-qbot/{Manifest => AppManifest}/outline.png (100%) rename samples/msteams-application-resourcehub/{Manifest => AppManifest}/color.png (100%) rename samples/msteams-application-resourcehub/{Manifest => AppManifest}/manifest.json (100%) rename samples/msteams-application-resourcehub/{Manifest => AppManifest}/outline.png (100%) rename samples/tab-adaptive-cards/csharp/TabWithAdpativeCardFlow/{AppPackage => AppManifest}/color.png (100%) rename samples/tab-adaptive-cards/csharp/TabWithAdpativeCardFlow/{AppPackage => AppManifest}/manifest.json (100%) rename samples/tab-adaptive-cards/csharp/TabWithAdpativeCardFlow/{AppPackage => AppManifest}/outline.png (100%) rename samples/tab-channel-group-config-page-auth/csharp/ConfigTabAuthentication/{Manifest => AppManifest}/color.png (100%) rename samples/tab-channel-group-config-page-auth/csharp/ConfigTabAuthentication/{Manifest => AppManifest}/manifest.json (100%) rename samples/tab-channel-group-config-page-auth/csharp/ConfigTabAuthentication/{Manifest => AppManifest}/outline.png (100%) rename samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/{appPackage => AppManifest}/color.png (100%) rename samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/{appPackage => AppManifest}/manifest.json (100%) rename samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/{appPackage => AppManifest}/outline.png (100%) rename samples/tab-deeplink/csharp/DeepLinkBot/{Manifest => AppManifest}/color.png (100%) rename samples/tab-deeplink/csharp/DeepLinkBot/{Manifest => AppManifest}/manifest.json (100%) rename samples/tab-deeplink/csharp/DeepLinkBot/{Manifest => AppManifest}/outline.png (100%) rename samples/tab-deeplink/csharp/DeepLinkBot/{Manifest_Hub => AppManifest_Hub}/color.png (100%) rename samples/tab-deeplink/csharp/DeepLinkBot/{Manifest_Hub => AppManifest_Hub}/manifest.json (100%) rename samples/tab-deeplink/csharp/DeepLinkBot/{Manifest_Hub => AppManifest_Hub}/outline.png (100%) rename samples/tab-graph-toolkit/csharp/TabGraphToolkit/{appPackage => AppManifest}/color.png (100%) rename samples/tab-graph-toolkit/csharp/TabGraphToolkit/{appPackage => AppManifest}/manifest.json (100%) rename samples/tab-graph-toolkit/csharp/TabGraphToolkit/{appPackage => AppManifest}/outline.png (100%) rename samples/tab-people-picker/csharp/TabPeoplePicker/{Manifest => AppManifest}/color.png (100%) rename samples/tab-people-picker/csharp/TabPeoplePicker/{Manifest => AppManifest}/color.zip (100%) rename samples/tab-people-picker/csharp/TabPeoplePicker/{Manifest => AppManifest}/manifest.json (100%) rename samples/tab-people-picker/csharp/TabPeoplePicker/{Manifest => AppManifest}/outline.png (100%) rename samples/tab-personal-sso-quickstart/csharp_dotnetcore/{Manifest => AppManifest}/color.png (100%) rename samples/tab-personal-sso-quickstart/csharp_dotnetcore/{Manifest => AppManifest}/manifest.json (100%) rename samples/tab-personal-sso-quickstart/csharp_dotnetcore/{Manifest => AppManifest}/outline.png (100%) rename samples/tab-personal-sso-quickstart/csharp_dotnetcore/{Manifest_Hub => AppManifest_Hub}/color.png (100%) rename samples/tab-personal-sso-quickstart/csharp_dotnetcore/{Manifest_Hub => AppManifest_Hub}/manifest.json (100%) rename samples/tab-personal-sso-quickstart/csharp_dotnetcore/{Manifest_Hub => AppManifest_Hub}/outline.png (100%) rename samples/tab-product-inspection/csharp/ProductInspection/{Manifest => AppManifest}/color.png (100%) rename samples/tab-product-inspection/csharp/ProductInspection/{Manifest => AppManifest}/manifest.json (100%) rename samples/tab-product-inspection/csharp/ProductInspection/{Manifest => AppManifest}/outline.png (100%) rename samples/tab-product-inspection/csharp/ProductInspection/{Manifest_Hub => AppManifest_Hub}/color.png (100%) rename samples/tab-product-inspection/csharp/ProductInspection/{Manifest_Hub => AppManifest_Hub}/manifest.json (100%) rename samples/tab-product-inspection/csharp/ProductInspection/{Manifest_Hub => AppManifest_Hub}/outline.png (100%) rename samples/tab-request-approval/csharp/TabRequestApproval/{AppPackage => AppManifest}/color.png (100%) rename samples/tab-request-approval/csharp/TabRequestApproval/{AppPackage => AppManifest}/manifest.json (100%) rename samples/tab-request-approval/csharp/TabRequestApproval/{AppPackage => AppManifest}/outline.png (100%) rename samples/tab-sso/csharp/TeamsTabSSO/{Manifest => AppManifest}/color.png (100%) rename samples/tab-sso/csharp/TeamsTabSSO/{Manifest => AppManifest}/manifest.json (100%) rename samples/tab-sso/csharp/TeamsTabSSO/{Manifest => AppManifest}/outline.png (100%) rename samples/tab-sso/csharp/TeamsTabSSO/{Manifest_Hub => AppManifest_Hub}/color.png (100%) rename samples/tab-sso/csharp/TeamsTabSSO/{Manifest_Hub => AppManifest_Hub}/manifest.json (100%) rename samples/tab-sso/csharp/TeamsTabSSO/{Manifest_Hub => AppManifest_Hub}/outline.png (100%) rename samples/tab-stage-view/csharp/TabInStageView/{Manifest => AppManifest}/color.png (100%) rename samples/tab-stage-view/csharp/TabInStageView/{Manifest => AppManifest}/manifest.json (100%) rename samples/tab-stage-view/csharp/TabInStageView/{Manifest => AppManifest}/outline.png (100%) rename samples/tab-stage-view/csharp/TabInStageView/{Manifest_Hub => AppManifest_Hub}/color.png (100%) rename samples/tab-stage-view/csharp/TabInStageView/{Manifest_Hub => AppManifest_Hub}/manifest.json (100%) rename samples/tab-stage-view/csharp/TabInStageView/{Manifest_Hub => AppManifest_Hub}/outline.png (100%) rename samples/tab-staggered-permission/csharp/StaggeredPermission/{Manifest => AppManifest}/color.png (100%) rename samples/tab-staggered-permission/csharp/StaggeredPermission/{Manifest => AppManifest}/manifest.json (100%) rename samples/tab-staggered-permission/csharp/StaggeredPermission/{Manifest => AppManifest}/outline.png (100%) rename samples/tab-staggered-permission/csharp/StaggeredPermission/{Manifest_Hub => AppManifest_Hub}/color.png (100%) rename samples/tab-staggered-permission/csharp/StaggeredPermission/{Manifest_Hub => AppManifest_Hub}/manifest.json (100%) rename samples/tab-staggered-permission/csharp/StaggeredPermission/{Manifest_Hub => AppManifest_Hub}/outline.png (100%) diff --git a/README.md b/README.md index 5506285342..11408a406b 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ # Sample lists -1. [Ready to try sample manifests](#try-it-yourself---experience-the-apps-in-your-microsoft-teams-client) +1. [Ready to try sample app manifests](#try-it-yourself---experience-the-apps-in-your-microsoft-teams-client) 1. [Teams Toolkit samples](#samples-built-using-new-generation-of-teams-development-tool---teams-toolkit) 1. [Getting Started Samples and Tutorials](#getting-started---samples-and-tutorials) 1. [Tabs samples](#Tabs-samples) @@ -24,12 +24,12 @@ The [Teams Toolkit](https://marketplace.visualstudio.com/items?itemName=TeamsDev ## [Getting Started - Samples and Tutorials](https://docs.microsoft.com/microsoftteams/platform/tutorials/get-started-dotnet-app-studio) -| | Sample Name | Description | C# | TypeScript | Manifest +| | Sample Name | Description | C# | TypeScript | App Manifest |:--:|:-------------------|:---------------------------------------------------------------------------------------------------------------------------|:--------|:-------------|:-------------| |1|Hello World | Microsoft Teams hello world sample app. |[View][app-hello-world#cs] |[View][app-hello-world#ts] ![toolkit-icon](assets/toolkit-icon.png) |[View](/samples/app-hello-world/csharp/demo-manifest/app-hello-world.zip) ## [Tabs samples](https://docs.microsoft.com/microsoftteams/platform/tabs/what-are-tabs) -| | Sample Name | Description | C# | TypeScript | JavaScript | Manifest| +| | Sample Name | Description | C# | TypeScript | JavaScript | App Manifest| |:--:|:-------------------|:----------------------------------------------------------------------------------------------|:--------|:-------------|:---------|:--------| |1|Personal tabs | Sample app showing custom personal Tab with ASP. NET Core |[MVC][personal-tab#cs#mvc], [Razor][personal-tab#cs#razor] | [Yeoman Generator](https://docs.microsoft.com/microsoftteams/platform/tabs/quickstarts/create-personal-tab-node-yeoman#generate-your-project) | |[View](/samples/tab-personal/mvc-csharp/demo-manifest/tab-personal.zip) | |2|Personal tab quick-start| Sample personal tab quick-start app. | |[View][personal-tab-quickstart#ts] ![toolkit-icon](assets/toolkit-icon.png) |[View][personal-tab-quickstart#js] ![toolkit-icon](assets/toolkit-icon.png) @@ -59,7 +59,7 @@ The [Teams Toolkit](https://marketplace.visualstudio.com/items?itemName=TeamsDev >NOTE: >Visit the [Bot Framework Samples repository][botframework] to view Microsoft Bot Framework v4 SDK task-focused samples for C#, JavaScript, TypeScript, and Python. -| | Sample Name | Description | .NET | JavaScript | Python | Java | Manifest +| | Sample Name | Description | .NET | JavaScript | Python | Java | App Manifest |:--:|:-------------------|:---------------------------------------------------------------------------------|:--------|:-------------|:-------------|:-------------|:-------------| |1| Teams Conversation Bot quick-start | Messaging and conversation event handling hello world. | | [View][bot-conversation-quickstart#js] ![toolkit-icon](assets/toolkit-icon.png) | | | |2| Teams Conversation Bot SSO quick-start | Messaging and conversation event handling hello world with SSO. | [View][bot-conversation-sso-quickstart#csharp_dotnetcore] | [View][bot-conversation-sso-quickstart#js] ![toolkit-icon](assets/toolkit-icon.png) | | | @@ -96,7 +96,7 @@ The [Teams Toolkit](https://marketplace.visualstudio.com/items?itemName=TeamsDev >NOTE: >Visit the [Bot Framework Samples repository][botframework] to view Microsoft Bot Framework v4 SDK task-focused samples for C#, JavaScript, TypeScript, and Python. -| | Sample Name | Description | .NET | JavaScript | Python| Java | Manifest| +| | Sample Name | Description | .NET | JavaScript | Python| Java | App Manifest| |:--:|:-------------------|:---------------------------------------------------------------------------------|:--------|:-------------|:-------------|:-------------|:------------- |1|Messaging extensions - search quick-start | Hello world Messaging Extension that accepts search requests and returns results. | | [View][msgext-search-quickstart#js] ![toolkit-icon](assets/toolkit-icon.png) | ||[View](/samples/msgext-search-quickstart/js/demo-manifest/msgext-search-quickstart.zip) |2|Messaging extensions - search | Messaging Extension that accepts search requests and returns results. | [View][msgext-search#cs] | [View][msgext-search#js] ![toolkit-icon](assets/toolkit-icon.png) | [View][msgext-search#python] | [View][msgext-search#java]|[View](/samples/msgext-search/csharp/demo-manifest/msgext-search.zip) @@ -128,7 +128,7 @@ The [Teams Toolkit](https://marketplace.visualstudio.com/items?itemName=TeamsDev ## [Graph APIs](https://docs.microsoft.com/graph/teams-concept-overview) -| | Sample Name | Description | C# | JavaScript | Manifest +| | Sample Name | Description | C# | JavaScript | App Manifest |:--:|:-------------------|:-------------------------------------------------------------------------------------------------|:--------|:-------------|:-------------| |1|Resource Specific Consent (RSC) | This sample illustrates how you can use [Resource Specific Consent (RSC)](https://docs.microsoft.com/en-us/microsoftteams/platform/graph-api/rsc/resource-specific-consent) to call Graph APIs. . |[View][graph#rsc#cs] | [View][graph#rsc#js] ![toolkit-icon](assets/toolkit-icon.png) |[View](/samples/graph-rsc/csharp/demo-manifest/graph-rsc.zip) |2|Graph API Channel Life Cycle | This sample illustrates how you can use [Graph API Channel Life Cycle](https://docs.microsoft.com/en-us/graph/api/resources/channel?view=graph-rest-beta) to call Graph APIs. . |[View][graph#lifecycle#cs] | [View][graph#lifecycle#js] ![toolkit-icon](assets/toolkit-icon.png) @@ -156,7 +156,7 @@ The [Teams Toolkit](https://marketplace.visualstudio.com/items?itemName=TeamsDev ## Scenario specific samples -| | Sample Name | Description | C# | JavaScript |Manifest| +| | Sample Name | Description | C# | JavaScript |App Manifest| |:--:|:---------------|:---------------------------------------------------------------------------------|:------|:----------------|:-------| |1|Task Modules | Sample app showing off the Teams Task Module, a way to invoke custom code from a bot, a tab, or both! |[View][bot-task-module#cs] |[View][app-task-module#ts]|[View](/samples/bot-task-module/csharp/demo-manifest/bot-task-module.zip) |2|Authentication | Sample illustrating seamless inline authentication for Microsoft Teams apps. | | [View][app-auth#ts] diff --git a/samples/account-linking/csharp/.gitignore b/samples/account-linking/csharp/.gitignore index ff5b00c506..eb86e868e7 100644 --- a/samples/account-linking/csharp/.gitignore +++ b/samples/account-linking/csharp/.gitignore @@ -175,7 +175,7 @@ ecf/ rcf/ # Windows Store app package directories and files -AppPackages/ +AppManifest/ BundleArtifacts/ Package.StoreAssociation.xml _pkginfo.txt diff --git a/samples/account-linking/csharp/Manifest/color.png b/samples/account-linking/csharp/AppManifest/color.png similarity index 100% rename from samples/account-linking/csharp/Manifest/color.png rename to samples/account-linking/csharp/AppManifest/color.png diff --git a/samples/account-linking/csharp/Manifest/manifest.json b/samples/account-linking/csharp/AppManifest/manifest.json similarity index 100% rename from samples/account-linking/csharp/Manifest/manifest.json rename to samples/account-linking/csharp/AppManifest/manifest.json diff --git a/samples/account-linking/csharp/Manifest/outline.png b/samples/account-linking/csharp/AppManifest/outline.png similarity index 100% rename from samples/account-linking/csharp/Manifest/outline.png rename to samples/account-linking/csharp/AppManifest/outline.png diff --git a/samples/account-linking/csharp/README.md b/samples/account-linking/csharp/README.md index 99e4353933..306cc5b84c 100644 --- a/samples/account-linking/csharp/README.md +++ b/samples/account-linking/csharp/README.md @@ -77,7 +77,7 @@ For this example, we'll use the `590a2d6f8b31.ngrok-free.app` as our domain name Please follow the instructions on [creating an Azure AD application with Tab SSO](https://docs.microsoft.com/en-us/microsoftteams/platform/tabs/how-to/authentication/auth-aad-sso?tabs=dotnet#1-create-your-azure-ad-application). The fully qualified domain name will be the ngrok url from before. #### 2.1 Configure the app for v2 tokens -**IMPORTANT** Please ensure the `accessTokenAcceptedVersion` in the `Manifest` blade is set to `2`. +**IMPORTANT** Please ensure the `accessTokenAcceptedVersion` in the `AppManifest` blade is set to `2`. Please save for a future step @@ -101,7 +101,7 @@ Please save 2. A `client secret` ### 5. Filling in the Manifest file -Please fill in the following values into the `Manifest/Manifest.json` file (called out using the `{{ }}` fences) +Please fill in the following values into the `AppManifest/manifest.json` file (called out using the `{{ }}` fences) | Parameter | Value | |---|---| @@ -140,7 +140,7 @@ dotnet run ### 9. Installing the app Please follow the documentation on [creating a Microsoft Teams app package](https://docs.microsoft.com/en-us/microsoftteams/platform/concepts/build-and-test/apps-package) and [sideloading your app in Teams](https://docs.microsoft.com/en-us/microsoftteams/platform/concepts/build-and-test/apps-package). -The "manifest" in question is the `Manifest` directory filled out in step 5. +The "manifest" in question is the `AppManifest` directory filled out in step 5. ### 10. (Optional) Enable the Azure Ad version of the integration If you want to try out the implementation using Azure you will need to provision a few resources first diff --git a/samples/app-anonymous-users/csharp/TeamsAppManifest/color.png b/samples/app-anonymous-users/csharp/AppManifest/color.png similarity index 100% rename from samples/app-anonymous-users/csharp/TeamsAppManifest/color.png rename to samples/app-anonymous-users/csharp/AppManifest/color.png diff --git a/samples/app-anonymous-users/csharp/TeamsAppManifest/manifest.json b/samples/app-anonymous-users/csharp/AppManifest/manifest.json similarity index 100% rename from samples/app-anonymous-users/csharp/TeamsAppManifest/manifest.json rename to samples/app-anonymous-users/csharp/AppManifest/manifest.json diff --git a/samples/app-anonymous-users/csharp/TeamsAppManifest/outline.png b/samples/app-anonymous-users/csharp/AppManifest/outline.png similarity index 100% rename from samples/app-anonymous-users/csharp/TeamsAppManifest/outline.png rename to samples/app-anonymous-users/csharp/AppManifest/outline.png diff --git a/samples/app-anonymous-users/csharp/Readme.md b/samples/app-anonymous-users/csharp/Readme.md index 545efa0738..59990f0f40 100644 --- a/samples/app-anonymous-users/csharp/Readme.md +++ b/samples/app-anonymous-users/csharp/Readme.md @@ -144,11 +144,11 @@ This sample shows anonymous users support in meeting apps. 7. __*This step is specific to Teams.*__ -- **Edit** the `manifest.json` contained in the `TeamsAppManifest` folder to replace your Microsoft App Id `<>` (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) +- **Edit** the `manifest.json` contained in the `AppManifest` folder to replace your Microsoft App Id `<>` (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `{{domain-name}}` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. -- **Zip** up the contents of the `TeamsAppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) +- **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) diff --git a/samples/app-auth/nodejs/README.md b/samples/app-auth/nodejs/README.md index e0cf6114af..afa2bb924b 100644 --- a/samples/app-auth/nodejs/README.md +++ b/samples/app-auth/nodejs/README.md @@ -66,11 +66,11 @@ This sample demonstrates authentication in Microsoft Teams using bot and tab. > **IMPORTANT**: Do not use the legacy Bot Framework portal, nor App Studio, to create the bot. Your bot MUST be registered with > Azure Bot Service to use the authentication functionality provided by Azure Bot Service. -4. Create an app manifest. Navigate to the file, manifest/manifest.json - Change: +4. Create an app manifest. Navigate to the file, appManifest/manifest.json - Change: 1. <> (there are 3) change to your registered bot's app ID - 2. <> (there are 5) change to your https endpoint from tunnel excluding the "https://" part - **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `app-auth\nodejs\Manifest_Hub` folder with the required values. - 3. Zip up the contents of the `manifest` folder to create a `manifest.zip` or `Manifest_Hub` folder into a `Manifest_Hub.zip`. (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + 2. <> (there are 5) change to your https endpoint from ngrok excluding the "https://" part + **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `app-auth\nodejs\appManifestHub` folder with the required values. + 3. Zip up the contents of the `appManifest` folder to create a `manifest.zip` or `appManifestHub` folder into a `appManifestHub.zip`. (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) ## Setup @@ -136,7 +136,7 @@ Registering a bot with the Microsoft Bot Framework automatically creates a corre ### Update your Microsoft Teams application manifest -15. Add new properties to your Microsoft Teams manifest: +15. Add new properties to your Microsoft Teams app manifest: - **WebApplicationInfo** - The parent of the following elements. - **Id** - The client ID of the application. This is an application ID that you obtain as part of registering the application with Azure AD 1.0 endpoint. diff --git a/samples/app-auth/nodejs/Manifest_Hub/color.png b/samples/app-auth/nodejs/appManifest/color.png similarity index 100% rename from samples/app-auth/nodejs/Manifest_Hub/color.png rename to samples/app-auth/nodejs/appManifest/color.png diff --git a/samples/app-auth/nodejs/manifest/manifest.json b/samples/app-auth/nodejs/appManifest/manifest.json similarity index 100% rename from samples/app-auth/nodejs/manifest/manifest.json rename to samples/app-auth/nodejs/appManifest/manifest.json diff --git a/samples/app-auth/nodejs/Manifest_Hub/outline.png b/samples/app-auth/nodejs/appManifest/outline.png similarity index 100% rename from samples/app-auth/nodejs/Manifest_Hub/outline.png rename to samples/app-auth/nodejs/appManifest/outline.png diff --git a/samples/app-auth/nodejs/manifest/color.png b/samples/app-auth/nodejs/appManifestHub/color.png similarity index 100% rename from samples/app-auth/nodejs/manifest/color.png rename to samples/app-auth/nodejs/appManifestHub/color.png diff --git a/samples/app-auth/nodejs/Manifest_Hub/manifest.json b/samples/app-auth/nodejs/appManifestHub/manifest.json similarity index 100% rename from samples/app-auth/nodejs/Manifest_Hub/manifest.json rename to samples/app-auth/nodejs/appManifestHub/manifest.json diff --git a/samples/app-auth/nodejs/manifest/outline.png b/samples/app-auth/nodejs/appManifestHub/outline.png similarity index 100% rename from samples/app-auth/nodejs/manifest/outline.png rename to samples/app-auth/nodejs/appManifestHub/outline.png diff --git a/samples/app-auth/nodejs/gulpfile.js b/samples/app-auth/nodejs/gulpfile.js index 39b25c91df..ed2c115092 100644 --- a/samples/app-auth/nodejs/gulpfile.js +++ b/samples/app-auth/nodejs/gulpfile.js @@ -84,7 +84,7 @@ gulp.task('rebuild', gulp.series('clean', gulp.parallel('ts:lint', 'ts', 'static * Build manifest */ gulp.task('generate-manifest', function() { - gulp.src(['./manifest/*.png', 'manifest/manifest.json']) + gulp.src(['./appManifest/*.png', 'appManifest/manifest.json']) .pipe(zip('AuthBot.zip')) .pipe(gulp.dest('manifest')); }); diff --git a/samples/app-checkin-location/csharp/AppCheckinLocation/AppPackage/color.png b/samples/app-checkin-location/csharp/AppCheckinLocation/AppManifest/color.png similarity index 100% rename from samples/app-checkin-location/csharp/AppCheckinLocation/AppPackage/color.png rename to samples/app-checkin-location/csharp/AppCheckinLocation/AppManifest/color.png diff --git a/samples/app-checkin-location/csharp/AppCheckinLocation/AppPackage/manifest.json b/samples/app-checkin-location/csharp/AppCheckinLocation/AppManifest/manifest.json similarity index 100% rename from samples/app-checkin-location/csharp/AppCheckinLocation/AppPackage/manifest.json rename to samples/app-checkin-location/csharp/AppCheckinLocation/AppManifest/manifest.json diff --git a/samples/app-checkin-location/csharp/AppCheckinLocation/AppPackage/outline.png b/samples/app-checkin-location/csharp/AppCheckinLocation/AppManifest/outline.png similarity index 100% rename from samples/app-checkin-location/csharp/AppCheckinLocation/AppPackage/outline.png rename to samples/app-checkin-location/csharp/AppCheckinLocation/AppManifest/outline.png diff --git a/samples/app-checkin-location/csharp/README.md b/samples/app-checkin-location/csharp/README.md index a61c81701a..28ad503b23 100644 --- a/samples/app-checkin-location/csharp/README.md +++ b/samples/app-checkin-location/csharp/README.md @@ -100,14 +100,14 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 4) Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./AppPackage folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `AppPackage` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./AppPackage folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. ## Running the sample diff --git a/samples/app-complete-auth/csharp/AppCompleteAuth/Manifest_Hub/color.png b/samples/app-complete-auth/csharp/AppCompleteAuth/AppManifest_Hub/color.png similarity index 100% rename from samples/app-complete-auth/csharp/AppCompleteAuth/Manifest_Hub/color.png rename to samples/app-complete-auth/csharp/AppCompleteAuth/AppManifest_Hub/color.png diff --git a/samples/app-complete-auth/csharp/AppCompleteAuth/Manifest_Hub/manifest.json b/samples/app-complete-auth/csharp/AppCompleteAuth/AppManifest_Hub/manifest.json similarity index 100% rename from samples/app-complete-auth/csharp/AppCompleteAuth/Manifest_Hub/manifest.json rename to samples/app-complete-auth/csharp/AppCompleteAuth/AppManifest_Hub/manifest.json diff --git a/samples/app-complete-auth/csharp/AppCompleteAuth/Manifest_Hub/outline.png b/samples/app-complete-auth/csharp/AppCompleteAuth/AppManifest_Hub/outline.png similarity index 100% rename from samples/app-complete-auth/csharp/AppCompleteAuth/Manifest_Hub/outline.png rename to samples/app-complete-auth/csharp/AppCompleteAuth/AppManifest_Hub/outline.png diff --git a/samples/app-complete-auth/csharp/README.md b/samples/app-complete-auth/csharp/README.md index 36910504be..a50af89fbd 100644 --- a/samples/app-complete-auth/csharp/README.md +++ b/samples/app-complete-auth/csharp/README.md @@ -161,9 +161,9 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can - `{{Microsoft-App-Id}}` with Application id generated from Step 3 - `{Base_URL_Domain}` - Your application's base url domain. E.g. for https://12345.ngrok-free.app the base url domain will be 12345.ngrok-free.app if you are using ngrok and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. -**Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `app-complete-auth\csharp\AppCompleteAuth\Manifest_Hub` folder with the required values. +**Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `app-complete-auth\csharp\AppCompleteAuth\AppManifest_Hub` folder with the required values. -2. Zip up the contents of the `AppManifest` folder to create a `manifest.zip` or `Manifest_Hub` folder into a `Manifest_Hub.zip`. (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) +2. Zip up the contents of the `AppManifest` folder to create a `manifest.zip` or `AppManifest_Hub` folder into a `AppManifest_Hub.zip`. (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) 3. Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams and then go to side panel, select Apps @@ -307,4 +307,4 @@ To learn more about deploying a bot to Azure, see [Deploy your bot to Azure](htt - [Create facebook app for development](https://developers.facebook.com/docs/development/create-an-app/) - \ No newline at end of file + diff --git a/samples/app-complete-sample/csharp/.gitignore b/samples/app-complete-sample/csharp/.gitignore index 940794e60f..763e8697f9 100644 --- a/samples/app-complete-sample/csharp/.gitignore +++ b/samples/app-complete-sample/csharp/.gitignore @@ -179,7 +179,7 @@ ecf/ rcf/ # Windows Store app package directories and files -AppPackages/ +AppManifest/ BundleArtifacts/ Package.StoreAssociation.xml _pkginfo.txt diff --git a/samples/app-complete-sample/csharp/manifest/color.png b/samples/app-complete-sample/csharp/AppManifest_Hub/color.png similarity index 100% rename from samples/app-complete-sample/csharp/manifest/color.png rename to samples/app-complete-sample/csharp/AppManifest_Hub/color.png diff --git a/samples/app-complete-sample/csharp/manifest_hub/manifest.json b/samples/app-complete-sample/csharp/AppManifest_Hub/manifest.json similarity index 100% rename from samples/app-complete-sample/csharp/manifest_hub/manifest.json rename to samples/app-complete-sample/csharp/AppManifest_Hub/manifest.json diff --git a/samples/app-complete-sample/csharp/manifest/outline.png b/samples/app-complete-sample/csharp/AppManifest_Hub/outline.png similarity index 100% rename from samples/app-complete-sample/csharp/manifest/outline.png rename to samples/app-complete-sample/csharp/AppManifest_Hub/outline.png diff --git a/samples/app-complete-sample/csharp/README.md b/samples/app-complete-sample/csharp/README.md index d3498edcb1..9ed5ed2c1f 100644 --- a/samples/app-complete-sample/csharp/README.md +++ b/samples/app-complete-sample/csharp/README.md @@ -32,7 +32,7 @@ Sample that shows how to build a bot for Microsoft Teams in C#. ![ Module ](template-bot-master-csharp/Images/Sample.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Microsoft Teams Bot:** [Manifest](/samples/app-complete-sample/csharp/demo-manifest/Complete-Sample.zip) @@ -72,7 +72,7 @@ NOTE: Teams does not work nor render things exactly like the Bot Emulator, but i Alternatively, you can also use the `dev tunnels`. Please follow [Create and host a dev tunnel](https://learn.microsoft.com/en-us/azure/developer/dev-tunnels/get-started?tabs=windows) and host the tunnel with anonymous user access command as shown below: - ```bash + ```bash devtunnel host -p 3978 --allow-anonymous ``` @@ -119,17 +119,17 @@ NOTE: Teams does not work nor render things exactly like the Bot Emulator, but i 7. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./manifest or ./manifest_hub folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest or ./AppManifest_Hub folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `manifest` or 'manifest_hub.json' folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` or `AppManifest_Hub` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. -**Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `/manifest_hub` folder with the required values. +**Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `/AppManifest_Hub` folder with the required values. **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/app-complete-sample/csharp/AdapterWithErrorHandler.cs#L23) line and put your debugger for local debug. @@ -152,7 +152,7 @@ Most code files that need to be compile reside in the src directory. Most files ## Files and Directories -* **manifest**

+* **appManifest**

This directory holds the skeleton of a manifest.json file that can be altered in order sideload this application into a team. * **middleware**

diff --git a/samples/app-complete-sample/csharp/manifest_hub/color.png b/samples/app-complete-sample/csharp/appManifest/color.png similarity index 100% rename from samples/app-complete-sample/csharp/manifest_hub/color.png rename to samples/app-complete-sample/csharp/appManifest/color.png diff --git a/samples/app-complete-sample/csharp/manifest/manifest.json b/samples/app-complete-sample/csharp/appManifest/manifest.json similarity index 100% rename from samples/app-complete-sample/csharp/manifest/manifest.json rename to samples/app-complete-sample/csharp/appManifest/manifest.json diff --git a/samples/app-complete-sample/csharp/manifest_hub/outline.png b/samples/app-complete-sample/csharp/appManifest/outline.png similarity index 100% rename from samples/app-complete-sample/csharp/manifest_hub/outline.png rename to samples/app-complete-sample/csharp/appManifest/outline.png diff --git a/samples/app-hello-world/csharp/.gitignore b/samples/app-hello-world/csharp/.gitignore index 940794e60f..763e8697f9 100644 --- a/samples/app-hello-world/csharp/.gitignore +++ b/samples/app-hello-world/csharp/.gitignore @@ -179,7 +179,7 @@ ecf/ rcf/ # Windows Store app package directories and files -AppPackages/ +AppManifest/ BundleArtifacts/ Package.StoreAssociation.xml _pkginfo.txt diff --git a/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Manifest/color.png b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/AppManifest/color.png similarity index 100% rename from samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Manifest/color.png rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/AppManifest/color.png diff --git a/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Manifest/manifest.json b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/AppManifest/manifest.json similarity index 100% rename from samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Manifest/manifest.json rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/AppManifest/manifest.json diff --git a/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Manifest/outline.png b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/AppManifest/outline.png similarity index 100% rename from samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Manifest/outline.png rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/AppManifest/outline.png diff --git a/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Manifest_Hub/color.png b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/AppManifest_Hub/color.png similarity index 100% rename from samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Manifest_Hub/color.png rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/AppManifest_Hub/color.png diff --git a/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Manifest_Hub/manifest.json b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/AppManifest_Hub/manifest.json similarity index 100% rename from samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Manifest_Hub/manifest.json rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/AppManifest_Hub/manifest.json diff --git a/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Manifest_Hub/outline.png b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/AppManifest_Hub/outline.png similarity index 100% rename from samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Manifest_Hub/outline.png rename to samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/AppManifest_Hub/outline.png diff --git a/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Microsoft.Teams.Samples.HelloWorld.Web.csproj b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Microsoft.Teams.Samples.HelloWorld.Web.csproj index b2b323a6fb..b97ba2490d 100644 --- a/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Microsoft.Teams.Samples.HelloWorld.Web.csproj +++ b/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Microsoft.Teams.Samples.HelloWorld.Web.csproj @@ -23,10 +23,4 @@ Always - - - - - - diff --git a/samples/app-hello-world/csharp/README.md b/samples/app-hello-world/csharp/README.md index a937ed2248..95dac884e2 100644 --- a/samples/app-hello-world/csharp/README.md +++ b/samples/app-hello-world/csharp/README.md @@ -94,13 +94,13 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can - **This step is specific to Teams.** -1) Modify the `manifest.json` in the `/Manifest` folder and replace the following details: +1) Modify the `manifest.json` in the `/AppManifest` folder and replace the following details: - `{{Microsoft-App-Id}}` with Application id generated from Step 1 - `{{domain-name}}` with base Url domain. E.g. if you are using ngrok it would be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `/Manifest_Hub` folder with the required values. + **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `/AppManifest_Hub` folder with the required values. -2) Zip the contents of `Manifest` or `Manifest_Hub` folder into a `manifest.zip`. +2) Zip the contents of `AppManifest` or `AppManifest_Hub` folder into a `manifest.zip`. 3) Modify the `/appsettings.json` and fill in the following details: - `{{Microsoft-App-Id}}` - Generated from Step 1 is the application app id @@ -110,7 +110,7 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 5) Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./Manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/AdapterWithErrorHandler.cs#L24) line and put your debugger for local debug. diff --git a/samples/app-installation-using-qr-code/csharp/QRAppInstallation/AppPackage/color.png b/samples/app-installation-using-qr-code/csharp/QRAppInstallation/AppManifest/color.png similarity index 100% rename from samples/app-installation-using-qr-code/csharp/QRAppInstallation/AppPackage/color.png rename to samples/app-installation-using-qr-code/csharp/QRAppInstallation/AppManifest/color.png diff --git a/samples/app-installation-using-qr-code/csharp/QRAppInstallation/AppPackage/manifest.json b/samples/app-installation-using-qr-code/csharp/QRAppInstallation/AppManifest/manifest.json similarity index 100% rename from samples/app-installation-using-qr-code/csharp/QRAppInstallation/AppPackage/manifest.json rename to samples/app-installation-using-qr-code/csharp/QRAppInstallation/AppManifest/manifest.json diff --git a/samples/app-installation-using-qr-code/csharp/QRAppInstallation/AppPackage/outline.png b/samples/app-installation-using-qr-code/csharp/QRAppInstallation/AppManifest/outline.png similarity index 100% rename from samples/app-installation-using-qr-code/csharp/QRAppInstallation/AppPackage/outline.png rename to samples/app-installation-using-qr-code/csharp/QRAppInstallation/AppManifest/outline.png diff --git a/samples/app-installation-using-qr-code/csharp/README.md b/samples/app-installation-using-qr-code/csharp/README.md index 8653b9285d..001d9382bc 100644 --- a/samples/app-installation-using-qr-code/csharp/README.md +++ b/samples/app-installation-using-qr-code/csharp/README.md @@ -114,16 +114,16 @@ Please follow link [Add authentication to your bot](https://docs.microsoft.com/m - Select `QRAppInstallation.csproj` file - Press `F5` to run the project -- Modify the `manifest.json` in the `/AppPackage` folder and replace the following details: +- Modify the `manifest.json` in the `/AppManifest` folder and replace the following details: - `{{Microsoft-App-Id}}` with AAD app registration Application id, generated from Step 1 - `{{domain-name}}` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. -- Zip the contents of `AppPackage` folder into a `manifest.zip`, and use the `manifest.zip` to deploy in app store or add to Teams. +- Zip the contents of `AppManifest` folder into a `manifest.zip`, and use the `manifest.zip` to deploy in app store or add to Teams. - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./AppPackage folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. - **Note** diff --git a/samples/app-link-unfurling-in-share-to-teams/csharp/README.md b/samples/app-link-unfurling-in-share-to-teams/csharp/README.md index dd337d7848..c4adbfeeca 100644 --- a/samples/app-link-unfurling-in-share-to-teams/csharp/README.md +++ b/samples/app-link-unfurling-in-share-to-teams/csharp/README.md @@ -90,14 +90,14 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 4) Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./AppPackage folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `AppPackage` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./AppPackage folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. ## Running the sample diff --git a/samples/app-localization/csharp/.gitignore b/samples/app-localization/csharp/.gitignore index 940794e60f..763e8697f9 100644 --- a/samples/app-localization/csharp/.gitignore +++ b/samples/app-localization/csharp/.gitignore @@ -179,7 +179,7 @@ ecf/ rcf/ # Windows Store app package directories and files -AppPackages/ +AppManifest/ BundleArtifacts/ Package.StoreAssociation.xml _pkginfo.txt diff --git a/samples/app-localization/csharp/Localization/Manifest/contoso20x20.png b/samples/app-localization/csharp/Localization/AppManifest/contoso20x20.png similarity index 100% rename from samples/app-localization/csharp/Localization/Manifest/contoso20x20.png rename to samples/app-localization/csharp/Localization/AppManifest/contoso20x20.png diff --git a/samples/app-localization/csharp/Localization/Manifest/contoso96x96.png b/samples/app-localization/csharp/Localization/AppManifest/contoso96x96.png similarity index 100% rename from samples/app-localization/csharp/Localization/Manifest/contoso96x96.png rename to samples/app-localization/csharp/Localization/AppManifest/contoso96x96.png diff --git a/samples/app-localization/csharp/Localization/Manifest/es-mx.json b/samples/app-localization/csharp/Localization/AppManifest/es-mx.json similarity index 100% rename from samples/app-localization/csharp/Localization/Manifest/es-mx.json rename to samples/app-localization/csharp/Localization/AppManifest/es-mx.json diff --git a/samples/app-localization/csharp/Localization/Manifest/fr-ca.json b/samples/app-localization/csharp/Localization/AppManifest/fr-ca.json similarity index 100% rename from samples/app-localization/csharp/Localization/Manifest/fr-ca.json rename to samples/app-localization/csharp/Localization/AppManifest/fr-ca.json diff --git a/samples/app-localization/csharp/Localization/Manifest/hi-in.json b/samples/app-localization/csharp/Localization/AppManifest/hi-in.json similarity index 100% rename from samples/app-localization/csharp/Localization/Manifest/hi-in.json rename to samples/app-localization/csharp/Localization/AppManifest/hi-in.json diff --git a/samples/app-localization/csharp/Localization/Manifest/manifest.json b/samples/app-localization/csharp/Localization/AppManifest/manifest.json similarity index 100% rename from samples/app-localization/csharp/Localization/Manifest/manifest.json rename to samples/app-localization/csharp/Localization/AppManifest/manifest.json diff --git a/samples/app-localization/csharp/Localization/Manifest_hub/contoso20x20.png b/samples/app-localization/csharp/Localization/AppManifest_Hub/contoso20x20.png similarity index 100% rename from samples/app-localization/csharp/Localization/Manifest_hub/contoso20x20.png rename to samples/app-localization/csharp/Localization/AppManifest_Hub/contoso20x20.png diff --git a/samples/app-localization/csharp/Localization/Manifest_hub/contoso96x96.png b/samples/app-localization/csharp/Localization/AppManifest_Hub/contoso96x96.png similarity index 100% rename from samples/app-localization/csharp/Localization/Manifest_hub/contoso96x96.png rename to samples/app-localization/csharp/Localization/AppManifest_Hub/contoso96x96.png diff --git a/samples/app-localization/csharp/Localization/Manifest_hub/es-mx.json b/samples/app-localization/csharp/Localization/AppManifest_Hub/es-mx.json similarity index 100% rename from samples/app-localization/csharp/Localization/Manifest_hub/es-mx.json rename to samples/app-localization/csharp/Localization/AppManifest_Hub/es-mx.json diff --git a/samples/app-localization/csharp/Localization/Manifest_hub/fr-ca.json b/samples/app-localization/csharp/Localization/AppManifest_Hub/fr-ca.json similarity index 100% rename from samples/app-localization/csharp/Localization/Manifest_hub/fr-ca.json rename to samples/app-localization/csharp/Localization/AppManifest_Hub/fr-ca.json diff --git a/samples/app-localization/csharp/Localization/Manifest_hub/hi-in.json b/samples/app-localization/csharp/Localization/AppManifest_Hub/hi-in.json similarity index 100% rename from samples/app-localization/csharp/Localization/Manifest_hub/hi-in.json rename to samples/app-localization/csharp/Localization/AppManifest_Hub/hi-in.json diff --git a/samples/app-localization/csharp/Localization/Manifest_hub/manifest.json b/samples/app-localization/csharp/Localization/AppManifest_Hub/manifest.json similarity index 100% rename from samples/app-localization/csharp/Localization/Manifest_hub/manifest.json rename to samples/app-localization/csharp/Localization/AppManifest_Hub/manifest.json diff --git a/samples/app-localization/csharp/Localization/Localization.csproj b/samples/app-localization/csharp/Localization/Localization.csproj index eb97bf6a4a..4c39fe869f 100644 --- a/samples/app-localization/csharp/Localization/Localization.csproj +++ b/samples/app-localization/csharp/Localization/Localization.csproj @@ -17,26 +17,22 @@ - + Always - - - PublicResXFileCodeGenerator - - - PublicResXFileCodeGenerator - - - PublicResXFileCodeGenerator - - - - - - + + + PublicResXFileCodeGenerator + + + PublicResXFileCodeGenerator + + + PublicResXFileCodeGenerator + + - + \ No newline at end of file diff --git a/samples/app-localization/csharp/README.md b/samples/app-localization/csharp/README.md index b433931ab8..c03a32cd47 100644 --- a/samples/app-localization/csharp/README.md +++ b/samples/app-localization/csharp/README.md @@ -81,13 +81,13 @@ Verify you have the right account for building Teams apps and install some recom - Select `Localization.csproj` file 6. This step is related to Microsoft Teams app manifest - - **Edit** the `manifest.json` contained in the `Manifest` or `Manifest_hub` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` and <> and for the contentUrl "<>?culture={locale}" (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - - **Provide turnnelling Url** in `manifest.json` for contentUrl in case of tabs and for messaging endpoint in case of bots if enabled. - - replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. + - **Edit** the `manifest.json` contained in the `AppManifest` or `AppManifest_Hub` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` and <> and for the contentUrl "<>?culture={locale}" (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Provide turnnelling Url** in `manifest.json` for contentUrl in case of tabs and for messaging endpoint in case of bots if enabled + - replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - **Zip** up the contents of the `Manifest` or `Manifest_hub` folder to create a `manifest.zip` - **Upload** the `manifest.zip` to Teams (in the Apps view click "Upload a custom app") -**Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `/Manifest_Hub` folder with the required values. +**Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `/AppManifest_Hub` folder with the required values. **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/app-localization/csharp/Localization/AdapterWithErrorHandler.cs#L24) line and put your debugger for local debug. diff --git a/samples/app-region-selection/csharp/RegionSectionApp/TeamsAppManifest/color.png b/samples/app-region-selection/csharp/RegionSectionApp/AppManifest/color.png similarity index 100% rename from samples/app-region-selection/csharp/RegionSectionApp/TeamsAppManifest/color.png rename to samples/app-region-selection/csharp/RegionSectionApp/AppManifest/color.png diff --git a/samples/app-region-selection/csharp/RegionSectionApp/TeamsAppManifest/manifest.json b/samples/app-region-selection/csharp/RegionSectionApp/AppManifest/manifest.json similarity index 100% rename from samples/app-region-selection/csharp/RegionSectionApp/TeamsAppManifest/manifest.json rename to samples/app-region-selection/csharp/RegionSectionApp/AppManifest/manifest.json diff --git a/samples/app-region-selection/csharp/RegionSectionApp/TeamsAppManifest/outline.png b/samples/app-region-selection/csharp/RegionSectionApp/AppManifest/outline.png similarity index 100% rename from samples/app-region-selection/csharp/RegionSectionApp/TeamsAppManifest/outline.png rename to samples/app-region-selection/csharp/RegionSectionApp/AppManifest/outline.png diff --git a/samples/app-sso/csharp/App SSO Sample/Manifest_Hub/icon-color.png b/samples/app-sso/csharp/App SSO Sample/AppManifest/icon-color.png similarity index 100% rename from samples/app-sso/csharp/App SSO Sample/Manifest_Hub/icon-color.png rename to samples/app-sso/csharp/App SSO Sample/AppManifest/icon-color.png diff --git a/samples/app-sso/csharp/App SSO Sample/Manifest_Hub/icon-outline.png b/samples/app-sso/csharp/App SSO Sample/AppManifest/icon-outline.png similarity index 100% rename from samples/app-sso/csharp/App SSO Sample/Manifest_Hub/icon-outline.png rename to samples/app-sso/csharp/App SSO Sample/AppManifest/icon-outline.png diff --git a/samples/app-sso/csharp/App SSO Sample/TeamsAppManifest/manifest.json b/samples/app-sso/csharp/App SSO Sample/AppManifest/manifest.json similarity index 100% rename from samples/app-sso/csharp/App SSO Sample/TeamsAppManifest/manifest.json rename to samples/app-sso/csharp/App SSO Sample/AppManifest/manifest.json diff --git a/samples/app-sso/csharp/App SSO Sample/TeamsAppManifest/icon-color.png b/samples/app-sso/csharp/App SSO Sample/AppManifest_Hub/icon-color.png similarity index 100% rename from samples/app-sso/csharp/App SSO Sample/TeamsAppManifest/icon-color.png rename to samples/app-sso/csharp/App SSO Sample/AppManifest_Hub/icon-color.png diff --git a/samples/app-sso/csharp/App SSO Sample/TeamsAppManifest/icon-outline.png b/samples/app-sso/csharp/App SSO Sample/AppManifest_Hub/icon-outline.png similarity index 100% rename from samples/app-sso/csharp/App SSO Sample/TeamsAppManifest/icon-outline.png rename to samples/app-sso/csharp/App SSO Sample/AppManifest_Hub/icon-outline.png diff --git a/samples/app-sso/csharp/App SSO Sample/Manifest_Hub/manifest.json b/samples/app-sso/csharp/App SSO Sample/AppManifest_Hub/manifest.json similarity index 100% rename from samples/app-sso/csharp/App SSO Sample/Manifest_Hub/manifest.json rename to samples/app-sso/csharp/App SSO Sample/AppManifest_Hub/manifest.json diff --git a/samples/app-sso/csharp/README.md b/samples/app-sso/csharp/README.md index 83a6e56a69..01842bade3 100644 --- a/samples/app-sso/csharp/README.md +++ b/samples/app-sso/csharp/README.md @@ -183,10 +183,10 @@ Refer to [Bot SSO Setup document](https://github.com/OfficeDev/Microsoft-Teams-S ### 5. Setup Manifest for Teams **This step is specific to Teams.** - - **Edit** the `manifest.json` contained in the `TeamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the `AppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and `<>` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `app-sso\csharp\App SSO Sample` folder with the required values. - - **Zip** up the contents of the `TeamsAppManifest` folder to create a `manifest.zip` or `Manifest_Hub` folder into a `manifest.zip`.(Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` or `AppManifest_Hub` folder into a `manifest.zip`.(Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) **Note**: This `manifest.json` specified that the bot will be installed in a "personal" scope only. Please refer to Teams documentation for more details. diff --git a/samples/app-task-module/csharp/.gitignore b/samples/app-task-module/csharp/.gitignore index 3e759b75bf..a16066a89e 100644 --- a/samples/app-task-module/csharp/.gitignore +++ b/samples/app-task-module/csharp/.gitignore @@ -198,7 +198,7 @@ ecf/ rcf/ # Windows Store app package directories and files -AppPackages/ +AppManifest/ BundleArtifacts/ Package.StoreAssociation.xml _pkginfo.txt diff --git a/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Manifest/color_icon.png b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/AppManifest/color_icon.png similarity index 100% rename from samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Manifest/color_icon.png rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/AppManifest/color_icon.png diff --git a/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Manifest/manifest.json b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/AppManifest/manifest.json similarity index 100% rename from samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Manifest/manifest.json rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/AppManifest/manifest.json diff --git a/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Manifest/outline_icon.png b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/AppManifest/outline_icon.png similarity index 100% rename from samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Manifest/outline_icon.png rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/AppManifest/outline_icon.png diff --git a/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Manifest_Hub/color_icon.png b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/AppManifest_Hub/color_icon.png similarity index 100% rename from samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Manifest_Hub/color_icon.png rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/AppManifest_Hub/color_icon.png diff --git a/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Manifest_Hub/manifest.json b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/AppManifest_Hub/manifest.json similarity index 100% rename from samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Manifest_Hub/manifest.json rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/AppManifest_Hub/manifest.json diff --git a/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Manifest_Hub/outline_icon.png b/samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/AppManifest_Hub/outline_icon.png similarity index 100% rename from samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/Manifest_Hub/outline_icon.png rename to samples/app-task-module/csharp/Microsoft.Teams.Samples.TaskModule.Web/AppManifest_Hub/outline_icon.png diff --git a/samples/app-task-module/csharp/README.md b/samples/app-task-module/csharp/README.md index f7a62c72c4..134ee6e0a8 100644 --- a/samples/app-task-module/csharp/README.md +++ b/samples/app-task-module/csharp/README.md @@ -97,15 +97,15 @@ Task modules build on the foundation of Microsoft Teams tabs: a task module is e 5. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./Manifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `app-task-module\csharp\Microsoft.Teams.Samples.TaskModule.Web\Manifest_Hub` folder with the required values. - - **Zip** up the contents of the `Manifest` folder to create a `Manifest.zip` or `Manifest_Hub` folder into a `Manifest_Hub.zip`. (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. + - **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `app-task-module\csharp\Microsoft.Teams.Samples.TaskModule.Web\AppManifest_Hub` folder with the required values. + - **Zip** up the contents of the `AppManifest` folder to create a `Manifest.zip` or `AppManifest_Hub` folder into a `AppManifest_Hub.zip`. (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./Manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. ## Deploy the bot to Azure diff --git a/samples/bot-adaptive-card-actions/csharp/AdaptiveCardActions/AppPackage/color.png b/samples/bot-adaptive-card-actions/csharp/AdaptiveCardActions/AppManifest/color.png similarity index 100% rename from samples/bot-adaptive-card-actions/csharp/AdaptiveCardActions/AppPackage/color.png rename to samples/bot-adaptive-card-actions/csharp/AdaptiveCardActions/AppManifest/color.png diff --git a/samples/bot-adaptive-card-actions/csharp/AdaptiveCardActions/AppPackage/manifest.json b/samples/bot-adaptive-card-actions/csharp/AdaptiveCardActions/AppManifest/manifest.json similarity index 100% rename from samples/bot-adaptive-card-actions/csharp/AdaptiveCardActions/AppPackage/manifest.json rename to samples/bot-adaptive-card-actions/csharp/AdaptiveCardActions/AppManifest/manifest.json diff --git a/samples/bot-adaptive-card-actions/csharp/AdaptiveCardActions/AppPackage/outline.png b/samples/bot-adaptive-card-actions/csharp/AdaptiveCardActions/AppManifest/outline.png similarity index 100% rename from samples/bot-adaptive-card-actions/csharp/AdaptiveCardActions/AppPackage/outline.png rename to samples/bot-adaptive-card-actions/csharp/AdaptiveCardActions/AppManifest/outline.png diff --git a/samples/bot-adaptive-card-actions/csharp/README.md b/samples/bot-adaptive-card-actions/csharp/README.md index 9abd42479f..0619e330d9 100644 --- a/samples/bot-adaptive-card-actions/csharp/README.md +++ b/samples/bot-adaptive-card-actions/csharp/README.md @@ -81,14 +81,14 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 4. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./AppPackage folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{Domain-Name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `AppPackage` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./AppPackage folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/bot-adaptive-card-actions/csharp/AdaptiveCardActions/AdapterWithErrorHandler.cs#L28) line and put your debugger for local debug. diff --git a/samples/bot-adaptivecards-user-specific-views/csharp/.gitignore b/samples/bot-adaptivecards-user-specific-views/csharp/.gitignore index 1ee53850b8..04e6900642 100644 --- a/samples/bot-adaptivecards-user-specific-views/csharp/.gitignore +++ b/samples/bot-adaptivecards-user-specific-views/csharp/.gitignore @@ -214,7 +214,7 @@ ecf/ rcf/ # Windows Store app package directories and files -AppPackages/ +AppManifest/ BundleArtifacts/ Package.StoreAssociation.xml _pkginfo.txt diff --git a/samples/bot-adaptivecards-user-specific-views/csharp/AppPackage/color.png b/samples/bot-adaptivecards-user-specific-views/csharp/AppManifest/color.png similarity index 100% rename from samples/bot-adaptivecards-user-specific-views/csharp/AppPackage/color.png rename to samples/bot-adaptivecards-user-specific-views/csharp/AppManifest/color.png diff --git a/samples/bot-adaptivecards-user-specific-views/csharp/AppPackage/manifest.json b/samples/bot-adaptivecards-user-specific-views/csharp/AppManifest/manifest.json similarity index 100% rename from samples/bot-adaptivecards-user-specific-views/csharp/AppPackage/manifest.json rename to samples/bot-adaptivecards-user-specific-views/csharp/AppManifest/manifest.json diff --git a/samples/bot-adaptivecards-user-specific-views/csharp/AppPackage/outline.png b/samples/bot-adaptivecards-user-specific-views/csharp/AppManifest/outline.png similarity index 100% rename from samples/bot-adaptivecards-user-specific-views/csharp/AppPackage/outline.png rename to samples/bot-adaptivecards-user-specific-views/csharp/AppManifest/outline.png diff --git a/samples/bot-adaptivecards-user-specific-views/csharp/README.md b/samples/bot-adaptivecards-user-specific-views/csharp/README.md index 6439bf39bd..988569c14a 100644 --- a/samples/bot-adaptivecards-user-specific-views/csharp/README.md +++ b/samples/bot-adaptivecards-user-specific-views/csharp/README.md @@ -140,9 +140,9 @@ the Teams service needs to call into the bot. 1) Run your bot, either from Visual Studio with `F5` or using `dotnet run` in the appropriate folder. 1) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `AppPackage` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the `AppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - - **Zip** up the contents of the `AppPackage` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) - Add the app to personal/team/chat/Meeting scope (Supported scopes) diff --git a/samples/bot-all-cards/csharp/BotAllCards/Manifest/color.png b/samples/bot-all-cards/csharp/BotAllCards/AppManifest/color.png similarity index 100% rename from samples/bot-all-cards/csharp/BotAllCards/Manifest/color.png rename to samples/bot-all-cards/csharp/BotAllCards/AppManifest/color.png diff --git a/samples/bot-all-cards/csharp/BotAllCards/Manifest/manifest.json b/samples/bot-all-cards/csharp/BotAllCards/AppManifest/manifest.json similarity index 100% rename from samples/bot-all-cards/csharp/BotAllCards/Manifest/manifest.json rename to samples/bot-all-cards/csharp/BotAllCards/AppManifest/manifest.json diff --git a/samples/bot-all-cards/csharp/BotAllCards/Manifest/outline.png b/samples/bot-all-cards/csharp/BotAllCards/AppManifest/outline.png similarity index 100% rename from samples/bot-all-cards/csharp/BotAllCards/Manifest/outline.png rename to samples/bot-all-cards/csharp/BotAllCards/AppManifest/outline.png diff --git a/samples/bot-all-cards/csharp/README.md b/samples/bot-all-cards/csharp/README.md index 42dac36e01..7dded62e37 100644 --- a/samples/bot-all-cards/csharp/README.md +++ b/samples/bot-all-cards/csharp/README.md @@ -115,11 +115,11 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can - **This step is specific to Teams.** -1) Modify the `manifest.json` in the `/Manifest` folder and replace the following details: +1) Modify the `manifest.json` in the `/AppManifest` folder and replace the following details: - `{{Microsoft-App-Id}}` with Application id generated from Step 1 - `{{domain-name}}` with base Url domain. E.g. if you are using ngrok it would be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be `12345.devtunnels.ms`. -2) Zip the contents of `Manifest` folder into a `manifest.zip`. +2) Zip the contents of `AppManifest` folder into a `manifest.zip`. 3) Modify the `/appsettings.json` and fill in the following details: - `{{Microsoft-App-Id}}` - Generated from Step 1 is the application app id @@ -137,7 +137,7 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 5) Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./Manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. ## Running the sample diff --git a/samples/bot-archive-groupchat-messages/csharp/FetchGroupChatMessages/README.md b/samples/bot-archive-groupchat-messages/csharp/FetchGroupChatMessages/README.md index 05e709bcbd..ce039e3f05 100644 --- a/samples/bot-archive-groupchat-messages/csharp/FetchGroupChatMessages/README.md +++ b/samples/bot-archive-groupchat-messages/csharp/FetchGroupChatMessages/README.md @@ -52,7 +52,7 @@ This feature shown in this sample is currently available in Public Developer Pre 8. Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./appPackage folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your tab is uploaded to Teams ## To try this sample diff --git a/samples/bot-archive-groupchat-messages/csharp/README.md b/samples/bot-archive-groupchat-messages/csharp/README.md index 887f636422..e12065fa69 100644 --- a/samples/bot-archive-groupchat-messages/csharp/README.md +++ b/samples/bot-archive-groupchat-messages/csharp/README.md @@ -128,13 +128,15 @@ This feature shown in this sample is currently available in Public Developer Pre 5. Setup Manifest for Teams - __*This step is specific to Teams.*__ - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `manifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app`. + - **Edit** the `manifest.json` for `"webApplicationInfo"` resource `"api://botid-<>"` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your resource will be `api://botid-<>`. + + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/bot-archive-groupchat-messages/csharp/FetchGroupChatMessages/AdapterWithErrorHandler.cs#L23) line and put your debugger for local debug. diff --git a/samples/bot-calling-meeting/csharp/.gitignore b/samples/bot-calling-meeting/csharp/.gitignore index 8c956f6aaa..ebf8f70b0e 100644 --- a/samples/bot-calling-meeting/csharp/.gitignore +++ b/samples/bot-calling-meeting/csharp/.gitignore @@ -218,7 +218,7 @@ ecf/ rcf/ # Windows Store app package directories and files -AppPackages/ +AppManifest/ BundleArtifacts/ Package.StoreAssociation.xml _pkginfo.txt diff --git a/samples/bot-calling-meeting/csharp/README.md b/samples/bot-calling-meeting/csharp/README.md index 58d32d27f2..bc81dfc160 100644 --- a/samples/bot-calling-meeting/csharp/README.md +++ b/samples/bot-calling-meeting/csharp/README.md @@ -185,7 +185,7 @@ For example `https://contoso.com/teamsapp/callback` 2. __*This step is specific to Teams*__ - **Edit** the `manifest.json` contained in the `TeamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - - **Edit** the `manifest.json` for `validDomains`, replace `<>` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. + - **Edit** the `manifest.json` for `validDomains`, replace `<>` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - **Zip** up the contents of the `TeamsAppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) - Add the app to personal/team/groupChat scope (Supported scopes) diff --git a/samples/bot-calling-meeting/csharp/Source/CallingBotSample/Manifest/color.png b/samples/bot-calling-meeting/csharp/Source/CallingBotSample/AppManifest/color.png similarity index 100% rename from samples/bot-calling-meeting/csharp/Source/CallingBotSample/Manifest/color.png rename to samples/bot-calling-meeting/csharp/Source/CallingBotSample/AppManifest/color.png diff --git a/samples/bot-calling-meeting/csharp/Source/CallingBotSample/Manifest/manifest.json b/samples/bot-calling-meeting/csharp/Source/CallingBotSample/AppManifest/manifest.json similarity index 100% rename from samples/bot-calling-meeting/csharp/Source/CallingBotSample/Manifest/manifest.json rename to samples/bot-calling-meeting/csharp/Source/CallingBotSample/AppManifest/manifest.json diff --git a/samples/bot-calling-meeting/csharp/Source/CallingBotSample/Manifest/outline.png b/samples/bot-calling-meeting/csharp/Source/CallingBotSample/AppManifest/outline.png similarity index 100% rename from samples/bot-calling-meeting/csharp/Source/CallingBotSample/Manifest/outline.png rename to samples/bot-calling-meeting/csharp/Source/CallingBotSample/AppManifest/outline.png diff --git a/samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/appPackage/README.md b/samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/AppManifest/README.md similarity index 100% rename from samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/appPackage/README.md rename to samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/AppManifest/README.md diff --git a/samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/appPackage/color.png b/samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/AppManifest/color.png similarity index 100% rename from samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/appPackage/color.png rename to samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/AppManifest/color.png diff --git a/samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/appPackage/manifest.json b/samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/AppManifest/manifest.json similarity index 100% rename from samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/appPackage/manifest.json rename to samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/AppManifest/manifest.json diff --git a/samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/appPackage/outline.png b/samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/AppManifest/outline.png similarity index 100% rename from samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/appPackage/outline.png rename to samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/AppManifest/outline.png diff --git a/samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/README.md b/samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/README.md index a5f6473c22..5c1f514a08 100644 --- a/samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/README.md +++ b/samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/README.md @@ -85,8 +85,8 @@ Refer to [Bot SSO Setup document](https://github.com/OfficeDev/Microsoft-Teams-S - Press `F5` to run this project 4. Manually update the manifest.json - - Edit the `manifest.json` contained in the `appPackage/` folder to replace with your MicrosoftAppId (that was created in step1.1 and is the same value of MicrosoftAppId in `appsettings.json` file) *everywhere* you see the place holder string `{TODO: MicrosoftAppId}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`). The `ConnectionName` is the name of OAuth Connection you configured in step3. - - Zip up the contents of the `appPackage/` folder to create a `manifest.zip` + - Edit the `manifest.json` contained in the `AppManifest/` folder to replace with your MicrosoftAppId (that was created in step1.1 and is the same value of MicrosoftAppId in `appsettings.json` file) *everywhere* you see the place holder string `{TODO: MicrosoftAppId}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`). The `ConnectionName` is the name of OAuth Connection you configured in step3. + - Zip up the contents of the `AppManifest/` folder to create a `manifest.zip` - Upload the `manifest.zip` to Teams (in the left-bottom *Apps* view, click "Upload a custom app") **Note**: If you are facing any issue in your app, [please uncomment this line](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/AdapterWithErrorHandler.cs#L37) and put your debugger for local debug. diff --git a/samples/bot-conversation/csharp/TeamsAppManifest/icon-color.png b/samples/bot-conversation/csharp/AppManifest/icon-color.png similarity index 100% rename from samples/bot-conversation/csharp/TeamsAppManifest/icon-color.png rename to samples/bot-conversation/csharp/AppManifest/icon-color.png diff --git a/samples/bot-conversation/csharp/TeamsAppManifest/icon-outline.png b/samples/bot-conversation/csharp/AppManifest/icon-outline.png similarity index 100% rename from samples/bot-conversation/csharp/TeamsAppManifest/icon-outline.png rename to samples/bot-conversation/csharp/AppManifest/icon-outline.png diff --git a/samples/bot-conversation/csharp/TeamsAppManifest/manifest.json b/samples/bot-conversation/csharp/AppManifest/manifest.json similarity index 100% rename from samples/bot-conversation/csharp/TeamsAppManifest/manifest.json rename to samples/bot-conversation/csharp/AppManifest/manifest.json diff --git a/samples/bot-daily-task-reminder/csharp/BotDailyTaskReminder/AppPackage/color.png b/samples/bot-daily-task-reminder/csharp/BotDailyTaskReminder/AppManifest/color.png similarity index 100% rename from samples/bot-daily-task-reminder/csharp/BotDailyTaskReminder/AppPackage/color.png rename to samples/bot-daily-task-reminder/csharp/BotDailyTaskReminder/AppManifest/color.png diff --git a/samples/bot-daily-task-reminder/csharp/BotDailyTaskReminder/AppPackage/manifest.json b/samples/bot-daily-task-reminder/csharp/BotDailyTaskReminder/AppManifest/manifest.json similarity index 100% rename from samples/bot-daily-task-reminder/csharp/BotDailyTaskReminder/AppPackage/manifest.json rename to samples/bot-daily-task-reminder/csharp/BotDailyTaskReminder/AppManifest/manifest.json diff --git a/samples/bot-daily-task-reminder/csharp/BotDailyTaskReminder/AppPackage/outline.png b/samples/bot-daily-task-reminder/csharp/BotDailyTaskReminder/AppManifest/outline.png similarity index 100% rename from samples/bot-daily-task-reminder/csharp/BotDailyTaskReminder/AppPackage/outline.png rename to samples/bot-daily-task-reminder/csharp/BotDailyTaskReminder/AppManifest/outline.png diff --git a/samples/bot-daily-task-reminder/csharp/README.md b/samples/bot-daily-task-reminder/csharp/README.md index 0e6fdcf1ab..4e5700ad42 100644 --- a/samples/bot-daily-task-reminder/csharp/README.md +++ b/samples/bot-daily-task-reminder/csharp/README.md @@ -28,7 +28,7 @@ This sample shows a feature where user can schedule a recurring task and get the ![Daily Task Reminder ](BotDailyTaskReminder/Images/DailyTaskReminder.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Bot daily task reminder:** [Manifest](/samples/bot-daily-task-reminder/csharp/demo-manifest/Bot-Daily-Task-Reminder.zip) @@ -82,14 +82,14 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 5. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./AppPackage folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `AppPackage` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./AppPackage folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/bot-daily-task-reminder/csharp/BotDailyTaskReminder/AdapterWithErrorHandler.cs#L30) line and put your debugger for local debug. diff --git a/samples/bot-file-upload/csharp/TeamsAppManifest/icon-color.png b/samples/bot-file-upload/csharp/AppManifest/icon-color.png similarity index 100% rename from samples/bot-file-upload/csharp/TeamsAppManifest/icon-color.png rename to samples/bot-file-upload/csharp/AppManifest/icon-color.png diff --git a/samples/bot-file-upload/csharp/TeamsAppManifest/icon-outline.png b/samples/bot-file-upload/csharp/AppManifest/icon-outline.png similarity index 100% rename from samples/bot-file-upload/csharp/TeamsAppManifest/icon-outline.png rename to samples/bot-file-upload/csharp/AppManifest/icon-outline.png diff --git a/samples/bot-file-upload/csharp/TeamsAppManifest/manifest.json b/samples/bot-file-upload/csharp/AppManifest/manifest.json similarity index 100% rename from samples/bot-file-upload/csharp/TeamsAppManifest/manifest.json rename to samples/bot-file-upload/csharp/AppManifest/manifest.json diff --git a/samples/bot-file-upload/csharp/README.md b/samples/bot-file-upload/csharp/README.md index 421ac93b5b..978796ecc1 100644 --- a/samples/bot-file-upload/csharp/README.md +++ b/samples/bot-file-upload/csharp/README.md @@ -28,7 +28,7 @@ upload files to Teams from a bot and how to receive a file sent to a bot as an a ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Teams File Upload Bot:** [Manifest](/samples/bot-file-upload/csharp/demo-manifest/bot-file-upload.zip) @@ -86,9 +86,9 @@ the Teams service needs to call into the bot. 1) Run your bot, either from Visual Studio with `F5` or using `dotnet run` in the appropriate folder. 1) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `TeamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the `AppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `TeamsAppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) - Add the app to personal scope (Supported app scope) diff --git a/samples/bot-file-upload/java/teamsAppManifest/icon-color.png b/samples/bot-file-upload/java/AppManifest/icon-color.png similarity index 100% rename from samples/bot-file-upload/java/teamsAppManifest/icon-color.png rename to samples/bot-file-upload/java/AppManifest/icon-color.png diff --git a/samples/bot-file-upload/java/teamsAppManifest/icon-outline.png b/samples/bot-file-upload/java/AppManifest/icon-outline.png similarity index 100% rename from samples/bot-file-upload/java/teamsAppManifest/icon-outline.png rename to samples/bot-file-upload/java/AppManifest/icon-outline.png diff --git a/samples/bot-file-upload/java/teamsAppManifest/manifest.json b/samples/bot-file-upload/java/AppManifest/manifest.json similarity index 100% rename from samples/bot-file-upload/java/teamsAppManifest/manifest.json rename to samples/bot-file-upload/java/AppManifest/manifest.json diff --git a/samples/bot-file-upload/java/README.md b/samples/bot-file-upload/java/README.md index ca794fe7c5..ad24c62169 100644 --- a/samples/bot-file-upload/java/README.md +++ b/samples/bot-file-upload/java/README.md @@ -30,7 +30,7 @@ This sample is a Spring Boot app and uses the Azure CLI and azure-webapp Maven p ![Bot-file-upload](Images/botfileupload.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Teams File Upload Bot:** [Manifest](/samples/bot-file-upload/csharp/demo-manifest/bot-file-upload.zip) @@ -85,9 +85,9 @@ the Teams service needs to call into the bot. - Run it by using `java -jar .\target\bot-teams-file-upload-sample.jar` command in a terminal 1) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `teamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the `AppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `TeamsAppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) - Add the app to personal scope (Supported app scope) diff --git a/samples/bot-file-upload/python/README.md b/samples/bot-file-upload/python/README.md index 5204ca94fa..d63a984927 100644 --- a/samples/bot-file-upload/python/README.md +++ b/samples/bot-file-upload/python/README.md @@ -29,7 +29,7 @@ upload files to Teams from a bot and how to receive a file sent to a bot as an a ![Bot-file-upload](Images/botfileupload.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Teams File Upload Bot:** [Manifest](/samples/bot-file-upload/csharp/demo-manifest/bot-file-upload.zip) @@ -78,8 +78,8 @@ This bot has been created using [Bot Framework](https://dev.botframework.com), i 1) Update the `config.py` configuration for the bot to use the Microsoft App Id and App Password from the Bot Framework registration. (Note the App Password is referred to as the "client secret" in the azure portal and you can always create a new client secret anytime.) 1) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `teamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - - **Zip** up the contents of the `teamsAppManifest` folder to create a `manifest.zip` + - **Edit** the `manifest.json` contained in the `appManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Zip** up the contents of the `appManifest` folder to create a `manifest.zip` - **Upload** the `manifest.zip` to Teams (in the Apps view click "Upload a custom app") 1) Run your bot with `python app.py` diff --git a/samples/bot-file-upload/python/teams_app_manifest/icon-color.png b/samples/bot-file-upload/python/appManifest/icon-color.png similarity index 100% rename from samples/bot-file-upload/python/teams_app_manifest/icon-color.png rename to samples/bot-file-upload/python/appManifest/icon-color.png diff --git a/samples/bot-file-upload/python/teams_app_manifest/icon-outline.png b/samples/bot-file-upload/python/appManifest/icon-outline.png similarity index 100% rename from samples/bot-file-upload/python/teams_app_manifest/icon-outline.png rename to samples/bot-file-upload/python/appManifest/icon-outline.png diff --git a/samples/bot-file-upload/python/teams_app_manifest/manifest.json b/samples/bot-file-upload/python/appManifest/manifest.json similarity index 100% rename from samples/bot-file-upload/python/teams_app_manifest/manifest.json rename to samples/bot-file-upload/python/appManifest/manifest.json diff --git a/samples/bot-formatting-cards/csharp/BotFormattingCards/Manifest/color.png b/samples/bot-formatting-cards/csharp/BotFormattingCards/AppManifest/color.png similarity index 100% rename from samples/bot-formatting-cards/csharp/BotFormattingCards/Manifest/color.png rename to samples/bot-formatting-cards/csharp/BotFormattingCards/AppManifest/color.png diff --git a/samples/bot-formatting-cards/csharp/BotFormattingCards/Manifest/manifest.json b/samples/bot-formatting-cards/csharp/BotFormattingCards/AppManifest/manifest.json similarity index 100% rename from samples/bot-formatting-cards/csharp/BotFormattingCards/Manifest/manifest.json rename to samples/bot-formatting-cards/csharp/BotFormattingCards/AppManifest/manifest.json diff --git a/samples/bot-formatting-cards/csharp/BotFormattingCards/Manifest/outline.png b/samples/bot-formatting-cards/csharp/BotFormattingCards/AppManifest/outline.png similarity index 100% rename from samples/bot-formatting-cards/csharp/BotFormattingCards/Manifest/outline.png rename to samples/bot-formatting-cards/csharp/BotFormattingCards/AppManifest/outline.png diff --git a/samples/bot-formatting-cards/csharp/README.md b/samples/bot-formatting-cards/csharp/README.md index 7cb890b1b0..9f4c27449f 100644 --- a/samples/bot-formatting-cards/csharp/README.md +++ b/samples/bot-formatting-cards/csharp/README.md @@ -26,7 +26,7 @@ This sample feature shows how to use different formatting on cards using bot. ![Types Of Cards](BotFormattingCards/Images/DifferentFormattingCards.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Send different formatting on cards:** [Manifest](/samples/bot-formatting-cards/csharp/demo-manifest/bot-formatting-cards.zip) @@ -183,7 +183,7 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./AppPackage folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. ## Running the sample diff --git a/samples/bot-initiate-thread-in-channel/csharp/TeamsAppManifest/icon-color.png b/samples/bot-initiate-thread-in-channel/csharp/AppManifest/icon-color.png similarity index 100% rename from samples/bot-initiate-thread-in-channel/csharp/TeamsAppManifest/icon-color.png rename to samples/bot-initiate-thread-in-channel/csharp/AppManifest/icon-color.png diff --git a/samples/bot-initiate-thread-in-channel/csharp/TeamsAppManifest/icon-outline.png b/samples/bot-initiate-thread-in-channel/csharp/AppManifest/icon-outline.png similarity index 100% rename from samples/bot-initiate-thread-in-channel/csharp/TeamsAppManifest/icon-outline.png rename to samples/bot-initiate-thread-in-channel/csharp/AppManifest/icon-outline.png diff --git a/samples/bot-initiate-thread-in-channel/csharp/TeamsAppManifest/manifest.json b/samples/bot-initiate-thread-in-channel/csharp/AppManifest/manifest.json similarity index 100% rename from samples/bot-initiate-thread-in-channel/csharp/TeamsAppManifest/manifest.json rename to samples/bot-initiate-thread-in-channel/csharp/AppManifest/manifest.json diff --git a/samples/bot-initiate-thread-in-channel/csharp/README.md b/samples/bot-initiate-thread-in-channel/csharp/README.md index 3b5c3c713a..d15fd83554 100644 --- a/samples/bot-initiate-thread-in-channel/csharp/README.md +++ b/samples/bot-initiate-thread-in-channel/csharp/README.md @@ -27,7 +27,7 @@ This bot has been created using [Bot Framework](https://dev.botframework.com). T ![new-Thread-In-Channel ](Images/new-Thread-In-Channel.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Start Thread In A Specific Channel of a Team:** [Manifest](/samples/bot-initiate-thread-in-channel/csharp/demo-manifest/bot-initiate-thread-in-channel.zip) diff --git a/samples/bot-initiate-thread-in-channel/java/README.md b/samples/bot-initiate-thread-in-channel/java/README.md index dee149eb26..104650a233 100644 --- a/samples/bot-initiate-thread-in-channel/java/README.md +++ b/samples/bot-initiate-thread-in-channel/java/README.md @@ -31,7 +31,7 @@ This sample is a Spring Boot app and uses the Azure CLI and azure-webapp Maven p ![TeamsThread](Images/TeamsThread.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Start Thread In A Specific Channel of a Team:** [Manifest](/samples/bot-initiate-thread-in-channel/csharp/demo-manifest/bot-initiate-thread-in-channel.zip) @@ -87,7 +87,7 @@ the Teams service needs to call into the bot. 1) __*This step is specific to Teams.*__ - **Edit** the `manifest.json` contained in the `teamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - - **Edit** the `manifest.json` for `validDomains` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. + - **Edit** the `manifest.json` for `validDomains` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - **Zip** up the contents of the `TeamsAppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) - Add the app to a any Teams channel diff --git a/samples/bot-initiate-thread-in-channel/java/teamsAppManifest/icon-color.png b/samples/bot-initiate-thread-in-channel/java/appManifest/icon-color.png similarity index 100% rename from samples/bot-initiate-thread-in-channel/java/teamsAppManifest/icon-color.png rename to samples/bot-initiate-thread-in-channel/java/appManifest/icon-color.png diff --git a/samples/bot-initiate-thread-in-channel/java/teamsAppManifest/icon-outline.png b/samples/bot-initiate-thread-in-channel/java/appManifest/icon-outline.png similarity index 100% rename from samples/bot-initiate-thread-in-channel/java/teamsAppManifest/icon-outline.png rename to samples/bot-initiate-thread-in-channel/java/appManifest/icon-outline.png diff --git a/samples/bot-initiate-thread-in-channel/java/teamsAppManifest/manifest.json b/samples/bot-initiate-thread-in-channel/java/appManifest/manifest.json similarity index 100% rename from samples/bot-initiate-thread-in-channel/java/teamsAppManifest/manifest.json rename to samples/bot-initiate-thread-in-channel/java/appManifest/manifest.json diff --git a/samples/bot-initiate-thread-in-channel/python/README.md b/samples/bot-initiate-thread-in-channel/python/README.md index a774df1554..8ff7e20485 100644 --- a/samples/bot-initiate-thread-in-channel/python/README.md +++ b/samples/bot-initiate-thread-in-channel/python/README.md @@ -35,7 +35,7 @@ how to incorporate basic conversational flow into a Teams application. It also i ![TeamsThread](Images/TeamsThread.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Start Thread In A Specific Channel of a Team:** [Manifest](/samples/bot-initiate-thread-in-channel/csharp/demo-manifest/bot-initiate-thread-in-channel.zip) @@ -76,8 +76,8 @@ the Teams service needs to call into the bot. 1) Update the `config.py` configuration for the bot to use the Microsoft App Id and App Password from the Bot Framework registration. (Note the App Password is referred to as the "client secret" in the azure portal and you can always create a new client secret anytime.) 1) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `teamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - - **Zip** up the contents of the `teamsAppManifest` folder to create a `manifest.zip` + - **Edit** the `manifest.json` contained in the `appManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Zip** up the contents of the `appManifest` folder to create a `manifest.zip` - **Upload** the `manifest.zip` to Teams (in the Apps view click "Upload a custom app") 1) Run your bot with `python app.py` diff --git a/samples/bot-initiate-thread-in-channel/python/teams_app_manifest/icon-color.png b/samples/bot-initiate-thread-in-channel/python/appManifest/icon-color.png similarity index 100% rename from samples/bot-initiate-thread-in-channel/python/teams_app_manifest/icon-color.png rename to samples/bot-initiate-thread-in-channel/python/appManifest/icon-color.png diff --git a/samples/bot-initiate-thread-in-channel/python/teams_app_manifest/icon-outline.png b/samples/bot-initiate-thread-in-channel/python/appManifest/icon-outline.png similarity index 100% rename from samples/bot-initiate-thread-in-channel/python/teams_app_manifest/icon-outline.png rename to samples/bot-initiate-thread-in-channel/python/appManifest/icon-outline.png diff --git a/samples/bot-initiate-thread-in-channel/python/teams_app_manifest/icon-outline.zip b/samples/bot-initiate-thread-in-channel/python/appManifest/icon-outline.zip similarity index 100% rename from samples/bot-initiate-thread-in-channel/python/teams_app_manifest/icon-outline.zip rename to samples/bot-initiate-thread-in-channel/python/appManifest/icon-outline.zip diff --git a/samples/bot-initiate-thread-in-channel/python/teams_app_manifest/manifest.json b/samples/bot-initiate-thread-in-channel/python/appManifest/manifest.json similarity index 100% rename from samples/bot-initiate-thread-in-channel/python/teams_app_manifest/manifest.json rename to samples/bot-initiate-thread-in-channel/python/appManifest/manifest.json diff --git a/samples/bot-join-team-using-qr-code/csharp/README.md b/samples/bot-join-team-using-qr-code/csharp/README.md index 28bbffe49b..5600f2aa6a 100644 --- a/samples/bot-join-team-using-qr-code/csharp/README.md +++ b/samples/bot-join-team-using-qr-code/csharp/README.md @@ -31,7 +31,7 @@ User can generate a new QR code (contains team id information) and then scan the ![Card](JoinTeamByQR/Images/JoinTeamByQrCode.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Join a team using QR code:** [Manifest](/samples/bot-join-team-using-qr-code/csharp/demo-manifest/Bot-Join-Team-By-QR.zip) @@ -133,6 +133,7 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can - __*This step is specific to Teams.*__ - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. + - **Edit** the `manifest.json` for `webApplicationInfo` resource `"api://botid-{{MicrosoftAppId}}"` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `"api://botid-{{MicrosoftAppId}}"`. - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") diff --git a/samples/bot-message-reaction/csharp/TeamsAppManifest/color.png b/samples/bot-message-reaction/csharp/AppManifest/color.png similarity index 100% rename from samples/bot-message-reaction/csharp/TeamsAppManifest/color.png rename to samples/bot-message-reaction/csharp/AppManifest/color.png diff --git a/samples/bot-message-reaction/csharp/TeamsAppManifest/manifest.json b/samples/bot-message-reaction/csharp/AppManifest/manifest.json similarity index 100% rename from samples/bot-message-reaction/csharp/TeamsAppManifest/manifest.json rename to samples/bot-message-reaction/csharp/AppManifest/manifest.json diff --git a/samples/bot-message-reaction/csharp/TeamsAppManifest/outline.png b/samples/bot-message-reaction/csharp/AppManifest/outline.png similarity index 100% rename from samples/bot-message-reaction/csharp/TeamsAppManifest/outline.png rename to samples/bot-message-reaction/csharp/AppManifest/outline.png diff --git a/samples/bot-message-reaction/csharp/README.md b/samples/bot-message-reaction/csharp/README.md index ad9f3eb4d0..dd95a9bdd1 100644 --- a/samples/bot-message-reaction/csharp/README.md +++ b/samples/bot-message-reaction/csharp/README.md @@ -27,7 +27,7 @@ This bot has been created using [Bot Framework](https://dev.botframework.com), i ![bot-message-reaction ](Images/bot-message-reaction.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Teams Message Reactions Bot:** [Manifest](/samples/bot-message-reaction/csharp/demo-manifest/bot-message-reaction.zip) diff --git a/samples/bot-message-reaction/java/README.md b/samples/bot-message-reaction/java/README.md index 65b811f8e7..dcb3b53f1e 100644 --- a/samples/bot-message-reaction/java/README.md +++ b/samples/bot-message-reaction/java/README.md @@ -31,7 +31,7 @@ This sample is a Spring Boot app and uses the Azure CLI and azure-webapp Maven p ![msgext-reaction ](Images/MessageReaction.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Teams Message Reactions Bot:** [Manifest](/samples/bot-message-reaction/csharp/demo-manifest/bot-message-reaction.zip) diff --git a/samples/bot-message-reaction/java/TeamsAppManifest/icon-color.png b/samples/bot-message-reaction/java/appManifest/icon-color.png similarity index 100% rename from samples/bot-message-reaction/java/TeamsAppManifest/icon-color.png rename to samples/bot-message-reaction/java/appManifest/icon-color.png diff --git a/samples/bot-message-reaction/java/TeamsAppManifest/icon-outline.png b/samples/bot-message-reaction/java/appManifest/icon-outline.png similarity index 100% rename from samples/bot-message-reaction/java/TeamsAppManifest/icon-outline.png rename to samples/bot-message-reaction/java/appManifest/icon-outline.png diff --git a/samples/bot-message-reaction/java/TeamsAppManifest/manifest.json b/samples/bot-message-reaction/java/appManifest/manifest.json similarity index 100% rename from samples/bot-message-reaction/java/TeamsAppManifest/manifest.json rename to samples/bot-message-reaction/java/appManifest/manifest.json diff --git a/samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/AppPackage/color.png b/samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/AppManifest/color.png similarity index 100% rename from samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/AppPackage/color.png rename to samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/AppManifest/color.png diff --git a/samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/AppPackage/manifest.json b/samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/AppManifest/manifest.json similarity index 100% rename from samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/AppPackage/manifest.json rename to samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/AppManifest/manifest.json diff --git a/samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/AppPackage/outline.png b/samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/AppManifest/outline.png similarity index 100% rename from samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/AppPackage/outline.png rename to samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/AppManifest/outline.png diff --git a/samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/AppPackage/peoplep.zip b/samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/AppManifest/peoplep.zip similarity index 100% rename from samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/AppPackage/peoplep.zip rename to samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/AppManifest/peoplep.zip diff --git a/samples/bot-people-picker-adaptive-card/csharp/README.md b/samples/bot-people-picker-adaptive-card/csharp/README.md index e0699fa5df..ae2da9a406 100644 --- a/samples/bot-people-picker-adaptive-card/csharp/README.md +++ b/samples/bot-people-picker-adaptive-card/csharp/README.md @@ -25,7 +25,7 @@ This sample shows the feature of people picker on Adaptive Cards. ![people picker card ](PeoplePicker/Images/PepolePickerAdaptiveCard.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **People picker control in Adaptive Cards:** [Manifest](/samples/bot-people-picker-adaptive-card/csharp/demo-manifest/People-picker-adaptive-card.zip) @@ -82,13 +82,13 @@ In Azure portal, create a [Azure Bot resource](https://docs.microsoft.com/azure/ 5. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./AppPackage folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - - **Zip** up the contents of the `AppPackage` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./AppPackage folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/AdapterWithErrorHandler.cs#L30) line and put your debugger for local debug. diff --git a/samples/bot-proactive-messaging/csharp/.gitignore b/samples/bot-proactive-messaging/csharp/.gitignore index dfcfd56f44..d7a2ce67fd 100644 --- a/samples/bot-proactive-messaging/csharp/.gitignore +++ b/samples/bot-proactive-messaging/csharp/.gitignore @@ -205,7 +205,7 @@ ecf/ rcf/ # Windows Store app package directories and files -AppPackages/ +AppManifest/ BundleArtifacts/ Package.StoreAssociation.xml _pkginfo.txt diff --git a/samples/bot-proactive-messaging/csharp/teamsAppManifest/color.png b/samples/bot-proactive-messaging/csharp/AppManifest/color.png similarity index 100% rename from samples/bot-proactive-messaging/csharp/teamsAppManifest/color.png rename to samples/bot-proactive-messaging/csharp/AppManifest/color.png diff --git a/samples/bot-proactive-messaging/csharp/teamsAppManifest/manifest.json b/samples/bot-proactive-messaging/csharp/AppManifest/manifest.json similarity index 100% rename from samples/bot-proactive-messaging/csharp/teamsAppManifest/manifest.json rename to samples/bot-proactive-messaging/csharp/AppManifest/manifest.json diff --git a/samples/bot-proactive-messaging/csharp/teamsAppManifest/outline.png b/samples/bot-proactive-messaging/csharp/AppManifest/outline.png similarity index 100% rename from samples/bot-proactive-messaging/csharp/teamsAppManifest/outline.png rename to samples/bot-proactive-messaging/csharp/AppManifest/outline.png diff --git a/samples/bot-proactive-messaging/csharp/README.md b/samples/bot-proactive-messaging/csharp/README.md index 7b863ec420..b95840587b 100644 --- a/samples/bot-proactive-messaging/csharp/README.md +++ b/samples/bot-proactive-messaging/csharp/README.md @@ -68,9 +68,9 @@ Two samples to highlight solutions to two challenges with building proactive mes - Ensure that you've [enabled the Teams Channel](https://docs.microsoft.com/en-us/azure/bot-service/channel-connect-teams?view=azure-bot-service-4.0) - configure the messaging endpoint in Azure bot with your application domain URL and append `/api/messages` like: `https://111xxx.ngrok-free.app/api/messages` -3. Modify the `manifest.json` in the `/teamsAppManifest` folder and replace the `{{BOT-ID}}` with the id received while doing AAD app registration in previous steps and also update the `<>` with your application domain like ngrok domain: `111xxx.ngrok-free.app` or dev tunnels domain: `12345.devtunnels.ms` excluding http/https. +3. Modify the `manifest.json` in the `/AppManifest` folder and replace the `{{BOT-ID}}` with the id received while doing AAD app registration in previous steps and also update the `<>` with your application domain like ngrok domain: `111xxx.ngrok-free.app` or dev tunnels domain: `12345.devtunnels.ms` excluding http/https. -4. Zip the contents of `teamsAppManifest` into a `manifest.zip`. +4. Zip the contents of `AppManifest` into a `manifest.zip`. 5. Modify the `/coordinate-logger/appsettings.local.json` file and fill in the `{{ Bot Id }}` and `{{ Bot Password }}` with the id's received while doing AAD app registration in previous steps. diff --git a/samples/bot-receive-channel-messages-withRSC/csharp/README.md b/samples/bot-receive-channel-messages-withRSC/csharp/README.md index 617c8ac943..6f8d33b7b0 100644 --- a/samples/bot-receive-channel-messages-withRSC/csharp/README.md +++ b/samples/bot-receive-channel-messages-withRSC/csharp/README.md @@ -29,7 +29,7 @@ This feature shown in this sample is currently available in Public Developer Pre ![RSC Module](ReceiveMessagesWithRSC/Images/BotWithRSCModule.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Receive Channel messages with RSC permissions:** [Manifest](/samples/bot-receive-channel-messages-withRSC/csharp/demo-manifest/Bot-RSC.zip) diff --git a/samples/bot-receive-channel-messages-withRSC/csharp/ReceiveMessagesWithRSC/README.md b/samples/bot-receive-channel-messages-withRSC/csharp/ReceiveMessagesWithRSC/README.md index fefbf5021c..045f45ada5 100644 --- a/samples/bot-receive-channel-messages-withRSC/csharp/ReceiveMessagesWithRSC/README.md +++ b/samples/bot-receive-channel-messages-withRSC/csharp/ReceiveMessagesWithRSC/README.md @@ -39,13 +39,13 @@ This feature shown in this sample is currently available in Public Developer Pre - __*This step is specific to Teams.*__ - **Edit** the `manifest.json` contained in the `AppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) also update the `<>` with the ngrok URL` - - **Zip** up the contents of the `appPackage` folder to create a `manifest.zip` + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` - **Sideload** in a team to test - Select or create a team - Select the ellipses **...** from the left pane. The drop-down menu appears. - Select **Manage Team**, then select **Apps** - Then select **Upload a custom app** from the lower right corner. - - Then select the `manifest.zip` file from `appPackage`, and then select **Add** to add the bot to your selected team. + - Then select the `manifest.zip` file from `AppManifest`, and then select **Add** to add the bot to your selected team. ![App Installation](Images/installApp.png) diff --git a/samples/bot-release-management/csharp/.gitignore b/samples/bot-release-management/csharp/.gitignore index 2dacf6af62..287d125dd7 100644 --- a/samples/bot-release-management/csharp/.gitignore +++ b/samples/bot-release-management/csharp/.gitignore @@ -217,7 +217,7 @@ ecf/ rcf/ # Windows Store app package directories and files -AppPackages/ +AppManifest/ BundleArtifacts/ Package.StoreAssociation.xml _pkginfo.txt diff --git a/samples/bot-request-approval/csharp/BotRequestApproval/AppPackage/color.png b/samples/bot-request-approval/csharp/BotRequestApproval/AppManifest/color.png similarity index 100% rename from samples/bot-request-approval/csharp/BotRequestApproval/AppPackage/color.png rename to samples/bot-request-approval/csharp/BotRequestApproval/AppManifest/color.png diff --git a/samples/bot-request-approval/csharp/BotRequestApproval/AppPackage/manifest.json b/samples/bot-request-approval/csharp/BotRequestApproval/AppManifest/manifest.json similarity index 100% rename from samples/bot-request-approval/csharp/BotRequestApproval/AppPackage/manifest.json rename to samples/bot-request-approval/csharp/BotRequestApproval/AppManifest/manifest.json diff --git a/samples/bot-request-approval/csharp/BotRequestApproval/AppPackage/outline.png b/samples/bot-request-approval/csharp/BotRequestApproval/AppManifest/outline.png similarity index 100% rename from samples/bot-request-approval/csharp/BotRequestApproval/AppPackage/outline.png rename to samples/bot-request-approval/csharp/BotRequestApproval/AppManifest/outline.png diff --git a/samples/bot-request-approval/csharp/README.md b/samples/bot-request-approval/csharp/README.md index 427e45e38d..51355a915a 100644 --- a/samples/bot-request-approval/csharp/README.md +++ b/samples/bot-request-approval/csharp/README.md @@ -25,7 +25,7 @@ This sample shows a feature where user can send task request to his manager and ![Preview Image](BotRequestApproval/Images/Preview.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Bot request approval:** [Manifest](/samples/bot-request-approval/csharp/demo-manifest/Bot-Request-Approval.zip) @@ -94,14 +94,14 @@ This sample shows a feature where: 6. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./AppPackage folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `AppPackage` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./AppPackage folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/bot-request-approval/csharp/BotRequestApproval/AdapterWithErrorHandler.cs#L30) line and put your debugger for local debug. diff --git a/samples/bot-sequential-flow-adaptive-cards/csharp/README.md b/samples/bot-sequential-flow-adaptive-cards/csharp/README.md index 19a2c14ccc..eeff237c76 100644 --- a/samples/bot-sequential-flow-adaptive-cards/csharp/README.md +++ b/samples/bot-sequential-flow-adaptive-cards/csharp/README.md @@ -21,7 +21,7 @@ This sample illustrates sequential workflow, user specific views and upto date a ![Preview Image](SequentialUserSpecificFlow/Images/Preview.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Sequential workflow adaptive cards:** [Manifest](/samples/bot-sequential-flow-adaptive-cards/csharp/demo-manifest/bot-adaptivecards-user-specific-views.zip) @@ -77,13 +77,13 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 5. Setup Manifest for Teams - __*This step is specific to Teams.*__ - **Edit** the `manifest.json` contained in the ./Manifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `Manifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. + - **Zip** up the contents of the `Manifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./Manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/bot-sequential-flow-adaptive-cards/csharp/SequentialUserSpecificFlow/AdapterWithErrorHandler.cs#L25) line and put your debugger for local debug. diff --git a/samples/bot-sequential-flow-adaptive-cards/csharp/SequentialUserSpecificFlow/Manifest/color.png b/samples/bot-sequential-flow-adaptive-cards/csharp/SequentialUserSpecificFlow/AppManifest/color.png similarity index 100% rename from samples/bot-sequential-flow-adaptive-cards/csharp/SequentialUserSpecificFlow/Manifest/color.png rename to samples/bot-sequential-flow-adaptive-cards/csharp/SequentialUserSpecificFlow/AppManifest/color.png diff --git a/samples/bot-sequential-flow-adaptive-cards/csharp/SequentialUserSpecificFlow/Manifest/manifest.json b/samples/bot-sequential-flow-adaptive-cards/csharp/SequentialUserSpecificFlow/AppManifest/manifest.json similarity index 100% rename from samples/bot-sequential-flow-adaptive-cards/csharp/SequentialUserSpecificFlow/Manifest/manifest.json rename to samples/bot-sequential-flow-adaptive-cards/csharp/SequentialUserSpecificFlow/AppManifest/manifest.json diff --git a/samples/bot-sequential-flow-adaptive-cards/csharp/SequentialUserSpecificFlow/Manifest/outline.png b/samples/bot-sequential-flow-adaptive-cards/csharp/SequentialUserSpecificFlow/AppManifest/outline.png similarity index 100% rename from samples/bot-sequential-flow-adaptive-cards/csharp/SequentialUserSpecificFlow/Manifest/outline.png rename to samples/bot-sequential-flow-adaptive-cards/csharp/SequentialUserSpecificFlow/AppManifest/outline.png diff --git a/samples/bot-sharepoint-list/csharp/README.md b/samples/bot-sharepoint-list/csharp/README.md index d1108791ed..719b829441 100644 --- a/samples/bot-sharepoint-list/csharp/README.md +++ b/samples/bot-sharepoint-list/csharp/README.md @@ -98,7 +98,7 @@ This bot has been created using [Bot Framework](https://dev.botframework.com), i ### This steps is specific to Microsoft Teams -- Navigate to `teamsAppManifest` folder +- Navigate to `AppManifest` folder - Select the `Manifest.json` and update it with your `Your Bot Id` - Now zip the manifest.json along with icons - Go to teams and do `Upload a Custom App` diff --git a/samples/bot-sharepoint-list/csharp/SPListBot/teamsAppManifest/color.png b/samples/bot-sharepoint-list/csharp/SPListBot/AppManifest/color.png similarity index 100% rename from samples/bot-sharepoint-list/csharp/SPListBot/teamsAppManifest/color.png rename to samples/bot-sharepoint-list/csharp/SPListBot/AppManifest/color.png diff --git a/samples/bot-sharepoint-list/csharp/SPListBot/teamsAppManifest/manifest.json b/samples/bot-sharepoint-list/csharp/SPListBot/AppManifest/manifest.json similarity index 100% rename from samples/bot-sharepoint-list/csharp/SPListBot/teamsAppManifest/manifest.json rename to samples/bot-sharepoint-list/csharp/SPListBot/AppManifest/manifest.json diff --git a/samples/bot-sharepoint-list/csharp/SPListBot/teamsAppManifest/outline.png b/samples/bot-sharepoint-list/csharp/SPListBot/AppManifest/outline.png similarity index 100% rename from samples/bot-sharepoint-list/csharp/SPListBot/teamsAppManifest/outline.png rename to samples/bot-sharepoint-list/csharp/SPListBot/AppManifest/outline.png diff --git a/samples/bot-sso-adaptivecard/csharp/BotSsoAdaptivecard/TeamsAppManifest/color.png b/samples/bot-sso-adaptivecard/csharp/BotSsoAdaptivecard/AppManifest/color.png similarity index 100% rename from samples/bot-sso-adaptivecard/csharp/BotSsoAdaptivecard/TeamsAppManifest/color.png rename to samples/bot-sso-adaptivecard/csharp/BotSsoAdaptivecard/AppManifest/color.png diff --git a/samples/bot-sso-adaptivecard/csharp/BotSsoAdaptivecard/TeamsAppManifest/manifest.json b/samples/bot-sso-adaptivecard/csharp/BotSsoAdaptivecard/AppManifest/manifest.json similarity index 100% rename from samples/bot-sso-adaptivecard/csharp/BotSsoAdaptivecard/TeamsAppManifest/manifest.json rename to samples/bot-sso-adaptivecard/csharp/BotSsoAdaptivecard/AppManifest/manifest.json diff --git a/samples/bot-sso-adaptivecard/csharp/BotSsoAdaptivecard/TeamsAppManifest/outline.png b/samples/bot-sso-adaptivecard/csharp/BotSsoAdaptivecard/AppManifest/outline.png similarity index 100% rename from samples/bot-sso-adaptivecard/csharp/BotSsoAdaptivecard/TeamsAppManifest/outline.png rename to samples/bot-sso-adaptivecard/csharp/BotSsoAdaptivecard/AppManifest/outline.png diff --git a/samples/bot-sso-adaptivecard/csharp/BotSsoAdaptivecard/README.md b/samples/bot-sso-adaptivecard/csharp/BotSsoAdaptivecard/README.md index 21f0e44bcc..2f418c5990 100644 --- a/samples/bot-sso-adaptivecard/csharp/BotSsoAdaptivecard/README.md +++ b/samples/bot-sso-adaptivecard/csharp/BotSsoAdaptivecard/README.md @@ -26,7 +26,7 @@ This sample code demonstrates how to get enable SSO authentication for your Adap ![Preview](Images/PreviewAppSSOCsharp.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Implement SSO authentication for your Adaptive Cards.:** [Manifest](/samples/bot-sso-adaptivecard/csharp/demo-manifest/bot-sso-adaptivecard.zip) @@ -149,6 +149,7 @@ Register your application with Azure AD **This step is specific to Teams.** - **Edit** the `manifest.json` contained in the `TeamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and `{{domain-name}}` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be `12345.devtunnels.ms`. + - **Edit** the manifest.json for webApplicationInfo resource "api://botid-`<>`" with base Url of your domain. E.g. if you are using ngrok it would be https://1234.ngrok-free.app then your domain-name will be "api://botid-`<>`". - **Zip** up the contents of the `TeamsAppManifest` folder to create a `manifest.zip` folder into a `manifest.zip`.(Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app to your org's app catalog'". Browse to and Open the .zip file. At the next dialog, click the Add button.) diff --git a/samples/bot-suggested-actions/csharp/README.md b/samples/bot-suggested-actions/csharp/README.md index 34b6d23071..8effb68935 100644 --- a/samples/bot-suggested-actions/csharp/README.md +++ b/samples/bot-suggested-actions/csharp/README.md @@ -26,7 +26,7 @@ This sample shows the feature where user can [send suggested actions](https://le ![Module](SuggestedActions/Images/botSuggestedActionModule.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Send Suggested Actions:** [Manifest](/samples/bot-suggested-actions/csharp/demo-manifest/bot-suggested-actions.zip) @@ -94,14 +94,14 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 5. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./AppPackage folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `AppPackage` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./AppPackage folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/bot-suggested-actions/csharp/SuggestedActions/AdapterWithErrorHandler.cs#L28) line and put your debugger for local debug. diff --git a/samples/bot-suggested-actions/csharp/SuggestedActions/AppPackage/color.png b/samples/bot-suggested-actions/csharp/SuggestedActions/AppManifest/color.png similarity index 100% rename from samples/bot-suggested-actions/csharp/SuggestedActions/AppPackage/color.png rename to samples/bot-suggested-actions/csharp/SuggestedActions/AppManifest/color.png diff --git a/samples/bot-suggested-actions/csharp/SuggestedActions/AppPackage/manifest.json b/samples/bot-suggested-actions/csharp/SuggestedActions/AppManifest/manifest.json similarity index 100% rename from samples/bot-suggested-actions/csharp/SuggestedActions/AppPackage/manifest.json rename to samples/bot-suggested-actions/csharp/SuggestedActions/AppManifest/manifest.json diff --git a/samples/bot-suggested-actions/csharp/SuggestedActions/AppPackage/outline.png b/samples/bot-suggested-actions/csharp/SuggestedActions/AppManifest/outline.png similarity index 100% rename from samples/bot-suggested-actions/csharp/SuggestedActions/AppPackage/outline.png rename to samples/bot-suggested-actions/csharp/SuggestedActions/AppManifest/outline.png diff --git a/samples/bot-tab-conversations/csharp/.gitignore b/samples/bot-tab-conversations/csharp/.gitignore index 93872bb6b8..e1d286098c 100644 --- a/samples/bot-tab-conversations/csharp/.gitignore +++ b/samples/bot-tab-conversations/csharp/.gitignore @@ -215,7 +215,7 @@ ecf/ rcf/ # Windows Store app package directories and files -AppPackages/ +AppManifest/ BundleArtifacts/ Package.StoreAssociation.xml _pkginfo.txt diff --git a/samples/bot-tab-conversations/csharp/README.md b/samples/bot-tab-conversations/csharp/README.md index 4ca0b6dadd..694934ffea 100644 --- a/samples/bot-tab-conversations/csharp/README.md +++ b/samples/bot-tab-conversations/csharp/README.md @@ -198,8 +198,8 @@ There is also a personal tab that will list inquires from all the support depart * Deploying * There are detailed instructions for deploying locally below. * Sideloading the App - * Create a zip containing `manifest.json`, `colorIcon.png` and `outlineIcon.png` from `Source\ConversationalTabs.Web\Manifest`. - * [You can upload you app by following these instructions](https://docs.microsoft.com/en-us/microsoftteams/platform/concepts/deploy-and-publish/apps-upload) + * Create a zip containing `manifest.json`, `colorIcon.png` and `outlineIcon.png` from `Source\ConversationalTabs.Web\AppManifest`. + * [You can upload you app by following these instructions](https://docs.microsoft.com/microsoftteams/platform/concepts/deploy-and-publish/apps-upload) **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/bot-tab-conversations/csharp/Source/ConversationalTabs.Web/Bot/BotHttpAdapter.cs#L24) line and put your debugger for local debug. diff --git a/samples/bot-tab-conversations/csharp/Source/ConversationalTabs.Web/Manifest/.gitignore b/samples/bot-tab-conversations/csharp/Source/ConversationalTabs.Web/AppManifest/.gitignore similarity index 100% rename from samples/bot-tab-conversations/csharp/Source/ConversationalTabs.Web/Manifest/.gitignore rename to samples/bot-tab-conversations/csharp/Source/ConversationalTabs.Web/AppManifest/.gitignore diff --git a/samples/bot-tab-conversations/csharp/Source/ConversationalTabs.Web/Manifest/icon-color.png b/samples/bot-tab-conversations/csharp/Source/ConversationalTabs.Web/AppManifest/icon-color.png similarity index 100% rename from samples/bot-tab-conversations/csharp/Source/ConversationalTabs.Web/Manifest/icon-color.png rename to samples/bot-tab-conversations/csharp/Source/ConversationalTabs.Web/AppManifest/icon-color.png diff --git a/samples/bot-tab-conversations/csharp/Source/ConversationalTabs.Web/Manifest/icon-outline.png b/samples/bot-tab-conversations/csharp/Source/ConversationalTabs.Web/AppManifest/icon-outline.png similarity index 100% rename from samples/bot-tab-conversations/csharp/Source/ConversationalTabs.Web/Manifest/icon-outline.png rename to samples/bot-tab-conversations/csharp/Source/ConversationalTabs.Web/AppManifest/icon-outline.png diff --git a/samples/bot-tab-conversations/csharp/Source/ConversationalTabs.Web/Manifest/manifest.json b/samples/bot-tab-conversations/csharp/Source/ConversationalTabs.Web/AppManifest/manifest.json similarity index 100% rename from samples/bot-tab-conversations/csharp/Source/ConversationalTabs.Web/Manifest/manifest.json rename to samples/bot-tab-conversations/csharp/Source/ConversationalTabs.Web/AppManifest/manifest.json diff --git a/samples/bot-task-module/csharp/TeamsAppManifest/icon-color.png b/samples/bot-task-module/csharp/AppManifest/icon-color.png similarity index 100% rename from samples/bot-task-module/csharp/TeamsAppManifest/icon-color.png rename to samples/bot-task-module/csharp/AppManifest/icon-color.png diff --git a/samples/bot-task-module/csharp/TeamsAppManifest/icon-outline.png b/samples/bot-task-module/csharp/AppManifest/icon-outline.png similarity index 100% rename from samples/bot-task-module/csharp/TeamsAppManifest/icon-outline.png rename to samples/bot-task-module/csharp/AppManifest/icon-outline.png diff --git a/samples/bot-task-module/csharp/TeamsAppManifest/manifest.json b/samples/bot-task-module/csharp/AppManifest/manifest.json similarity index 100% rename from samples/bot-task-module/csharp/TeamsAppManifest/manifest.json rename to samples/bot-task-module/csharp/AppManifest/manifest.json diff --git a/samples/bot-task-module/csharp/README.md b/samples/bot-task-module/csharp/README.md index f5e591e023..7e56f0a0ff 100644 --- a/samples/bot-task-module/csharp/README.md +++ b/samples/bot-task-module/csharp/README.md @@ -28,7 +28,7 @@ This bot has been created using [Bot Framework](https://dev.botframework.com). I ![bot-task-module ](Images/Bot_Tab_TaskModule.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Teams Task Module:** [Manifest](/samples/bot-task-module/csharp/demo-manifest/bot-task-module.zip) diff --git a/samples/bot-task-module/java/README.md b/samples/bot-task-module/java/README.md index b9a373c59e..47536c1b56 100644 --- a/samples/bot-task-module/java/README.md +++ b/samples/bot-task-module/java/README.md @@ -30,7 +30,7 @@ This sample is a Spring Boot app and uses the Azure CLI and azure-webapp Maven p ![TaskModule](Images/TaskModule.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Teams Task Module:** [Manifest](/samples/bot-task-module/csharp/demo-manifest/bot-task-module.zip) diff --git a/samples/bot-task-module/java/teamsAppManifest/icon-color.png b/samples/bot-task-module/java/appManifest/icon-color.png similarity index 100% rename from samples/bot-task-module/java/teamsAppManifest/icon-color.png rename to samples/bot-task-module/java/appManifest/icon-color.png diff --git a/samples/bot-task-module/java/teamsAppManifest/icon-outline.png b/samples/bot-task-module/java/appManifest/icon-outline.png similarity index 100% rename from samples/bot-task-module/java/teamsAppManifest/icon-outline.png rename to samples/bot-task-module/java/appManifest/icon-outline.png diff --git a/samples/bot-task-module/java/teamsAppManifest/manifest.json b/samples/bot-task-module/java/appManifest/manifest.json similarity index 100% rename from samples/bot-task-module/java/teamsAppManifest/manifest.json rename to samples/bot-task-module/java/appManifest/manifest.json diff --git a/samples/bot-task-module/python/README.md b/samples/bot-task-module/python/README.md index d8c215261e..8900534b2b 100644 --- a/samples/bot-task-module/python/README.md +++ b/samples/bot-task-module/python/README.md @@ -22,7 +22,7 @@ urlFragment: officedev-microsoft-teams-samples-bot-task-module-python ![bot-task-module ](Images/Bot_Tab_TaskModule.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Teams Task Module:** [Manifest](/samples/bot-task-module/csharp/demo-manifest/bot-task-module.zip) @@ -71,8 +71,8 @@ the Teams service needs to call into the bot. 1) Update `CustomForm.html` to replace your Microsoft App Id *everywhere* you see the place holder string `<>` 1) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `teamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`). **Note:** the Task Modules containing pages will require the deployed bot's domain in validDomains of the manifest. - - **Zip** up the contents of the `teamsAppManifest` folder to create a `manifest.zip` + - **Edit** the `manifest.json` contained in the `appManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`). **Note:** the Task Modules containing pages will require the deployed bot's domain in validDomains of the manifest. + - **Zip** up the contents of the `appManifest` folder to create a `manifest.zip` - **Upload** the `manifest.zip` to Teams (in the Apps view click "Upload a custom app") 1) Run your bot with `python app.py` diff --git a/samples/bot-task-module/python/teams_app_manifest/icon-color.png b/samples/bot-task-module/python/appManifest/icon-color.png similarity index 100% rename from samples/bot-task-module/python/teams_app_manifest/icon-color.png rename to samples/bot-task-module/python/appManifest/icon-color.png diff --git a/samples/bot-task-module/python/teams_app_manifest/icon-outline.png b/samples/bot-task-module/python/appManifest/icon-outline.png similarity index 100% rename from samples/bot-task-module/python/teams_app_manifest/icon-outline.png rename to samples/bot-task-module/python/appManifest/icon-outline.png diff --git a/samples/bot-task-module/python/teams_app_manifest/manifest.json b/samples/bot-task-module/python/appManifest/manifest.json similarity index 100% rename from samples/bot-task-module/python/teams_app_manifest/manifest.json rename to samples/bot-task-module/python/appManifest/manifest.json diff --git a/samples/bot-task-module/python/teams_app_manifest/manifest.zip b/samples/bot-task-module/python/appManifest/manifest.zip similarity index 100% rename from samples/bot-task-module/python/teams_app_manifest/manifest.zip rename to samples/bot-task-module/python/appManifest/manifest.zip diff --git a/samples/bot-teams-authentication/csharp/TeamsAppManifest/icon-color.png b/samples/bot-teams-authentication/csharp/AppManifest/icon-color.png similarity index 100% rename from samples/bot-teams-authentication/csharp/TeamsAppManifest/icon-color.png rename to samples/bot-teams-authentication/csharp/AppManifest/icon-color.png diff --git a/samples/bot-teams-authentication/csharp/TeamsAppManifest/icon-outline.png b/samples/bot-teams-authentication/csharp/AppManifest/icon-outline.png similarity index 100% rename from samples/bot-teams-authentication/csharp/TeamsAppManifest/icon-outline.png rename to samples/bot-teams-authentication/csharp/AppManifest/icon-outline.png diff --git a/samples/bot-teams-authentication/csharp/TeamsAppManifest/manifest.json b/samples/bot-teams-authentication/csharp/AppManifest/manifest.json similarity index 100% rename from samples/bot-teams-authentication/csharp/TeamsAppManifest/manifest.json rename to samples/bot-teams-authentication/csharp/AppManifest/manifest.json diff --git a/samples/bot-teams-authentication/csharp/README.md b/samples/bot-teams-authentication/csharp/README.md index f2a0d67f7f..9594379af2 100644 --- a/samples/bot-teams-authentication/csharp/README.md +++ b/samples/bot-teams-authentication/csharp/README.md @@ -43,7 +43,7 @@ This bot has been created using [Bot Framework](https://dev.botframework.com), i ![bot-teams-auth ](Images/bot-teams-auth.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Teams Auth Bot:** [Manifest](/samples/bot-teams-authentication/csharp/demo-manifest/bot-teams-authentication.zip) diff --git a/samples/bot-teams-authentication/java/README.md b/samples/bot-teams-authentication/java/README.md index 9ffc0875f0..58cf3e3cae 100644 --- a/samples/bot-teams-authentication/java/README.md +++ b/samples/bot-teams-authentication/java/README.md @@ -35,7 +35,7 @@ This sample is a Spring Boot app and uses the Azure CLI and azure-webapp Maven p ![TeamAuth](Images/TeamAuth.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Teams Auth Bot:** [Manifest](/samples/bot-teams-authentication/csharp/demo-manifest/bot-teams-authentication.zip) diff --git a/samples/bot-teams-authentication/java/teamsAppManifest/icon-color.png b/samples/bot-teams-authentication/java/appManifest/icon-color.png similarity index 100% rename from samples/bot-teams-authentication/java/teamsAppManifest/icon-color.png rename to samples/bot-teams-authentication/java/appManifest/icon-color.png diff --git a/samples/bot-teams-authentication/java/teamsAppManifest/icon-outline.png b/samples/bot-teams-authentication/java/appManifest/icon-outline.png similarity index 100% rename from samples/bot-teams-authentication/java/teamsAppManifest/icon-outline.png rename to samples/bot-teams-authentication/java/appManifest/icon-outline.png diff --git a/samples/bot-teams-authentication/java/teamsAppManifest/manifest.json b/samples/bot-teams-authentication/java/appManifest/manifest.json similarity index 100% rename from samples/bot-teams-authentication/java/teamsAppManifest/manifest.json rename to samples/bot-teams-authentication/java/appManifest/manifest.json diff --git a/samples/bot-teams-authentication/python/README.md b/samples/bot-teams-authentication/python/README.md index ed4df58028..615dae1047 100644 --- a/samples/bot-teams-authentication/python/README.md +++ b/samples/bot-teams-authentication/python/README.md @@ -35,7 +35,7 @@ The sample uses the bot authentication capabilities in [Azure Bot Service](https ![bot-teams-auth ](Images/TeamAuth.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Teams Auth Bot:** [Manifest](/samples/bot-teams-authentication/csharp/demo-manifest/bot-teams-authentication.zip) @@ -94,7 +94,7 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./teams_app_manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./appManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. - Run your bot with `python app.py` diff --git a/samples/bot-teams-authentication/python/teams_app_manifest/icon-color.png b/samples/bot-teams-authentication/python/appManifest/icon-color.png similarity index 100% rename from samples/bot-teams-authentication/python/teams_app_manifest/icon-color.png rename to samples/bot-teams-authentication/python/appManifest/icon-color.png diff --git a/samples/bot-teams-authentication/python/teams_app_manifest/icon-outline.png b/samples/bot-teams-authentication/python/appManifest/icon-outline.png similarity index 100% rename from samples/bot-teams-authentication/python/teams_app_manifest/icon-outline.png rename to samples/bot-teams-authentication/python/appManifest/icon-outline.png diff --git a/samples/bot-teams-authentication/python/teams_app_manifest/manifest.json b/samples/bot-teams-authentication/python/appManifest/manifest.json similarity index 100% rename from samples/bot-teams-authentication/python/teams_app_manifest/manifest.json rename to samples/bot-teams-authentication/python/appManifest/manifest.json diff --git a/samples/bot-teams-catering/csharp/Manifest/color.png b/samples/bot-teams-catering/csharp/AppManifest/color.png similarity index 100% rename from samples/bot-teams-catering/csharp/Manifest/color.png rename to samples/bot-teams-catering/csharp/AppManifest/color.png diff --git a/samples/bot-teams-catering/csharp/Manifest/manifest.json b/samples/bot-teams-catering/csharp/AppManifest/manifest.json similarity index 100% rename from samples/bot-teams-catering/csharp/Manifest/manifest.json rename to samples/bot-teams-catering/csharp/AppManifest/manifest.json diff --git a/samples/bot-teams-catering/csharp/Manifest/outline.png b/samples/bot-teams-catering/csharp/AppManifest/outline.png similarity index 100% rename from samples/bot-teams-catering/csharp/Manifest/outline.png rename to samples/bot-teams-catering/csharp/AppManifest/outline.png diff --git a/samples/bot-type-ahead-search-adaptive-cards/csharp/README.md b/samples/bot-type-ahead-search-adaptive-cards/csharp/README.md index 3787c7285e..9bf0c1f09d 100644 --- a/samples/bot-type-ahead-search-adaptive-cards/csharp/README.md +++ b/samples/bot-type-ahead-search-adaptive-cards/csharp/README.md @@ -25,7 +25,7 @@ This sample shows the feature of typeahead search (static and dynamic) control i ![Typedsearch Module](TypeaheadSearch/Images/TypedSearchModule.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Typeahead search control in Adaptive Cards:** [Manifest](/samples/bot-type-ahead-search-adaptive-cards/csharp/demo-manifest/Typeahead-search-adaptive-cards.zip) @@ -84,14 +84,14 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 5. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./AppPackage folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `AppPackage` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./AppPackage folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/AdapterWithErrorHandler.cs#L30) line and put your debugger for local debug. diff --git a/samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/AppPackage/color.png b/samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/AppManifest/color.png similarity index 100% rename from samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/AppPackage/color.png rename to samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/AppManifest/color.png diff --git a/samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/AppPackage/manifest.json b/samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/AppManifest/manifest.json similarity index 100% rename from samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/AppPackage/manifest.json rename to samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/AppManifest/manifest.json diff --git a/samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/AppPackage/outline.png b/samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/AppManifest/outline.png similarity index 100% rename from samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/AppPackage/outline.png rename to samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/AppManifest/outline.png diff --git a/samples/connector-todo-notification/csharp/.gitignore b/samples/connector-todo-notification/csharp/.gitignore index 3c4efe206b..ae54a0b71c 100644 --- a/samples/connector-todo-notification/csharp/.gitignore +++ b/samples/connector-todo-notification/csharp/.gitignore @@ -172,7 +172,7 @@ ecf/ rcf/ # Windows Store app package directories and files -AppPackages/ +AppManifest/ BundleArtifacts/ Package.StoreAssociation.xml _pkginfo.txt diff --git a/samples/connector-todo-notification/csharp/TeamsAppPackages/color_icon.png b/samples/connector-todo-notification/csharp/AppManifest/color_icon.png similarity index 100% rename from samples/connector-todo-notification/csharp/TeamsAppPackages/color_icon.png rename to samples/connector-todo-notification/csharp/AppManifest/color_icon.png diff --git a/samples/connector-todo-notification/csharp/TeamsAppPackages/manifest.json b/samples/connector-todo-notification/csharp/AppManifest/manifest.json similarity index 100% rename from samples/connector-todo-notification/csharp/TeamsAppPackages/manifest.json rename to samples/connector-todo-notification/csharp/AppManifest/manifest.json diff --git a/samples/connector-todo-notification/csharp/TeamsAppPackages/outline_icon.png b/samples/connector-todo-notification/csharp/AppManifest/outline_icon.png similarity index 100% rename from samples/connector-todo-notification/csharp/TeamsAppPackages/outline_icon.png rename to samples/connector-todo-notification/csharp/AppManifest/outline_icon.png diff --git a/samples/connector-todo-notification/csharp/README.md b/samples/connector-todo-notification/csharp/README.md index af29785258..194b75ae0c 100644 --- a/samples/connector-todo-notification/csharp/README.md +++ b/samples/connector-todo-notification/csharp/README.md @@ -104,7 +104,7 @@ The minimum prerequisites to run this sample are: ] ``` - - **Zip** up the contents of the `app manifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) - Add the app to personal/team/groupChat scope (Supported scopes) diff --git a/samples/graph-activity-feed-broadcast/csharp/ActivityFeedBroadcast/AppPackage/color.png b/samples/graph-activity-feed-broadcast/csharp/ActivityFeedBroadcast/AppManifest/color.png similarity index 100% rename from samples/graph-activity-feed-broadcast/csharp/ActivityFeedBroadcast/AppPackage/color.png rename to samples/graph-activity-feed-broadcast/csharp/ActivityFeedBroadcast/AppManifest/color.png diff --git a/samples/graph-activity-feed-broadcast/csharp/ActivityFeedBroadcast/AppPackage/manifest.json b/samples/graph-activity-feed-broadcast/csharp/ActivityFeedBroadcast/AppManifest/manifest.json similarity index 100% rename from samples/graph-activity-feed-broadcast/csharp/ActivityFeedBroadcast/AppPackage/manifest.json rename to samples/graph-activity-feed-broadcast/csharp/ActivityFeedBroadcast/AppManifest/manifest.json diff --git a/samples/graph-activity-feed-broadcast/csharp/ActivityFeedBroadcast/AppPackage/outline.png b/samples/graph-activity-feed-broadcast/csharp/ActivityFeedBroadcast/AppManifest/outline.png similarity index 100% rename from samples/graph-activity-feed-broadcast/csharp/ActivityFeedBroadcast/AppPackage/outline.png rename to samples/graph-activity-feed-broadcast/csharp/ActivityFeedBroadcast/AppManifest/outline.png diff --git a/samples/graph-activity-feed-broadcast/csharp/README.md b/samples/graph-activity-feed-broadcast/csharp/README.md index 9d87772821..d400ebd86e 100644 --- a/samples/graph-activity-feed-broadcast/csharp/README.md +++ b/samples/graph-activity-feed-broadcast/csharp/README.md @@ -133,16 +133,16 @@ This sample shows a feature where user can broadcast a message to all members of - `{{Base_URL_Domain}}` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - Press `F5` to run the project -19. Modify the `manifest.json` in the `/AppPackage` folder and replace the following details: +19. Modify the `manifest.json` in the `/AppManifest` folder and replace the following details: - `{{Microsoft-App-Id}}` with Application id generated from Step 3 - `{{Base_URL_Domain}}` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. -20. Zip the contents of `AppPackage` folder into a `manifest.zip`, and use the `manifest.zip` to deploy in app store or add to Teams using step 19. +20. Zip the contents of `AppManifest` folder into a `manifest.zip`, and use the `manifest.zip` to deploy in app store or add to Teams using step 19. 21. Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams and then go to side panel, select Apps - Choose Upload a custom App - - Go to your project directory, the ./AppPackage folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/graph-activity-feed-broadcast/csharp/ActivityFeedBroadcast/AdapterWithErrorHandler.cs#L26) line and put your debugger for local debug. diff --git a/samples/graph-activity-feed/csharp/ActivityFeedNotification/TabNotificationApp/color.png b/samples/graph-activity-feed/csharp/ActivityFeedNotification/AppManifest/color.png similarity index 100% rename from samples/graph-activity-feed/csharp/ActivityFeedNotification/TabNotificationApp/color.png rename to samples/graph-activity-feed/csharp/ActivityFeedNotification/AppManifest/color.png diff --git a/samples/graph-activity-feed/csharp/ActivityFeedNotification/TabNotificationApp/manifest.json b/samples/graph-activity-feed/csharp/ActivityFeedNotification/AppManifest/manifest.json similarity index 100% rename from samples/graph-activity-feed/csharp/ActivityFeedNotification/TabNotificationApp/manifest.json rename to samples/graph-activity-feed/csharp/ActivityFeedNotification/AppManifest/manifest.json diff --git a/samples/graph-activity-feed/csharp/ActivityFeedNotification/TabNotificationApp/outline.png b/samples/graph-activity-feed/csharp/ActivityFeedNotification/AppManifest/outline.png similarity index 100% rename from samples/graph-activity-feed/csharp/ActivityFeedNotification/TabNotificationApp/outline.png rename to samples/graph-activity-feed/csharp/ActivityFeedNotification/AppManifest/outline.png diff --git a/samples/graph-activity-feed/csharp/README.md b/samples/graph-activity-feed/csharp/README.md index c73fee9f5a..6d37ca2afd 100644 --- a/samples/graph-activity-feed/csharp/README.md +++ b/samples/graph-activity-feed/csharp/README.md @@ -162,14 +162,14 @@ This sample has been created using [Microsoft Graph](https://docs.microsoft.com/ - **Edit** the `manifest.json` contained in the ./TabNotificationApp folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - - **Zip** up the contents of the `TabNotificationApp` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Edit** the `manifest.json` for `webApplicationInfo` resource `"api://{Base_Url}/<>"` with MicrosoftAppId. E.g. `"api://1234.ngrok-free.app/00000-000-0000"`. - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./TabNotificationApp folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/graph-activity-feed/csharp/ActivityFeedNotification/AdapterWithErrorHandler.cs#L25) line and put your debugger for local debug. diff --git a/samples/graph-app-installation-lifecycle/csharp/AppInstallation/Manifest/color.png b/samples/graph-app-installation-lifecycle/csharp/AppInstallation/AppManifest/color.png similarity index 100% rename from samples/graph-app-installation-lifecycle/csharp/AppInstallation/Manifest/color.png rename to samples/graph-app-installation-lifecycle/csharp/AppInstallation/AppManifest/color.png diff --git a/samples/graph-app-installation-lifecycle/csharp/AppInstallation/Manifest/manifest.json b/samples/graph-app-installation-lifecycle/csharp/AppInstallation/AppManifest/manifest.json similarity index 100% rename from samples/graph-app-installation-lifecycle/csharp/AppInstallation/Manifest/manifest.json rename to samples/graph-app-installation-lifecycle/csharp/AppInstallation/AppManifest/manifest.json diff --git a/samples/graph-app-installation-lifecycle/csharp/AppInstallation/Manifest/outline.png b/samples/graph-app-installation-lifecycle/csharp/AppInstallation/AppManifest/outline.png similarity index 100% rename from samples/graph-app-installation-lifecycle/csharp/AppInstallation/Manifest/outline.png rename to samples/graph-app-installation-lifecycle/csharp/AppInstallation/AppManifest/outline.png diff --git a/samples/graph-app-installation-lifecycle/csharp/README.md b/samples/graph-app-installation-lifecycle/csharp/README.md index 287689a9f8..dca11fd70d 100644 --- a/samples/graph-app-installation-lifecycle/csharp/README.md +++ b/samples/graph-app-installation-lifecycle/csharp/README.md @@ -26,7 +26,7 @@ This sample app demonstarte the installation lifecycle for Teams [Apps](https:// ![](AppInstallation/Images/GraphAppInstallationLifecycleGif.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **App Installation:** [Manifest](/samples/graph-app-installation-lifecycle/csharp/demo-manifest/graph-app-installation-lifecycle.zip) @@ -91,14 +91,14 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can - Press `F5` to run the project 5. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./Manifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `Manifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./Manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. - [Upload app manifest file](https://docs.microsoft.com/microsoftteams/platform/concepts/deploy-and-publish/apps-upload#load-your-package-into-teams) (zip file) to your team diff --git a/samples/graph-appcatalog-lifecycle/csharp/AppCatalogSample/Manifest/icon-color.png b/samples/graph-appcatalog-lifecycle/csharp/AppCatalogSample/AppManifest/icon-color.png similarity index 100% rename from samples/graph-appcatalog-lifecycle/csharp/AppCatalogSample/Manifest/icon-color.png rename to samples/graph-appcatalog-lifecycle/csharp/AppCatalogSample/AppManifest/icon-color.png diff --git a/samples/graph-appcatalog-lifecycle/csharp/AppCatalogSample/Manifest/icon-outline.png b/samples/graph-appcatalog-lifecycle/csharp/AppCatalogSample/AppManifest/icon-outline.png similarity index 100% rename from samples/graph-appcatalog-lifecycle/csharp/AppCatalogSample/Manifest/icon-outline.png rename to samples/graph-appcatalog-lifecycle/csharp/AppCatalogSample/AppManifest/icon-outline.png diff --git a/samples/graph-appcatalog-lifecycle/csharp/AppCatalogSample/Manifest/manifest.json b/samples/graph-appcatalog-lifecycle/csharp/AppCatalogSample/AppManifest/manifest.json similarity index 100% rename from samples/graph-appcatalog-lifecycle/csharp/AppCatalogSample/Manifest/manifest.json rename to samples/graph-appcatalog-lifecycle/csharp/AppCatalogSample/AppManifest/manifest.json diff --git a/samples/graph-appcatalog-lifecycle/csharp/README.md b/samples/graph-appcatalog-lifecycle/csharp/README.md index 88bbf78139..c43897d480 100644 --- a/samples/graph-appcatalog-lifecycle/csharp/README.md +++ b/samples/graph-appcatalog-lifecycle/csharp/README.md @@ -27,7 +27,7 @@ This sample shows a AppCatalog bot and demonstrates teamsApp lifecycle in catalo ![appcatalog-lifecycle ](AppCatalogSample/Images/appcatalog-lifecycle.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Microsoft Teams graph appcatalog lifecycle sample app:** [Manifest](/samples/graph-appcatalog-lifecycle/csharp/demo-manifest/graph-appcatalog-lifecycle.zip) @@ -161,9 +161,9 @@ Click on Add Permissions to commit your changes. 2) Also, set MicrosoftAppType in the `appsettings.json`. (**Allowed values are: MultiTenant(default), SingleTenant, UserAssignedMSI**) 3) Update the `ConnectionName` as given while setting connection string for bot authentication. 4) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `TeamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the `AppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `TeamsAppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) - Add the app to personal scope (Supported scope) diff --git a/samples/graph-bulk-meetings/csharp/EventMeeting.gitignore b/samples/graph-bulk-meetings/csharp/EventMeeting.gitignore index 2dacf6af62..287d125dd7 100644 --- a/samples/graph-bulk-meetings/csharp/EventMeeting.gitignore +++ b/samples/graph-bulk-meetings/csharp/EventMeeting.gitignore @@ -217,7 +217,7 @@ ecf/ rcf/ # Windows Store app package directories and files -AppPackages/ +AppManifest/ BundleArtifacts/ Package.StoreAssociation.xml _pkginfo.txt diff --git a/samples/graph-bulk-meetings/csharp/EventMeeting/Manifest/color.png b/samples/graph-bulk-meetings/csharp/EventMeeting/AppManifest/color.png similarity index 100% rename from samples/graph-bulk-meetings/csharp/EventMeeting/Manifest/color.png rename to samples/graph-bulk-meetings/csharp/EventMeeting/AppManifest/color.png diff --git a/samples/graph-bulk-meetings/csharp/EventMeeting/Manifest/manifest.json b/samples/graph-bulk-meetings/csharp/EventMeeting/AppManifest/manifest.json similarity index 100% rename from samples/graph-bulk-meetings/csharp/EventMeeting/Manifest/manifest.json rename to samples/graph-bulk-meetings/csharp/EventMeeting/AppManifest/manifest.json diff --git a/samples/graph-bulk-meetings/csharp/EventMeeting/Manifest/outline.png b/samples/graph-bulk-meetings/csharp/EventMeeting/AppManifest/outline.png similarity index 100% rename from samples/graph-bulk-meetings/csharp/EventMeeting/Manifest/outline.png rename to samples/graph-bulk-meetings/csharp/EventMeeting/AppManifest/outline.png diff --git a/samples/graph-bulk-meetings/csharp/README.md b/samples/graph-bulk-meetings/csharp/README.md index 9167fc455e..a998b0108b 100644 --- a/samples/graph-bulk-meetings/csharp/README.md +++ b/samples/graph-bulk-meetings/csharp/README.md @@ -89,11 +89,11 @@ Modify the `appsettings.json` file with the following details: - Update configuration with the ```MicrosoftAppId```, ```MicrosoftAppPassword``` and ```MicrosoftAppTenantId``` values received while doing AAD app registration in your Azure portal. - Press `F5` to run the project -1) Modify the `manifest.json` in the `/Manifest` folder +1) Modify the `manifest.json` in the `/AppManifest` folder Replace the following details: - `<>` with your MicrosoftAppId received after doing AAD app registration in your Azure portal. - `{{BASE-URL}}` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `Manifest` folder to create a `manifest.zip` + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` - **Upload** the `manifest.zip` to Teams (in the Apps view click "Upload a custom app") ## Running the sample diff --git a/samples/graph-change-notification-team-channel/csharp/ChangeNotification/Manifest/color.png b/samples/graph-change-notification-team-channel/csharp/ChangeNotification/AppManifest/color.png similarity index 100% rename from samples/graph-change-notification-team-channel/csharp/ChangeNotification/Manifest/color.png rename to samples/graph-change-notification-team-channel/csharp/ChangeNotification/AppManifest/color.png diff --git a/samples/graph-change-notification-team-channel/csharp/ChangeNotification/Manifest/manifest.json b/samples/graph-change-notification-team-channel/csharp/ChangeNotification/AppManifest/manifest.json similarity index 100% rename from samples/graph-change-notification-team-channel/csharp/ChangeNotification/Manifest/manifest.json rename to samples/graph-change-notification-team-channel/csharp/ChangeNotification/AppManifest/manifest.json diff --git a/samples/graph-change-notification-team-channel/csharp/ChangeNotification/Manifest/outline.png b/samples/graph-change-notification-team-channel/csharp/ChangeNotification/AppManifest/outline.png similarity index 100% rename from samples/graph-change-notification-team-channel/csharp/ChangeNotification/Manifest/outline.png rename to samples/graph-change-notification-team-channel/csharp/ChangeNotification/AppManifest/outline.png diff --git a/samples/graph-change-notification-team-channel/csharp/README.md b/samples/graph-change-notification-team-channel/csharp/README.md index b9d6e89b7c..e1846d891c 100644 --- a/samples/graph-change-notification-team-channel/csharp/README.md +++ b/samples/graph-change-notification-team-channel/csharp/README.md @@ -114,11 +114,11 @@ To include resource data of graph notifications, this Graph API require self-sig B) *This step is specific to Teams.* -- **Edit** the `manifest.json` contained in the `TeamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) +- **Edit** the `manifest.json` contained in the `AppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. -- **Zip** up the contents of the `TeamsAppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) +- **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) diff --git a/samples/graph-change-notification/csharp/ChangeNotification/Manifest/color.png b/samples/graph-change-notification/csharp/ChangeNotification/AppManifest/color.png similarity index 100% rename from samples/graph-change-notification/csharp/ChangeNotification/Manifest/color.png rename to samples/graph-change-notification/csharp/ChangeNotification/AppManifest/color.png diff --git a/samples/graph-change-notification/csharp/ChangeNotification/Manifest/manifest.json b/samples/graph-change-notification/csharp/ChangeNotification/AppManifest/manifest.json similarity index 100% rename from samples/graph-change-notification/csharp/ChangeNotification/Manifest/manifest.json rename to samples/graph-change-notification/csharp/ChangeNotification/AppManifest/manifest.json diff --git a/samples/graph-change-notification/csharp/ChangeNotification/Manifest/outline.png b/samples/graph-change-notification/csharp/ChangeNotification/AppManifest/outline.png similarity index 100% rename from samples/graph-change-notification/csharp/ChangeNotification/Manifest/outline.png rename to samples/graph-change-notification/csharp/ChangeNotification/AppManifest/outline.png diff --git a/samples/graph-change-notification/csharp/README.md b/samples/graph-change-notification/csharp/README.md index 1987bcb12e..1b580430c5 100644 --- a/samples/graph-change-notification/csharp/README.md +++ b/samples/graph-change-notification/csharp/README.md @@ -177,9 +177,9 @@ Modify the `appsettings.json` file with the following details: - Press `F5` to run the project 7) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json`file contained in the `Manifest` folder to replace your Microsoft App Id (that was created when you registered your AAD app registration earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json`file contained in the `AppManifest` folder to replace your Microsoft App Id (that was created when you registered your AAD app registration earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - `[Your tunnel Domain]` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `teamsAppManifest` folder to create a `manifest.zip` + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` - **Upload** the `manifest.zip` to Teams (in the Apps view click "Upload a custom app") **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/graph-change-notification/csharp/ChangeNotification/AdapterWithErrorHandler.cs#L28) line and put your debugger for local debug. diff --git a/samples/graph-channel-lifecycle/csharp/ChannelLifecycle/Manifest/color.png b/samples/graph-channel-lifecycle/csharp/ChannelLifecycle/AppManifest/color.png similarity index 100% rename from samples/graph-channel-lifecycle/csharp/ChannelLifecycle/Manifest/color.png rename to samples/graph-channel-lifecycle/csharp/ChannelLifecycle/AppManifest/color.png diff --git a/samples/graph-channel-lifecycle/csharp/ChannelLifecycle/Manifest/manifest.json b/samples/graph-channel-lifecycle/csharp/ChannelLifecycle/AppManifest/manifest.json similarity index 100% rename from samples/graph-channel-lifecycle/csharp/ChannelLifecycle/Manifest/manifest.json rename to samples/graph-channel-lifecycle/csharp/ChannelLifecycle/AppManifest/manifest.json diff --git a/samples/graph-channel-lifecycle/csharp/ChannelLifecycle/Manifest/outline.png b/samples/graph-channel-lifecycle/csharp/ChannelLifecycle/AppManifest/outline.png similarity index 100% rename from samples/graph-channel-lifecycle/csharp/ChannelLifecycle/Manifest/outline.png rename to samples/graph-channel-lifecycle/csharp/ChannelLifecycle/AppManifest/outline.png diff --git a/samples/graph-channel-lifecycle/csharp/README.md b/samples/graph-channel-lifecycle/csharp/README.md index c9ba8ac6ca..f4ff06584c 100644 --- a/samples/graph-channel-lifecycle/csharp/README.md +++ b/samples/graph-channel-lifecycle/csharp/README.md @@ -85,14 +85,14 @@ This sample show the [Channel](https://docs.microsoft.com/en-us/graph/api/resour 4. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./Manifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `Manifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./Manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. - [Upload app manifest file](https://docs.microsoft.com/en-us/microsoftteams/platform/concepts/deploy-and-publish/apps-upload#load-your-package-into-teams) (zip file) to your team diff --git a/samples/graph-chat-lifecycle/csharp/ChatLifecycle/Manifest/color.png b/samples/graph-chat-lifecycle/csharp/ChatLifecycle/AppManifest/color.png similarity index 100% rename from samples/graph-chat-lifecycle/csharp/ChatLifecycle/Manifest/color.png rename to samples/graph-chat-lifecycle/csharp/ChatLifecycle/AppManifest/color.png diff --git a/samples/graph-chat-lifecycle/csharp/ChatLifecycle/Manifest/manifest.json b/samples/graph-chat-lifecycle/csharp/ChatLifecycle/AppManifest/manifest.json similarity index 100% rename from samples/graph-chat-lifecycle/csharp/ChatLifecycle/Manifest/manifest.json rename to samples/graph-chat-lifecycle/csharp/ChatLifecycle/AppManifest/manifest.json diff --git a/samples/graph-chat-lifecycle/csharp/ChatLifecycle/Manifest/outline.png b/samples/graph-chat-lifecycle/csharp/ChatLifecycle/AppManifest/outline.png similarity index 100% rename from samples/graph-chat-lifecycle/csharp/ChatLifecycle/Manifest/outline.png rename to samples/graph-chat-lifecycle/csharp/ChatLifecycle/AppManifest/outline.png diff --git a/samples/graph-chat-lifecycle/csharp/ChatLifecycle/Manifest_Hub/color.png b/samples/graph-chat-lifecycle/csharp/ChatLifecycle/AppManifest_Hub/color.png similarity index 100% rename from samples/graph-chat-lifecycle/csharp/ChatLifecycle/Manifest_Hub/color.png rename to samples/graph-chat-lifecycle/csharp/ChatLifecycle/AppManifest_Hub/color.png diff --git a/samples/graph-chat-lifecycle/csharp/ChatLifecycle/Manifest_Hub/manifest.json b/samples/graph-chat-lifecycle/csharp/ChatLifecycle/AppManifest_Hub/manifest.json similarity index 100% rename from samples/graph-chat-lifecycle/csharp/ChatLifecycle/Manifest_Hub/manifest.json rename to samples/graph-chat-lifecycle/csharp/ChatLifecycle/AppManifest_Hub/manifest.json diff --git a/samples/graph-chat-lifecycle/csharp/ChatLifecycle/Manifest_Hub/outline.png b/samples/graph-chat-lifecycle/csharp/ChatLifecycle/AppManifest_Hub/outline.png similarity index 100% rename from samples/graph-chat-lifecycle/csharp/ChatLifecycle/Manifest_Hub/outline.png rename to samples/graph-chat-lifecycle/csharp/ChatLifecycle/AppManifest_Hub/outline.png diff --git a/samples/graph-chat-lifecycle/csharp/README.md b/samples/graph-chat-lifecycle/csharp/README.md index b55b8e3096..598eadd8e9 100644 --- a/samples/graph-chat-lifecycle/csharp/README.md +++ b/samples/graph-chat-lifecycle/csharp/README.md @@ -128,16 +128,16 @@ This sample illustrates Lifecycle of chat in Teams (Creating chat, adding member 4. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./Manifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - **Edit** the `manifest.json` for `webApplicationInfo` resource `"api://{{domain-name}}/<>"` with MicrosoftAppId. - **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `graph-chat-lifecycle\csharp\ChatLifecycle\Manifest_Hub` folder with the required values. - - **Zip** up the contents of the `Manifest` folder to create a `Manifest.zip` or `Manifest_Hub` folder to create a `Manifest_Hub.zip`(Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `graph-chat-lifecycle\csharp\ChatLifecycle\AppManifest_Hub` folder with the required values. + - **Zip** up the contents of the `Manifest` folder to create a `Manifest.zip` or `AppManifest_Hub` folder to create a `Manifest_Hub.zip`(Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./Manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. ## Running the sample diff --git a/samples/graph-meeting-notification/csharp/MeetingNotification/Manifest/color.png b/samples/graph-meeting-notification/csharp/MeetingNotification/AppManifest/color.png similarity index 100% rename from samples/graph-meeting-notification/csharp/MeetingNotification/Manifest/color.png rename to samples/graph-meeting-notification/csharp/MeetingNotification/AppManifest/color.png diff --git a/samples/graph-meeting-notification/csharp/MeetingNotification/Manifest/manifest.json b/samples/graph-meeting-notification/csharp/MeetingNotification/AppManifest/manifest.json similarity index 100% rename from samples/graph-meeting-notification/csharp/MeetingNotification/Manifest/manifest.json rename to samples/graph-meeting-notification/csharp/MeetingNotification/AppManifest/manifest.json diff --git a/samples/graph-meeting-notification/csharp/MeetingNotification/Manifest/outline.png b/samples/graph-meeting-notification/csharp/MeetingNotification/AppManifest/outline.png similarity index 100% rename from samples/graph-meeting-notification/csharp/MeetingNotification/Manifest/outline.png rename to samples/graph-meeting-notification/csharp/MeetingNotification/AppManifest/outline.png diff --git a/samples/graph-meeting-notification/csharp/README.md b/samples/graph-meeting-notification/csharp/README.md index b81c225cd9..82a16fea25 100644 --- a/samples/graph-meeting-notification/csharp/README.md +++ b/samples/graph-meeting-notification/csharp/README.md @@ -109,15 +109,15 @@ This is a sample application which demonstrates use of online meeting subscripti 5. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./Manifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `Manifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./Manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. Follow this documentation to get more information on custom apps and uploading them into Teams - [Manage custom apps](https://docs.microsoft.com/en-us/microsoftteams/custom-app-overview) and [Upload an app package](https://docs.microsoft.com/en-us/microsoftteams/upload-custom-apps) diff --git a/samples/graph-pinned-messages/csharp/.gitignore b/samples/graph-pinned-messages/csharp/.gitignore index 2dacf6af62..287d125dd7 100644 --- a/samples/graph-pinned-messages/csharp/.gitignore +++ b/samples/graph-pinned-messages/csharp/.gitignore @@ -217,7 +217,7 @@ ecf/ rcf/ # Windows Store app package directories and files -AppPackages/ +AppManifest/ BundleArtifacts/ Package.StoreAssociation.xml _pkginfo.txt diff --git a/samples/graph-proactive-installation/csharp/ProactiveAppInstallation/TeamsAppManifest/color.png b/samples/graph-proactive-installation/csharp/ProactiveAppInstallation/AppManifest/color.png similarity index 100% rename from samples/graph-proactive-installation/csharp/ProactiveAppInstallation/TeamsAppManifest/color.png rename to samples/graph-proactive-installation/csharp/ProactiveAppInstallation/AppManifest/color.png diff --git a/samples/graph-proactive-installation/csharp/ProactiveAppInstallation/TeamsAppManifest/manifest.json b/samples/graph-proactive-installation/csharp/ProactiveAppInstallation/AppManifest/manifest.json similarity index 100% rename from samples/graph-proactive-installation/csharp/ProactiveAppInstallation/TeamsAppManifest/manifest.json rename to samples/graph-proactive-installation/csharp/ProactiveAppInstallation/AppManifest/manifest.json diff --git a/samples/graph-proactive-installation/csharp/ProactiveAppInstallation/TeamsAppManifest/outline.png b/samples/graph-proactive-installation/csharp/ProactiveAppInstallation/AppManifest/outline.png similarity index 100% rename from samples/graph-proactive-installation/csharp/ProactiveAppInstallation/TeamsAppManifest/outline.png rename to samples/graph-proactive-installation/csharp/ProactiveAppInstallation/AppManifest/outline.png diff --git a/samples/graph-proactive-installation/csharp/README.md b/samples/graph-proactive-installation/csharp/README.md index e4685bb2ec..bebfe99cad 100644 --- a/samples/graph-proactive-installation/csharp/README.md +++ b/samples/graph-proactive-installation/csharp/README.md @@ -89,13 +89,13 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 4) Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./TeamsAppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - - **Zip** up the contents of the `TeamsAppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload an app to your org's app catalog") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload an app to your org's app catalog - - Go to your project directory, the ./TeamsAppManifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. ## Running the sample diff --git a/samples/graph-rsc/csharp/README.md b/samples/graph-rsc/csharp/README.md index db1fa063a8..1b89c7bbd1 100644 --- a/samples/graph-rsc/csharp/README.md +++ b/samples/graph-rsc/csharp/README.md @@ -26,7 +26,7 @@ This sample illustrates you can use [Resource Specific Consent (RSC)](https://do ![Broadcast from user](RSCDemo/Images/RSCDemo.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **RSC with Graph API:** [Manifest](/samples/graph-rsc/csharp/demo-manifest/graph-rsc.zip) @@ -76,11 +76,11 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 6) Run the bot from Visual Studio: - Press `F5` to run the project -7) Setup the `manifest.json` in the `/AppPackage` folder +7) Setup the `manifest.json` in the `/AppManifest` folder Replace the following details: - Replace `<>` at all the places with your MicrosoftAppId received while doing AAD app registration in Azure portal - `[Your tunnel Domain]` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `Manifest` folder to create a `manifest.zip` + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` - **Upload** the `manifest.zip` to Teams (in the Apps view click "Upload a custom app") ## Running the sample diff --git a/samples/graph-rsc/csharp/RSCDemo/Manifest/color.png b/samples/graph-rsc/csharp/RSCDemo/AppManifest/color.png similarity index 100% rename from samples/graph-rsc/csharp/RSCDemo/Manifest/color.png rename to samples/graph-rsc/csharp/RSCDemo/AppManifest/color.png diff --git a/samples/graph-rsc/csharp/RSCDemo/Manifest/manifest.json b/samples/graph-rsc/csharp/RSCDemo/AppManifest/manifest.json similarity index 100% rename from samples/graph-rsc/csharp/RSCDemo/Manifest/manifest.json rename to samples/graph-rsc/csharp/RSCDemo/AppManifest/manifest.json diff --git a/samples/graph-rsc/csharp/RSCDemo/Manifest/outline.png b/samples/graph-rsc/csharp/RSCDemo/AppManifest/outline.png similarity index 100% rename from samples/graph-rsc/csharp/RSCDemo/Manifest/outline.png rename to samples/graph-rsc/csharp/RSCDemo/AppManifest/outline.png diff --git a/samples/graph-teams-tag/csharp/.gitignore b/samples/graph-teams-tag/csharp/.gitignore index 2dacf6af62..287d125dd7 100644 --- a/samples/graph-teams-tag/csharp/.gitignore +++ b/samples/graph-teams-tag/csharp/.gitignore @@ -217,7 +217,7 @@ ecf/ rcf/ # Windows Store app package directories and files -AppPackages/ +AppManifest/ BundleArtifacts/ Package.StoreAssociation.xml _pkginfo.txt diff --git a/samples/graph-teams-tag/csharp/README.md b/samples/graph-teams-tag/csharp/README.md index 26ef137782..c1334bc4dd 100644 --- a/samples/graph-teams-tag/csharp/README.md +++ b/samples/graph-teams-tag/csharp/README.md @@ -87,11 +87,11 @@ This is a sample application where user can create, update, add or remove member - Run the bot from Visual Studio: - Press `F5` to run the project -7. Setup the `manifest.json` in the `/AppPackage` folder +7. Setup the `manifest.json` in the `/AppManifest` folder Replace the following details: - `{{APP-ID}}` with any GUID id value or your MicrosoftAppId. - `{{BASE-URL}}` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. -- **Zip** up the contents of the `Manifest` folder to create a `manifest.zip` +- **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` - **Upload** the `manifest.zip` to Teams (in the Apps view click "Upload a custom app") ## Running the sample diff --git a/samples/incoming-webhook/csharp/IncomingWebhook/AppPackage/color.png b/samples/incoming-webhook/csharp/IncomingWebhook/AppManifest/color.png similarity index 100% rename from samples/incoming-webhook/csharp/IncomingWebhook/AppPackage/color.png rename to samples/incoming-webhook/csharp/IncomingWebhook/AppManifest/color.png diff --git a/samples/incoming-webhook/csharp/IncomingWebhook/AppPackage/manifest.json b/samples/incoming-webhook/csharp/IncomingWebhook/AppManifest/manifest.json similarity index 100% rename from samples/incoming-webhook/csharp/IncomingWebhook/AppPackage/manifest.json rename to samples/incoming-webhook/csharp/IncomingWebhook/AppManifest/manifest.json diff --git a/samples/incoming-webhook/csharp/IncomingWebhook/AppPackage/outline.png b/samples/incoming-webhook/csharp/IncomingWebhook/AppManifest/outline.png similarity index 100% rename from samples/incoming-webhook/csharp/IncomingWebhook/AppPackage/outline.png rename to samples/incoming-webhook/csharp/IncomingWebhook/AppManifest/outline.png diff --git a/samples/incoming-webhook/csharp/README.md b/samples/incoming-webhook/csharp/README.md index 529ce5d680..12756b3f4d 100644 --- a/samples/incoming-webhook/csharp/README.md +++ b/samples/incoming-webhook/csharp/README.md @@ -101,11 +101,10 @@ This sample demos UI to type in Incoming Webhook URL and message card payload, w ### 4. Setup Manifest for Teams 1) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `AppPackage` folder to replace `{{Manifest-id}}` with any `GUID` ID. + - **Edit** the `manifest.json` contained in the `AppManifest` folder to replace `{{Manifest-id}}` with any `GUID` ID. - **Edit** the `manifest.json` for `contentUrl`, `websiteUrl` inside `staticTabs` section. Replace `<>` with app's base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Edit** the `manifest.json` for `validDomains` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `incoming-webhook\csharp\IncomingWebhook\Manifest_Hub` folder with the required values. - - **Zip** up the contents of the `AppPackage` folder to create a `Manifest.zip` or `Manifest_Hub` folder to create a `Manifest_Hub.zip`(Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `Manifest.zip` or `Manifest_Hub` folder to create a `Manifest_Hub.zip`(Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) - Add the app to personal scope. diff --git a/samples/meeting-recruitment-app/csharp/MeetingApp/AppPackage/icon-color.png b/samples/meeting-recruitment-app/csharp/MeetingApp/AppManifest/icon-color.png similarity index 100% rename from samples/meeting-recruitment-app/csharp/MeetingApp/AppPackage/icon-color.png rename to samples/meeting-recruitment-app/csharp/MeetingApp/AppManifest/icon-color.png diff --git a/samples/meeting-recruitment-app/csharp/MeetingApp/AppPackage/icon-outline.png b/samples/meeting-recruitment-app/csharp/MeetingApp/AppManifest/icon-outline.png similarity index 100% rename from samples/meeting-recruitment-app/csharp/MeetingApp/AppPackage/icon-outline.png rename to samples/meeting-recruitment-app/csharp/MeetingApp/AppManifest/icon-outline.png diff --git a/samples/meeting-recruitment-app/csharp/MeetingApp/AppPackage/manifest.json b/samples/meeting-recruitment-app/csharp/MeetingApp/AppManifest/manifest.json similarity index 100% rename from samples/meeting-recruitment-app/csharp/MeetingApp/AppPackage/manifest.json rename to samples/meeting-recruitment-app/csharp/MeetingApp/AppManifest/manifest.json diff --git a/samples/meeting-recruitment-app/csharp/README.md b/samples/meeting-recruitment-app/csharp/README.md index 86f22e36f2..1621a8d37f 100644 --- a/samples/meeting-recruitment-app/csharp/README.md +++ b/samples/meeting-recruitment-app/csharp/README.md @@ -30,7 +30,7 @@ It has meeting details and in-meeting app that helps in the interview process. ![Details](MeetingApp/Images/meetingrecruitment.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Recruitment App Sample:** [Manifest](/samples/meeting-recruitment-app/csharp/demo-manifest/Meeting-Recruitment-App.zip) @@ -122,14 +122,14 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 6. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./AppPackage folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `<>` and replace `<>` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `AppPackage` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./AppPackage folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/meeting-recruitment-app/csharp/MeetingApp/AdapterWithErrorHandler.cs#L25) line and put your debugger for local debug. diff --git a/samples/meeting-recruitment-app/nodejs/.gitignore b/samples/meeting-recruitment-app/nodejs/.gitignore index 372d98cc2c..8f78731e17 100644 --- a/samples/meeting-recruitment-app/nodejs/.gitignore +++ b/samples/meeting-recruitment-app/nodejs/.gitignore @@ -26,7 +26,7 @@ yarn-error.log* env/.env.*.user env/.env.local .localConfigs -appMAnifest/build +appManifest/build /build # dependencies diff --git a/samples/meeting-tabs/csharp/MeetingTabs/AppPackage/color.png b/samples/meeting-tabs/csharp/MeetingTabs/AppManifest/color.png similarity index 100% rename from samples/meeting-tabs/csharp/MeetingTabs/AppPackage/color.png rename to samples/meeting-tabs/csharp/MeetingTabs/AppManifest/color.png diff --git a/samples/meeting-tabs/csharp/MeetingTabs/AppPackage/manifest.json b/samples/meeting-tabs/csharp/MeetingTabs/AppManifest/manifest.json similarity index 100% rename from samples/meeting-tabs/csharp/MeetingTabs/AppPackage/manifest.json rename to samples/meeting-tabs/csharp/MeetingTabs/AppManifest/manifest.json diff --git a/samples/meeting-tabs/csharp/MeetingTabs/AppPackage/outline.png b/samples/meeting-tabs/csharp/MeetingTabs/AppManifest/outline.png similarity index 100% rename from samples/meeting-tabs/csharp/MeetingTabs/AppPackage/outline.png rename to samples/meeting-tabs/csharp/MeetingTabs/AppManifest/outline.png diff --git a/samples/meeting-tabs/csharp/README.md b/samples/meeting-tabs/csharp/README.md index 71c9fbb4ff..25da12b56e 100644 --- a/samples/meeting-tabs/csharp/README.md +++ b/samples/meeting-tabs/csharp/README.md @@ -27,7 +27,7 @@ This sample shows app stage view, Mute/Unmute Teams meeting audio call in meetin ![MeetingTabsGif](Images/MeetingTabsGif.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Meeting-Tabs:** [Manifest](/samples/meeting-tabs/csharp/demo-manifest/meeting-tabs.zip) @@ -105,11 +105,11 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can ``` 6. __*This step is specific to Teams.*__ -- **Edit** the `manifest.json` contained in the `teamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) +- **Edit** the `manifest.json` contained in the `AppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `<>` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. -- **Zip** up the contents of the `teamsAppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) +- **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) diff --git a/samples/meetings-app-icon-badging/csharp/AppIconBadgingInMeetings/Manifest/color.png b/samples/meetings-app-icon-badging/csharp/AppIconBadgingInMeetings/AppManifest/color.png similarity index 100% rename from samples/meetings-app-icon-badging/csharp/AppIconBadgingInMeetings/Manifest/color.png rename to samples/meetings-app-icon-badging/csharp/AppIconBadgingInMeetings/AppManifest/color.png diff --git a/samples/meetings-app-icon-badging/csharp/AppIconBadgingInMeetings/Manifest/manifest.json b/samples/meetings-app-icon-badging/csharp/AppIconBadgingInMeetings/AppManifest/manifest.json similarity index 100% rename from samples/meetings-app-icon-badging/csharp/AppIconBadgingInMeetings/Manifest/manifest.json rename to samples/meetings-app-icon-badging/csharp/AppIconBadgingInMeetings/AppManifest/manifest.json diff --git a/samples/meetings-app-icon-badging/csharp/AppIconBadgingInMeetings/Manifest/outline.png b/samples/meetings-app-icon-badging/csharp/AppIconBadgingInMeetings/AppManifest/outline.png similarity index 100% rename from samples/meetings-app-icon-badging/csharp/AppIconBadgingInMeetings/Manifest/outline.png rename to samples/meetings-app-icon-badging/csharp/AppIconBadgingInMeetings/AppManifest/outline.png diff --git a/samples/meetings-app-icon-badging/csharp/README.md b/samples/meetings-app-icon-badging/csharp/README.md index 07e273abee..ee8b64341a 100644 --- a/samples/meetings-app-icon-badging/csharp/README.md +++ b/samples/meetings-app-icon-badging/csharp/README.md @@ -79,14 +79,14 @@ This sample illustrates how to send app icon badging notification on tab icon in 5. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./Manifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `Manifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./Manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/meetings-notification/csharp/AppIconBadgingInMeetings/AdapterWithErrorHandler.cs#L26) line and put your debugger for local debug. diff --git a/samples/meetings-context-app/csharp/README.md b/samples/meetings-context-app/csharp/README.md index 171ba8c4ab..b673bf3cc0 100644 --- a/samples/meetings-context-app/csharp/README.md +++ b/samples/meetings-context-app/csharp/README.md @@ -28,7 +28,7 @@ This sample shows the contents of meeting tab context object in a meeting tab an ![meeting-context](MeetingContextApp/Images/meeting_context_csharp.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Teams Meeting Context Sample:** [Manifest](/samples/meetings-context-app/csharp/demo-manifest/meetings-context-app.zip) diff --git a/samples/meetings-details-tab/csharp/DetailsTab/Manifest/icon-color.png b/samples/meetings-details-tab/csharp/DetailsTab/AppManifest/icon-color.png similarity index 100% rename from samples/meetings-details-tab/csharp/DetailsTab/Manifest/icon-color.png rename to samples/meetings-details-tab/csharp/DetailsTab/AppManifest/icon-color.png diff --git a/samples/meetings-details-tab/csharp/DetailsTab/Manifest/icon-outline.png b/samples/meetings-details-tab/csharp/DetailsTab/AppManifest/icon-outline.png similarity index 100% rename from samples/meetings-details-tab/csharp/DetailsTab/Manifest/icon-outline.png rename to samples/meetings-details-tab/csharp/DetailsTab/AppManifest/icon-outline.png diff --git a/samples/meetings-details-tab/csharp/DetailsTab/Manifest/manifest.json b/samples/meetings-details-tab/csharp/DetailsTab/AppManifest/manifest.json similarity index 100% rename from samples/meetings-details-tab/csharp/DetailsTab/Manifest/manifest.json rename to samples/meetings-details-tab/csharp/DetailsTab/AppManifest/manifest.json diff --git a/samples/meetings-details-tab/csharp/DetailsTab/DetailsTab.csproj b/samples/meetings-details-tab/csharp/DetailsTab/DetailsTab.csproj index b2bf4ffc6c..1b7a069902 100644 --- a/samples/meetings-details-tab/csharp/DetailsTab/DetailsTab.csproj +++ b/samples/meetings-details-tab/csharp/DetailsTab/DetailsTab.csproj @@ -29,8 +29,4 @@ - - - - diff --git a/samples/meetings-details-tab/csharp/README.md b/samples/meetings-details-tab/csharp/README.md index 257fea4416..42b598714f 100644 --- a/samples/meetings-details-tab/csharp/README.md +++ b/samples/meetings-details-tab/csharp/README.md @@ -27,7 +27,7 @@ This sample shows creating poll in meeting , where memebers of the meeting can a ![image](DetailsTab/Images/DetailsTabModule.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Meetings Details Tab Sample:** [Manifest](/samples/meetings-details-tab/csharp/demo-manifest/meetings-details-tab.zip) @@ -96,14 +96,14 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 5. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./Manifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `Manifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./Manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/meetings-details-tab/csharp/DetailsTab/AdapterWithErrorHandler.cs#L25) line and put your debugger for local debug. diff --git a/samples/meetings-events/csharp/MeetingEvents/AppPackage/color.png b/samples/meetings-events/csharp/MeetingEvents/AppManifest/color.png similarity index 100% rename from samples/meetings-events/csharp/MeetingEvents/AppPackage/color.png rename to samples/meetings-events/csharp/MeetingEvents/AppManifest/color.png diff --git a/samples/meetings-events/csharp/MeetingEvents/AppPackage/manifest.json b/samples/meetings-events/csharp/MeetingEvents/AppManifest/manifest.json similarity index 100% rename from samples/meetings-events/csharp/MeetingEvents/AppPackage/manifest.json rename to samples/meetings-events/csharp/MeetingEvents/AppManifest/manifest.json diff --git a/samples/meetings-events/csharp/MeetingEvents/AppPackage/outline.png b/samples/meetings-events/csharp/MeetingEvents/AppManifest/outline.png similarity index 100% rename from samples/meetings-events/csharp/MeetingEvents/AppPackage/outline.png rename to samples/meetings-events/csharp/MeetingEvents/AppManifest/outline.png diff --git a/samples/meetings-events/csharp/README.md b/samples/meetings-events/csharp/README.md index b29b5664c6..785476bdd9 100644 --- a/samples/meetings-events/csharp/README.md +++ b/samples/meetings-events/csharp/README.md @@ -30,7 +30,7 @@ The feature shown in this sample is currently available in public developer prev ![Meetings Events](MeetingEvents/Images/MeetingsEvents.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Realtime meeting events:** [Manifest](/samples/meetings-events/csharp/demo-manifest/Meetings-Events.zip) @@ -97,15 +97,15 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 4) Setup Manifest for Teams -Modify the `manifest.json` in the `/AppPackage` folder and replace the following details +Modify the `manifest.json` in the `/AppManifest` folder and replace the following details - `<>` with your AAD app registration id - `<>` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - Zip the contents of `AppPackage` folder into a `manifest.zip`, and use the `manifest.zip` to deploy in app store + - Zip the contents of `AppManifest` folder into a `manifest.zip`, and use the `manifest.zip` to deploy in app store - - **Upload** the `manifest.zip` to Teams - Select **Apps** from the left panel. - Then select **Upload a custom app** from the lower right corner. - - Then select the `manifest.zip` file from `AppPackage`. + - Then select the `manifest.zip` file from `AppManifest`. - [Install the App in Teams Meeting](https://docs.microsoft.com/microsoftteams/platform/apps-in-teams-meetings/teams-apps-in-meetings?view=msteams-client-js-latest#meeting-lifecycle-scenarios) **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/meetings-events/csharp/MeetingEvents/AdapterWithErrorHandler.cs#L25) line and put your debugger for local debug. diff --git a/samples/meetings-live-caption/csharp/README.md b/samples/meetings-live-caption/csharp/README.md index 63911a4b05..9adc14589b 100644 --- a/samples/meetings-live-caption/csharp/README.md +++ b/samples/meetings-live-caption/csharp/README.md @@ -80,7 +80,7 @@ Copy the CART link it will used while configuring tab for meeting. 1) Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams and then go to side panel, select Apps - Choose Manage your apps -> Upload an app -> Upload a custom App - - Go to your project directory, the ./AppPackage folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. **NOTE: If you are not able to send caption, try configuring tab again.** diff --git a/samples/meetings-live-code-interview/csharp/MeetingLiveCoding/AppPackage/color.png b/samples/meetings-live-code-interview/csharp/MeetingLiveCoding/AppManifest/color.png similarity index 100% rename from samples/meetings-live-code-interview/csharp/MeetingLiveCoding/AppPackage/color.png rename to samples/meetings-live-code-interview/csharp/MeetingLiveCoding/AppManifest/color.png diff --git a/samples/meetings-live-code-interview/csharp/MeetingLiveCoding/AppPackage/manifest.json b/samples/meetings-live-code-interview/csharp/MeetingLiveCoding/AppManifest/manifest.json similarity index 100% rename from samples/meetings-live-code-interview/csharp/MeetingLiveCoding/AppPackage/manifest.json rename to samples/meetings-live-code-interview/csharp/MeetingLiveCoding/AppManifest/manifest.json diff --git a/samples/meetings-live-code-interview/csharp/MeetingLiveCoding/AppPackage/outline.png b/samples/meetings-live-code-interview/csharp/MeetingLiveCoding/AppManifest/outline.png similarity index 100% rename from samples/meetings-live-code-interview/csharp/MeetingLiveCoding/AppPackage/outline.png rename to samples/meetings-live-code-interview/csharp/MeetingLiveCoding/AppManifest/outline.png diff --git a/samples/meetings-live-code-interview/csharp/README.md b/samples/meetings-live-code-interview/csharp/README.md index 6c268e7696..d768fbd105 100644 --- a/samples/meetings-live-code-interview/csharp/README.md +++ b/samples/meetings-live-code-interview/csharp/README.md @@ -29,7 +29,7 @@ Now any participant in meeting can write code for the question and same will be ![side panel ](MeetingLiveCoding/Images/MeetinLiveCodeInterview.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Live coding interview using Shared meeting stage:** [Manifest](/samples/meetings-live-code-interview/csharp/demo-manifest/meetings-live-code-interview.zip) @@ -129,14 +129,14 @@ sequenceDiagram ``` 4. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./AppPackage folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `AppPackage` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./AppPackage folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. diff --git a/samples/meetings-notification/csharp/InMeetingNotifications/Manifest/color.png b/samples/meetings-notification/csharp/InMeetingNotifications/AppManifest/color.png similarity index 100% rename from samples/meetings-notification/csharp/InMeetingNotifications/Manifest/color.png rename to samples/meetings-notification/csharp/InMeetingNotifications/AppManifest/color.png diff --git a/samples/meetings-notification/csharp/InMeetingNotifications/Manifest/manifest.json b/samples/meetings-notification/csharp/InMeetingNotifications/AppManifest/manifest.json similarity index 100% rename from samples/meetings-notification/csharp/InMeetingNotifications/Manifest/manifest.json rename to samples/meetings-notification/csharp/InMeetingNotifications/AppManifest/manifest.json diff --git a/samples/meetings-notification/csharp/InMeetingNotifications/Manifest/outline.png b/samples/meetings-notification/csharp/InMeetingNotifications/AppManifest/outline.png similarity index 100% rename from samples/meetings-notification/csharp/InMeetingNotifications/Manifest/outline.png rename to samples/meetings-notification/csharp/InMeetingNotifications/AppManifest/outline.png diff --git a/samples/meetings-notification/csharp/README.md b/samples/meetings-notification/csharp/README.md index 80bf211563..39a0380ebe 100644 --- a/samples/meetings-notification/csharp/README.md +++ b/samples/meetings-notification/csharp/README.md @@ -29,7 +29,7 @@ This sample illustrates how to implement [In-Meeting Notification](https://learn ![Meetings Notification](InMeetingNotifications/Images/MeetingNotification.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Meetings Notification:** [Manifest](/samples/meetings-notification/csharp/demo-manifest/meetings-notification.zip) @@ -83,14 +83,14 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 5. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./Manifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `Manifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./Manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/meetings-notification/csharp/InMeetingNotifications/AdapterWithErrorHandler.cs#L26) line and put your debugger for local debug. diff --git a/samples/meetings-share-to-stage-signing/csharp/README.md b/samples/meetings-share-to-stage-signing/csharp/README.md index 28f9c0508b..24a6e4aa8f 100644 --- a/samples/meetings-share-to-stage-signing/csharp/README.md +++ b/samples/meetings-share-to-stage-signing/csharp/README.md @@ -181,10 +181,10 @@ sequenceDiagram - **This step is specific to Teams.** - - **Edit** the `manifest.json` contained in the `Source\MeetingSigning.Web\Manifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the `Source\MeetingSigning.Web\AppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `configurationUrl` inside `configurableTabs` . Replace `` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - **Edit** the `manifest.json` for `validDomains` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `Source\MeetingSigning.Web\Manifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `Source\MeetingSigning.Web\AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) ## Running the sample diff --git a/samples/meetings-share-to-stage-signing/csharp/Source/MeetingSigning.Web/Manifest/.gitignore b/samples/meetings-share-to-stage-signing/csharp/Source/MeetingSigning.Web/AppManifest/.gitignore similarity index 100% rename from samples/meetings-share-to-stage-signing/csharp/Source/MeetingSigning.Web/Manifest/.gitignore rename to samples/meetings-share-to-stage-signing/csharp/Source/MeetingSigning.Web/AppManifest/.gitignore diff --git a/samples/meetings-share-to-stage-signing/csharp/Source/MeetingSigning.Web/Manifest/colorIcon.png b/samples/meetings-share-to-stage-signing/csharp/Source/MeetingSigning.Web/AppManifest/colorIcon.png similarity index 100% rename from samples/meetings-share-to-stage-signing/csharp/Source/MeetingSigning.Web/Manifest/colorIcon.png rename to samples/meetings-share-to-stage-signing/csharp/Source/MeetingSigning.Web/AppManifest/colorIcon.png diff --git a/samples/meetings-share-to-stage-signing/csharp/Source/MeetingSigning.Web/Manifest/manifest.json b/samples/meetings-share-to-stage-signing/csharp/Source/MeetingSigning.Web/AppManifest/manifest.json similarity index 100% rename from samples/meetings-share-to-stage-signing/csharp/Source/MeetingSigning.Web/Manifest/manifest.json rename to samples/meetings-share-to-stage-signing/csharp/Source/MeetingSigning.Web/AppManifest/manifest.json diff --git a/samples/meetings-share-to-stage-signing/csharp/Source/MeetingSigning.Web/Manifest/outlineIcon.png b/samples/meetings-share-to-stage-signing/csharp/Source/MeetingSigning.Web/AppManifest/outlineIcon.png similarity index 100% rename from samples/meetings-share-to-stage-signing/csharp/Source/MeetingSigning.Web/Manifest/outlineIcon.png rename to samples/meetings-share-to-stage-signing/csharp/Source/MeetingSigning.Web/AppManifest/outlineIcon.png diff --git a/samples/meetings-sidepanel/csharp/README.md b/samples/meetings-sidepanel/csharp/README.md index 24d64946b3..1d9b314029 100644 --- a/samples/meetings-sidepanel/csharp/README.md +++ b/samples/meetings-sidepanel/csharp/README.md @@ -75,7 +75,7 @@ This sample illustrates how to implement [Side Panel](https://docs.microsoft.com - `<>` - Generated from Step 2, also referred to as Client secret - `<>` - Your application's base url. E.g. https://12345.ngrok-free.app if you are using ngrok and if you are using dev tunnels, your URL will be like: https://12345.devtunnels.ms. -6. Modify the `manifest.json` in the `/AppPackage` folder and replace the following details: +6. Modify the `manifest.json` in the `/AppManifest` folder and replace the following details: - <> with any random GUID or your MicrosoftAppId from AAD app registration. - `<>` with Application id generated from Step 2 - `{{Base_URL}}` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. @@ -92,7 +92,7 @@ This sample illustrates how to implement [Side Panel](https://docs.microsoft.com 9. Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./AppPackage folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. **Note**: If you are facing any issue in your app, [please uncomment this line](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/meetings-sidepanel/csharp/SidePanel/AdapterWithErrorHandler.cs#L26) and put your debugger for local debug. diff --git a/samples/meetings-sidepanel/csharp/SidePanel/AppPackage/color.png b/samples/meetings-sidepanel/csharp/SidePanel/AppManifest/color.png similarity index 100% rename from samples/meetings-sidepanel/csharp/SidePanel/AppPackage/color.png rename to samples/meetings-sidepanel/csharp/SidePanel/AppManifest/color.png diff --git a/samples/meetings-sidepanel/csharp/SidePanel/AppPackage/manifest.json b/samples/meetings-sidepanel/csharp/SidePanel/AppManifest/manifest.json similarity index 100% rename from samples/meetings-sidepanel/csharp/SidePanel/AppPackage/manifest.json rename to samples/meetings-sidepanel/csharp/SidePanel/AppManifest/manifest.json diff --git a/samples/meetings-sidepanel/csharp/SidePanel/AppPackage/outline.png b/samples/meetings-sidepanel/csharp/SidePanel/AppManifest/outline.png similarity index 100% rename from samples/meetings-sidepanel/csharp/SidePanel/AppPackage/outline.png rename to samples/meetings-sidepanel/csharp/SidePanel/AppManifest/outline.png diff --git a/samples/meetings-stage-view/csharp/AppInMeeting/AppPackage/color.png b/samples/meetings-stage-view/csharp/AppInMeeting/AppManifest/color.png similarity index 100% rename from samples/meetings-stage-view/csharp/AppInMeeting/AppPackage/color.png rename to samples/meetings-stage-view/csharp/AppInMeeting/AppManifest/color.png diff --git a/samples/meetings-stage-view/csharp/AppInMeeting/AppPackage/manifest.json b/samples/meetings-stage-view/csharp/AppInMeeting/AppManifest/manifest.json similarity index 100% rename from samples/meetings-stage-view/csharp/AppInMeeting/AppPackage/manifest.json rename to samples/meetings-stage-view/csharp/AppInMeeting/AppManifest/manifest.json diff --git a/samples/meetings-stage-view/csharp/AppInMeeting/AppPackage/outline.png b/samples/meetings-stage-view/csharp/AppInMeeting/AppManifest/outline.png similarity index 100% rename from samples/meetings-stage-view/csharp/AppInMeeting/AppPackage/outline.png rename to samples/meetings-stage-view/csharp/AppInMeeting/AppManifest/outline.png diff --git a/samples/meetings-stage-view/csharp/README.md b/samples/meetings-stage-view/csharp/README.md index cd7bc03c92..9787ac0393 100644 --- a/samples/meetings-stage-view/csharp/README.md +++ b/samples/meetings-stage-view/csharp/README.md @@ -33,7 +33,7 @@ For reference please check [Enable and configure your apps for Teams meetings](h ![Preview Image](Images/preview_mobile.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Realtime meeting stage view:** [Manifest](/samples/meetings-stage-view/csharp/demo-manifest/Meeting-stage-view.zip) @@ -133,14 +133,14 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 5. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./AppPackage folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `AppPackage` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./AppPackage folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. ## Running the sample diff --git a/samples/meetings-token-app/csharp/Resources/Manifest/icon-color.png b/samples/meetings-token-app/csharp/AppManifest/icon-color.png similarity index 100% rename from samples/meetings-token-app/csharp/Resources/Manifest/icon-color.png rename to samples/meetings-token-app/csharp/AppManifest/icon-color.png diff --git a/samples/meetings-token-app/csharp/Resources/Manifest/icon-outline.png b/samples/meetings-token-app/csharp/AppManifest/icon-outline.png similarity index 100% rename from samples/meetings-token-app/csharp/Resources/Manifest/icon-outline.png rename to samples/meetings-token-app/csharp/AppManifest/icon-outline.png diff --git a/samples/meetings-token-app/csharp/Resources/Manifest/manifest.json b/samples/meetings-token-app/csharp/AppManifest/manifest.json similarity index 100% rename from samples/meetings-token-app/csharp/Resources/Manifest/manifest.json rename to samples/meetings-token-app/csharp/AppManifest/manifest.json diff --git a/samples/meetings-token-app/csharp/README.md b/samples/meetings-token-app/csharp/README.md index c752ea2d0f..538f878432 100644 --- a/samples/meetings-token-app/csharp/README.md +++ b/samples/meetings-token-app/csharp/README.md @@ -36,7 +36,7 @@ This application also shows the implementation of Live Share SDK to update the d ![Preview](Images/Preview.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Meetings Token App:** [Manifest](/samples/meetings-token-app/csharp/demo-manifest/meetings-token-app.zip) @@ -129,14 +129,14 @@ The app uses the Teams extensibility features described on the following pages: ``` 5. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./Manifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `Manifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./Manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. - Enable developer preview in your desktop Teams client diff --git a/samples/msgext-action-preview/csharp/TeamsAppManifest/icon-color.png b/samples/msgext-action-preview/csharp/AppManifest/icon-color.png similarity index 100% rename from samples/msgext-action-preview/csharp/TeamsAppManifest/icon-color.png rename to samples/msgext-action-preview/csharp/AppManifest/icon-color.png diff --git a/samples/msgext-action-preview/csharp/TeamsAppManifest/icon-outline.png b/samples/msgext-action-preview/csharp/AppManifest/icon-outline.png similarity index 100% rename from samples/msgext-action-preview/csharp/TeamsAppManifest/icon-outline.png rename to samples/msgext-action-preview/csharp/AppManifest/icon-outline.png diff --git a/samples/msgext-action-preview/csharp/TeamsAppManifest/manifest.json b/samples/msgext-action-preview/csharp/AppManifest/manifest.json similarity index 100% rename from samples/msgext-action-preview/csharp/TeamsAppManifest/manifest.json rename to samples/msgext-action-preview/csharp/AppManifest/manifest.json diff --git a/samples/msgext-action-preview/csharp/README.md b/samples/msgext-action-preview/csharp/README.md index 2818ee49ed..597a3a68bf 100644 --- a/samples/msgext-action-preview/csharp/README.md +++ b/samples/msgext-action-preview/csharp/README.md @@ -29,7 +29,7 @@ This Messaging Extension has been created using [Bot Framework](https://dev.botf ![msgext-action-preview ](Images/msgext-action-preview.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Teams Messaging Extensions Action Preview:** [Manifest](/samples/msgext-action-preview/csharp/demo-manifest/msgext-action-preview.zip) @@ -85,9 +85,9 @@ the Teams service needs to call into the bot. 1) Run your bot, either from Visual Studio with `F5` or using `dotnet run` in the appropriate folder. 1) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `TeamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the `AppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `TeamsAppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) - Add the app in team scope (Supported app scope) diff --git a/samples/msgext-action-preview/java/README.md b/samples/msgext-action-preview/java/README.md index 5ea78883f8..4d8e74beab 100644 --- a/samples/msgext-action-preview/java/README.md +++ b/samples/msgext-action-preview/java/README.md @@ -32,7 +32,7 @@ This sample is a Spring Boot app and uses the Azure CLI and azure-webapp Maven p ![MsgExtAction](Images/MsgExtPreview.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Teams Messaging Extensions Action Preview:** [Manifest](/samples/msgext-action-preview/csharp/demo-manifest/msgext-action-preview.zip) @@ -87,9 +87,9 @@ the Teams service needs to call into the bot. - Run it by using `java -jar .\target\bot-teams-messaging-extensions-action-preview-sample.jar` command in a terminal 1) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `teamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the `appManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `TeamsAppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `appManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) - Add the app in team scope (Supported app scope) diff --git a/samples/msgext-action-preview/java/teamsAppManifest/icon-color.png b/samples/msgext-action-preview/java/appManifest/icon-color.png similarity index 100% rename from samples/msgext-action-preview/java/teamsAppManifest/icon-color.png rename to samples/msgext-action-preview/java/appManifest/icon-color.png diff --git a/samples/msgext-action-preview/java/teamsAppManifest/icon-outline.png b/samples/msgext-action-preview/java/appManifest/icon-outline.png similarity index 100% rename from samples/msgext-action-preview/java/teamsAppManifest/icon-outline.png rename to samples/msgext-action-preview/java/appManifest/icon-outline.png diff --git a/samples/msgext-action-preview/java/teamsAppManifest/manifest.json b/samples/msgext-action-preview/java/appManifest/manifest.json similarity index 100% rename from samples/msgext-action-preview/java/teamsAppManifest/manifest.json rename to samples/msgext-action-preview/java/appManifest/manifest.json diff --git a/samples/msgext-action-preview/python/README.md b/samples/msgext-action-preview/python/README.md index 48e32e10c4..805df5d7d3 100644 --- a/samples/msgext-action-preview/python/README.md +++ b/samples/msgext-action-preview/python/README.md @@ -77,8 +77,8 @@ the Teams service needs to call into the bot. 1) Update the `config.py` configuration for the bot to use the Microsoft App Id and App Password from the Bot Framework registration. (Note the App Password is referred to as the "client secret" in the azure portal and you can always create a new client secret anytime.) 1) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `teamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - - **Zip** up the contents of the `teamsAppManifest` folder to create a `manifest.zip` + - **Edit** the `manifest.json` contained in the `appManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Zip** up the contents of the `appManifest` folder to create a `manifest.zip` - **Upload** the `manifest.zip` to Teams (in the Apps view click "Upload a custom app") 1) Run your bot with `python app.py` diff --git a/samples/msgext-action-preview/python/teams_app_manifest/icon-color.png b/samples/msgext-action-preview/python/appManifest/icon-color.png similarity index 100% rename from samples/msgext-action-preview/python/teams_app_manifest/icon-color.png rename to samples/msgext-action-preview/python/appManifest/icon-color.png diff --git a/samples/msgext-action-preview/python/teams_app_manifest/icon-outline.png b/samples/msgext-action-preview/python/appManifest/icon-outline.png similarity index 100% rename from samples/msgext-action-preview/python/teams_app_manifest/icon-outline.png rename to samples/msgext-action-preview/python/appManifest/icon-outline.png diff --git a/samples/msgext-action-preview/python/teams_app_manifest/manifest.json b/samples/msgext-action-preview/python/appManifest/manifest.json similarity index 100% rename from samples/msgext-action-preview/python/teams_app_manifest/manifest.json rename to samples/msgext-action-preview/python/appManifest/manifest.json diff --git a/samples/msgext-action/csharp/TeamsAppManifest/icon-color.png b/samples/msgext-action/csharp/AppManifest/icon-color.png similarity index 100% rename from samples/msgext-action/csharp/TeamsAppManifest/icon-color.png rename to samples/msgext-action/csharp/AppManifest/icon-color.png diff --git a/samples/msgext-action/csharp/TeamsAppManifest/icon-outline.png b/samples/msgext-action/csharp/AppManifest/icon-outline.png similarity index 100% rename from samples/msgext-action/csharp/TeamsAppManifest/icon-outline.png rename to samples/msgext-action/csharp/AppManifest/icon-outline.png diff --git a/samples/msgext-action/csharp/TeamsAppManifest/manifest.json b/samples/msgext-action/csharp/AppManifest/manifest.json similarity index 100% rename from samples/msgext-action/csharp/TeamsAppManifest/manifest.json rename to samples/msgext-action/csharp/AppManifest/manifest.json diff --git a/samples/msgext-action/csharp/README.md b/samples/msgext-action/csharp/README.md index 89ef63e773..1000167985 100644 --- a/samples/msgext-action/csharp/README.md +++ b/samples/msgext-action/csharp/README.md @@ -86,9 +86,9 @@ the Teams service needs to call into the bot. 1) Run your bot, either from Visual Studio with `F5` or using `dotnet run` in the appropriate folder. 1) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `TeamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the `AppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `TeamsAppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) - Add the bot to personal/team/groupChat scope (Supported scopes) diff --git a/samples/msgext-action/java/README.md b/samples/msgext-action/java/README.md index e6e61b52d5..805a79810b 100644 --- a/samples/msgext-action/java/README.md +++ b/samples/msgext-action/java/README.md @@ -87,9 +87,9 @@ the Teams service needs to call into the bot. - Run it by using `java -jar .\target\bot-teams-messaging-extensions-action-sample.jar` command in a terminal 1) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `teamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the `appManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `TeamsAppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `appManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) ## Running the sample @@ -110,7 +110,7 @@ the Teams service needs to call into the bot. 3. Selecting the **FetchRoster** command from the Message command list. *Even though this action is being shown on the contextual menu, it's not implemented and is expected to fail.* ![FetchRoster](Images/FetchRoster.PNG) -**Note:** Likewise you can try with all other configured commands in you manifest. +**Note:** Likewise you can try with all other configured commands in your app manifest. ## Deploy the bot to Azure diff --git a/samples/msgext-action/java/teamsAppManifest/icon-color.png b/samples/msgext-action/java/appManifest/icon-color.png similarity index 100% rename from samples/msgext-action/java/teamsAppManifest/icon-color.png rename to samples/msgext-action/java/appManifest/icon-color.png diff --git a/samples/msgext-action/java/teamsAppManifest/icon-outline.png b/samples/msgext-action/java/appManifest/icon-outline.png similarity index 100% rename from samples/msgext-action/java/teamsAppManifest/icon-outline.png rename to samples/msgext-action/java/appManifest/icon-outline.png diff --git a/samples/msgext-action/java/teamsAppManifest/manifest.json b/samples/msgext-action/java/appManifest/manifest.json similarity index 100% rename from samples/msgext-action/java/teamsAppManifest/manifest.json rename to samples/msgext-action/java/appManifest/manifest.json diff --git a/samples/msgext-action/python/README.md b/samples/msgext-action/python/README.md index ddc392994e..6bcbc76ad0 100644 --- a/samples/msgext-action/python/README.md +++ b/samples/msgext-action/python/README.md @@ -29,7 +29,7 @@ build an Action-based Messaging Extension. ![MsgExtAction](Images/MsgExtAction.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Teams Messaging Extensions Action:** [Manifest](/samples/msgext-action/csharp/demo-manifest/msgext-action.zip) @@ -76,8 +76,8 @@ the Teams service needs to call into the bot. 1) Update the `config.py` configuration for the bot to use the Microsoft App Id and App Password from the Bot Framework registration. (Note the App Password is referred to as the "client secret" in the azure portal and you can always create a new client secret anytime.) 1) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `teamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - - **Zip** up the contents of the `teamsAppManifest` folder to create a `manifest.zip` + - **Edit** the `manifest.json` contained in the `appManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Zip** up the contents of the `appManifest` folder to create a `manifest.zip` - **Upload** the `manifest.zip` to Teams (in the Apps view click "Upload a custom app") 1) Run your bot with `python app.py` diff --git a/samples/msgext-action/python/teams_app_manifest/icon-color.png b/samples/msgext-action/python/appManifest/icon-color.png similarity index 100% rename from samples/msgext-action/python/teams_app_manifest/icon-color.png rename to samples/msgext-action/python/appManifest/icon-color.png diff --git a/samples/msgext-action/python/teams_app_manifest/icon-outline.png b/samples/msgext-action/python/appManifest/icon-outline.png similarity index 100% rename from samples/msgext-action/python/teams_app_manifest/icon-outline.png rename to samples/msgext-action/python/appManifest/icon-outline.png diff --git a/samples/msgext-action/python/teams_app_manifest/manifest.json b/samples/msgext-action/python/appManifest/manifest.json similarity index 100% rename from samples/msgext-action/python/teams_app_manifest/manifest.json rename to samples/msgext-action/python/appManifest/manifest.json diff --git a/samples/msgext-link-unfurling-meeting/csharp/Manifest/color.png b/samples/msgext-link-unfurling-meeting/csharp/AppManifest/color.png similarity index 100% rename from samples/msgext-link-unfurling-meeting/csharp/Manifest/color.png rename to samples/msgext-link-unfurling-meeting/csharp/AppManifest/color.png diff --git a/samples/msgext-link-unfurling-meeting/csharp/Manifest/manifest.json b/samples/msgext-link-unfurling-meeting/csharp/AppManifest/manifest.json similarity index 100% rename from samples/msgext-link-unfurling-meeting/csharp/Manifest/manifest.json rename to samples/msgext-link-unfurling-meeting/csharp/AppManifest/manifest.json diff --git a/samples/msgext-link-unfurling-meeting/csharp/Manifest/outline.png b/samples/msgext-link-unfurling-meeting/csharp/AppManifest/outline.png similarity index 100% rename from samples/msgext-link-unfurling-meeting/csharp/Manifest/outline.png rename to samples/msgext-link-unfurling-meeting/csharp/AppManifest/outline.png diff --git a/samples/msgext-link-unfurling-meeting/csharp/README.md b/samples/msgext-link-unfurling-meeting/csharp/README.md index 2efd4cf5f0..9c779496a6 100644 --- a/samples/msgext-link-unfurling-meeting/csharp/README.md +++ b/samples/msgext-link-unfurling-meeting/csharp/README.md @@ -179,13 +179,13 @@ This sample illustrates a common scenario where a user shares a link to a resour 6. Setup Manifest for Teams - **This step is specific to Teams.** - - **Edit** the `manifest.json` contained in the `samples\msgext-link-unfurling-meeting\csharp\Manifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the `samples\msgext-link-unfurling-meeting\csharp\AppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `websiteUrl`,`privacyUrl`,`termsOfUseUrl` inside `DeveloperTabs` . Replace `` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - **Edit** the `manifest.json` for `validDomains` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - **Edit** the `manifest.json` for `showLoadingIndicator` Replace `false`. - - **Zip** up the contents of the `samples\msgext-link-unfurling-meeting\csharp\Manifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `samples\msgext-link-unfurling-meeting\csharp\AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) - Add the app to personal/team/groupChat scope (Supported scopes) diff --git a/samples/msgext-link-unfurling-reddit/csharp/Manifest/color.png b/samples/msgext-link-unfurling-reddit/csharp/AppManifest/color.png similarity index 100% rename from samples/msgext-link-unfurling-reddit/csharp/Manifest/color.png rename to samples/msgext-link-unfurling-reddit/csharp/AppManifest/color.png diff --git a/samples/msgext-link-unfurling-reddit/csharp/Manifest/manifest.json b/samples/msgext-link-unfurling-reddit/csharp/AppManifest/manifest.json similarity index 100% rename from samples/msgext-link-unfurling-reddit/csharp/Manifest/manifest.json rename to samples/msgext-link-unfurling-reddit/csharp/AppManifest/manifest.json diff --git a/samples/msgext-link-unfurling-reddit/csharp/Manifest/outline.png b/samples/msgext-link-unfurling-reddit/csharp/AppManifest/outline.png similarity index 100% rename from samples/msgext-link-unfurling-reddit/csharp/Manifest/outline.png rename to samples/msgext-link-unfurling-reddit/csharp/AppManifest/outline.png diff --git a/samples/msgext-link-unfurling/csharp/TeamsAppManifest/icon-color.png b/samples/msgext-link-unfurling/csharp/AppManifest/icon-color.png similarity index 100% rename from samples/msgext-link-unfurling/csharp/TeamsAppManifest/icon-color.png rename to samples/msgext-link-unfurling/csharp/AppManifest/icon-color.png diff --git a/samples/msgext-link-unfurling/csharp/TeamsAppManifest/icon-outline.png b/samples/msgext-link-unfurling/csharp/AppManifest/icon-outline.png similarity index 100% rename from samples/msgext-link-unfurling/csharp/TeamsAppManifest/icon-outline.png rename to samples/msgext-link-unfurling/csharp/AppManifest/icon-outline.png diff --git a/samples/msgext-link-unfurling/csharp/TeamsAppManifest/manifest.json b/samples/msgext-link-unfurling/csharp/AppManifest/manifest.json similarity index 100% rename from samples/msgext-link-unfurling/csharp/TeamsAppManifest/manifest.json rename to samples/msgext-link-unfurling/csharp/AppManifest/manifest.json diff --git a/samples/msgext-link-unfurling/csharp/README.md b/samples/msgext-link-unfurling/csharp/README.md index 9306b6da83..97802bdda5 100644 --- a/samples/msgext-link-unfurling/csharp/README.md +++ b/samples/msgext-link-unfurling/csharp/README.md @@ -29,7 +29,7 @@ This bot has been created using [Bot Framework](https://dev.botframework.com), i ![msgext-link-unfurling ](Images/msgext-link-unfurling.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Teams Link Unfurl Bot:** [Manifest](/samples/msgext-link-unfurling/csharp/demo-manifest/msgext-link-unfurling.zip) @@ -88,8 +88,8 @@ the Teams service needs to call into the bot. 1) Run your bot, either from Visual Studio with `F5` or using `dotnet run` in the appropriate folder. 1) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `TeamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - - **Zip** up the contents of the `TeamsAppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Edit** the `manifest.json` contained in the `AppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/msgext-link-unfurling/csharp/AdapterWithErrorHandler.cs#L25) line and put your debugger for local debug. diff --git a/samples/msgext-link-unfurling/java/README.md b/samples/msgext-link-unfurling/java/README.md index 459ccea173..cc3084c137 100644 --- a/samples/msgext-link-unfurling/java/README.md +++ b/samples/msgext-link-unfurling/java/README.md @@ -31,7 +31,7 @@ This sample is a Spring Boot app and uses the Azure CLI and azure-webapp Maven p ![MsgExtLink](Images/LinkUnfurling.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Teams Link Unfurl Bot:** [Manifest](/samples/msgext-link-unfurling/csharp/demo-manifest/msgext-link-unfurling.zip) @@ -85,8 +85,8 @@ the Teams service needs to call into the bot. - Run it by using `java -jar .\target\bot-teams-link-unfurl-sample.jar` command in a terminal 1) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `teamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - - **Zip** up the contents of the `TeamsAppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Edit** the `manifest.json` contained in the `appManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Zip** up the contents of the `appManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) ## Running the sample diff --git a/samples/msgext-link-unfurling/java/TeamsAppManifest/icon-color.png b/samples/msgext-link-unfurling/java/appManifest/icon-color.png similarity index 100% rename from samples/msgext-link-unfurling/java/TeamsAppManifest/icon-color.png rename to samples/msgext-link-unfurling/java/appManifest/icon-color.png diff --git a/samples/msgext-link-unfurling/java/TeamsAppManifest/icon-outline.png b/samples/msgext-link-unfurling/java/appManifest/icon-outline.png similarity index 100% rename from samples/msgext-link-unfurling/java/TeamsAppManifest/icon-outline.png rename to samples/msgext-link-unfurling/java/appManifest/icon-outline.png diff --git a/samples/msgext-link-unfurling/java/TeamsAppManifest/manifest.json b/samples/msgext-link-unfurling/java/appManifest/manifest.json similarity index 100% rename from samples/msgext-link-unfurling/java/TeamsAppManifest/manifest.json rename to samples/msgext-link-unfurling/java/appManifest/manifest.json diff --git a/samples/msgext-link-unfurling/python/README.md b/samples/msgext-link-unfurling/python/README.md index 4070832af8..7dc4b27dfa 100644 --- a/samples/msgext-link-unfurling/python/README.md +++ b/samples/msgext-link-unfurling/python/README.md @@ -29,7 +29,7 @@ This bot has been created using [Bot Framework](https://dev.botframework.com), i ![MsgExtLink](Images/LinkUnfurling.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Teams Link Unfurl Bot:** [Manifest](/samples/msgext-link-unfurling/csharp/demo-manifest/msgext-link-unfurling.zip) @@ -76,8 +76,8 @@ the Teams service needs to call into the bot. 1) Update the `config.py` configuration for the bot to use the Microsoft App Id and App Password from the Bot Framework registration. (Note the App Password is referred to as the "client secret" in the azure portal and you can always create a new client secret anytime.) 1) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `teamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - - **Zip** up the contents of the `teamsAppManifest` folder to create a `manifest.zip` + - **Edit** the `manifest.json` contained in the `appManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Zip** up the contents of the `appManifest` folder to create a `manifest.zip` - **Upload** the `manifest.zip` to Teams (in the Apps view click "Upload a custom app") 1) Run your bot with `python app.py` diff --git a/samples/msgext-link-unfurling/python/teams_app_manifest/icon-color.png b/samples/msgext-link-unfurling/python/appManifest/icon-color.png similarity index 100% rename from samples/msgext-link-unfurling/python/teams_app_manifest/icon-color.png rename to samples/msgext-link-unfurling/python/appManifest/icon-color.png diff --git a/samples/msgext-link-unfurling/python/teams_app_manifest/icon-outline.png b/samples/msgext-link-unfurling/python/appManifest/icon-outline.png similarity index 100% rename from samples/msgext-link-unfurling/python/teams_app_manifest/icon-outline.png rename to samples/msgext-link-unfurling/python/appManifest/icon-outline.png diff --git a/samples/msgext-link-unfurling/python/teams_app_manifest/manifest.json b/samples/msgext-link-unfurling/python/appManifest/manifest.json similarity index 100% rename from samples/msgext-link-unfurling/python/teams_app_manifest/manifest.json rename to samples/msgext-link-unfurling/python/appManifest/manifest.json diff --git a/samples/msgext-message-reminder/csharp/MessagingExtensionReminder/AppPackage/color.png b/samples/msgext-message-reminder/csharp/MessagingExtensionReminder/AppManifest/color.png similarity index 100% rename from samples/msgext-message-reminder/csharp/MessagingExtensionReminder/AppPackage/color.png rename to samples/msgext-message-reminder/csharp/MessagingExtensionReminder/AppManifest/color.png diff --git a/samples/msgext-message-reminder/csharp/MessagingExtensionReminder/AppPackage/manifest.json b/samples/msgext-message-reminder/csharp/MessagingExtensionReminder/AppManifest/manifest.json similarity index 100% rename from samples/msgext-message-reminder/csharp/MessagingExtensionReminder/AppPackage/manifest.json rename to samples/msgext-message-reminder/csharp/MessagingExtensionReminder/AppManifest/manifest.json diff --git a/samples/msgext-message-reminder/csharp/MessagingExtensionReminder/AppPackage/outline.png b/samples/msgext-message-reminder/csharp/MessagingExtensionReminder/AppManifest/outline.png similarity index 100% rename from samples/msgext-message-reminder/csharp/MessagingExtensionReminder/AppPackage/outline.png rename to samples/msgext-message-reminder/csharp/MessagingExtensionReminder/AppManifest/outline.png diff --git a/samples/msgext-message-reminder/csharp/README.md b/samples/msgext-message-reminder/csharp/README.md index cf91603fe1..d394147d9b 100644 --- a/samples/msgext-message-reminder/csharp/README.md +++ b/samples/msgext-message-reminder/csharp/README.md @@ -22,7 +22,7 @@ This sample shows a feature where user can schedule a task from messaging extens ![Select message](MessagingExtensionReminder/Images/MessageExtensionReminderModule.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). ** Message reminder with messaging extension action:** [Manifest](/samples/msgext-message-reminder/csharp/demo-manifest/msgext-message-reminder.zip) @@ -87,14 +87,14 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 5. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./AppPackage folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `AppPackage` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./AppPackage folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/msgext-message-reminder/csharp/MessagingExtensionReminder/AdapterWithErrorHandler.cs#L30) line and put your debugger for local debug. diff --git a/samples/msgext-search-auth-config/csharp/TeamsAppManifest/icon-color.png b/samples/msgext-search-auth-config/csharp/AppManifest/icon-color.png similarity index 100% rename from samples/msgext-search-auth-config/csharp/TeamsAppManifest/icon-color.png rename to samples/msgext-search-auth-config/csharp/AppManifest/icon-color.png diff --git a/samples/msgext-search-auth-config/csharp/TeamsAppManifest/icon-outline.png b/samples/msgext-search-auth-config/csharp/AppManifest/icon-outline.png similarity index 100% rename from samples/msgext-search-auth-config/csharp/TeamsAppManifest/icon-outline.png rename to samples/msgext-search-auth-config/csharp/AppManifest/icon-outline.png diff --git a/samples/msgext-search-auth-config/csharp/TeamsAppManifest/manifest.json b/samples/msgext-search-auth-config/csharp/AppManifest/manifest.json similarity index 100% rename from samples/msgext-search-auth-config/csharp/TeamsAppManifest/manifest.json rename to samples/msgext-search-auth-config/csharp/AppManifest/manifest.json diff --git a/samples/msgext-search-auth-config/csharp/README.md b/samples/msgext-search-auth-config/csharp/README.md index e6c4e2966f..def267e001 100644 --- a/samples/msgext-search-auth-config/csharp/README.md +++ b/samples/msgext-search-auth-config/csharp/README.md @@ -35,7 +35,7 @@ This bot has been created using [Bot Framework](https://dev.botframework.com), i ![msgext-search-auth-config ](Images/msgext-search-auth-config.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Messaging Extension Auth:** [Manifest](/samples/msgext-search-auth-config/csharp/demo-manifest/msgext-search-auth-config.zip) @@ -91,9 +91,9 @@ Refer to [Bot SSO Setup document](https://github.com/OfficeDev/Microsoft-Teams-S 1) Run your bot, either from Visual Studio with `F5` or using `dotnet run` in the appropriate folder. 1) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `TeamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the MicrosoftAppId may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the `AppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the MicrosoftAppId may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `TeamsAppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/meetings-sidepanel/nodejs/server/index.js#L48) line and put your debugger for local debug. diff --git a/samples/msgext-search-auth-config/python/README.md b/samples/msgext-search-auth-config/python/README.md index c741cf6a12..59a3023811 100644 --- a/samples/msgext-search-auth-config/python/README.md +++ b/samples/msgext-search-auth-config/python/README.md @@ -75,14 +75,14 @@ the Teams service needs to call into the bot. 5. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./teams_app_manifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./appManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `teams_app_manifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `appManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./teams_app_manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./appManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. diff --git a/samples/msgext-search-auth-config/python/teams_app_manifest/icon-color.png b/samples/msgext-search-auth-config/python/appManifest/icon-color.png similarity index 100% rename from samples/msgext-search-auth-config/python/teams_app_manifest/icon-color.png rename to samples/msgext-search-auth-config/python/appManifest/icon-color.png diff --git a/samples/msgext-search-auth-config/python/teams_app_manifest/icon-outline.png b/samples/msgext-search-auth-config/python/appManifest/icon-outline.png similarity index 100% rename from samples/msgext-search-auth-config/python/teams_app_manifest/icon-outline.png rename to samples/msgext-search-auth-config/python/appManifest/icon-outline.png diff --git a/samples/msgext-search-auth-config/python/teams_app_manifest/manifest.json b/samples/msgext-search-auth-config/python/appManifest/manifest.json similarity index 100% rename from samples/msgext-search-auth-config/python/teams_app_manifest/manifest.json rename to samples/msgext-search-auth-config/python/appManifest/manifest.json diff --git a/samples/msgext-search/csharp/TeamsAppManifest/icon-color.png b/samples/msgext-search/csharp/AppManifest/icon-color.png similarity index 100% rename from samples/msgext-search/csharp/TeamsAppManifest/icon-color.png rename to samples/msgext-search/csharp/AppManifest/icon-color.png diff --git a/samples/msgext-search/csharp/TeamsAppManifest/icon-outline.png b/samples/msgext-search/csharp/AppManifest/icon-outline.png similarity index 100% rename from samples/msgext-search/csharp/TeamsAppManifest/icon-outline.png rename to samples/msgext-search/csharp/AppManifest/icon-outline.png diff --git a/samples/msgext-search/csharp/TeamsAppManifest/manifest.json b/samples/msgext-search/csharp/AppManifest/manifest.json similarity index 100% rename from samples/msgext-search/csharp/TeamsAppManifest/manifest.json rename to samples/msgext-search/csharp/AppManifest/manifest.json diff --git a/samples/msgext-search/csharp/README.md b/samples/msgext-search/csharp/README.md index 94c80f6ecd..fac70c9686 100644 --- a/samples/msgext-search/csharp/README.md +++ b/samples/msgext-search/csharp/README.md @@ -28,7 +28,7 @@ build a Search-based Messaging Extension. ![msgext-search ](Images/msgext-search.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Teams Messaging Extensions Search:** [Manifest](/samples/msgext-search/csharp/demo-manifest/msgext-search.zip) @@ -86,9 +86,9 @@ the Teams service needs to call into the bot. 1) Run your bot, either from Visual Studio with `F5` or using `dotnet run` in the appropriate folder. 1) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `TeamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the `AppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `TeamsAppManifest` folder to create a `manifest.zip` + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/msgext-search/csharp/AdapterWithErrorHandler.cs#L25) line and put your debugger for local debug. diff --git a/samples/msgext-search/java/README.md b/samples/msgext-search/java/README.md index a8a061150c..2a8733f0d9 100644 --- a/samples/msgext-search/java/README.md +++ b/samples/msgext-search/java/README.md @@ -84,9 +84,9 @@ the Teams service needs to call into the bot. - Run it by using `java -jar .\target\bot-teams-message-extensions-search-sample.jar` command in a terminal 1) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `TeamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the `appManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `TeamsAppManifest` folder to create a `manifest.zip` + - **Zip** up the contents of the `appManifest` folder to create a `manifest.zip` - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) ## Running the sample diff --git a/samples/msgext-search/java/teamsAppManifest/icon-color.png b/samples/msgext-search/java/appManifest/icon-color.png similarity index 100% rename from samples/msgext-search/java/teamsAppManifest/icon-color.png rename to samples/msgext-search/java/appManifest/icon-color.png diff --git a/samples/msgext-search/java/teamsAppManifest/icon-outline.png b/samples/msgext-search/java/appManifest/icon-outline.png similarity index 100% rename from samples/msgext-search/java/teamsAppManifest/icon-outline.png rename to samples/msgext-search/java/appManifest/icon-outline.png diff --git a/samples/msgext-search/java/teamsAppManifest/manifest.json b/samples/msgext-search/java/appManifest/manifest.json similarity index 100% rename from samples/msgext-search/java/teamsAppManifest/manifest.json rename to samples/msgext-search/java/appManifest/manifest.json diff --git a/samples/msgext-search/python/README.md b/samples/msgext-search/python/README.md index f5afd158b5..ed7317cbb4 100644 --- a/samples/msgext-search/python/README.md +++ b/samples/msgext-search/python/README.md @@ -78,8 +78,8 @@ the Teams service needs to call into the bot. 1) Update the `config.py` configuration for the bot to use the Microsoft App Id and App Password from the Bot Framework registration. (Note the App Password is referred to as the "client secret" in the azure portal and you can always create a new client secret anytime.) 1) __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `teamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - - **Zip** up the contents of the `teamsAppManifest` folder to create a `manifest.zip` + - **Edit** the `manifest.json` contained in the `appManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Zip** up the contents of the `appManifest` folder to create a `manifest.zip` - **Upload** the `manifest.zip` to Teams (in the Apps view click "Upload a custom app") 1) Run your bot with `python app.py` diff --git a/samples/msgext-search/python/teams_app_manifest/icon-color.png b/samples/msgext-search/python/appManifest/icon-color.png similarity index 100% rename from samples/msgext-search/python/teams_app_manifest/icon-color.png rename to samples/msgext-search/python/appManifest/icon-color.png diff --git a/samples/msgext-search/python/teams_app_manifest/icon-outline.png b/samples/msgext-search/python/appManifest/icon-outline.png similarity index 100% rename from samples/msgext-search/python/teams_app_manifest/icon-outline.png rename to samples/msgext-search/python/appManifest/icon-outline.png diff --git a/samples/msgext-search/python/teams_app_manifest/manifest.json b/samples/msgext-search/python/appManifest/manifest.json similarity index 100% rename from samples/msgext-search/python/teams_app_manifest/manifest.json rename to samples/msgext-search/python/appManifest/manifest.json diff --git a/samples/msteams-application-qbot/Manifest/color.png b/samples/msteams-application-qbot/AppManifest/color.png similarity index 100% rename from samples/msteams-application-qbot/Manifest/color.png rename to samples/msteams-application-qbot/AppManifest/color.png diff --git a/samples/msteams-application-qbot/Manifest/manifest.json b/samples/msteams-application-qbot/AppManifest/manifest.json similarity index 100% rename from samples/msteams-application-qbot/Manifest/manifest.json rename to samples/msteams-application-qbot/AppManifest/manifest.json diff --git a/samples/msteams-application-qbot/Manifest/outline.png b/samples/msteams-application-qbot/AppManifest/outline.png similarity index 100% rename from samples/msteams-application-qbot/Manifest/outline.png rename to samples/msteams-application-qbot/AppManifest/outline.png diff --git a/samples/msteams-application-resourcehub/Manifest/color.png b/samples/msteams-application-resourcehub/AppManifest/color.png similarity index 100% rename from samples/msteams-application-resourcehub/Manifest/color.png rename to samples/msteams-application-resourcehub/AppManifest/color.png diff --git a/samples/msteams-application-resourcehub/Manifest/manifest.json b/samples/msteams-application-resourcehub/AppManifest/manifest.json similarity index 100% rename from samples/msteams-application-resourcehub/Manifest/manifest.json rename to samples/msteams-application-resourcehub/AppManifest/manifest.json diff --git a/samples/msteams-application-resourcehub/Manifest/outline.png b/samples/msteams-application-resourcehub/AppManifest/outline.png similarity index 100% rename from samples/msteams-application-resourcehub/Manifest/outline.png rename to samples/msteams-application-resourcehub/AppManifest/outline.png diff --git a/samples/tab-adaptive-cards/csharp/README.md b/samples/tab-adaptive-cards/csharp/README.md index 3f28f29fb6..f5a4fdc932 100644 --- a/samples/tab-adaptive-cards/csharp/README.md +++ b/samples/tab-adaptive-cards/csharp/README.md @@ -30,7 +30,7 @@ This feature shown in this sample is in Public Developer Preview and is supporte ![Adaptive Card](TabWithAdpativeCardFlow/Images/Tabwithadaptivecard.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Tabs with Adaptive Cards:** [Manifest](/samples/tab-adaptive-cards/csharp/demo-manifest/tab-adaptive-card.zip) @@ -131,14 +131,14 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 5. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./AppPackage folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - - **Zip** up the contents of the `AppPackage` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./AppPackage folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/tab-adaptive-cards/csharp/TabWithAdpativeCardFlow/AdapterWithErrorHandler.cs#L30) line and put your debugger for local debug. diff --git a/samples/tab-adaptive-cards/csharp/TabWithAdpativeCardFlow/AppPackage/color.png b/samples/tab-adaptive-cards/csharp/TabWithAdpativeCardFlow/AppManifest/color.png similarity index 100% rename from samples/tab-adaptive-cards/csharp/TabWithAdpativeCardFlow/AppPackage/color.png rename to samples/tab-adaptive-cards/csharp/TabWithAdpativeCardFlow/AppManifest/color.png diff --git a/samples/tab-adaptive-cards/csharp/TabWithAdpativeCardFlow/AppPackage/manifest.json b/samples/tab-adaptive-cards/csharp/TabWithAdpativeCardFlow/AppManifest/manifest.json similarity index 100% rename from samples/tab-adaptive-cards/csharp/TabWithAdpativeCardFlow/AppPackage/manifest.json rename to samples/tab-adaptive-cards/csharp/TabWithAdpativeCardFlow/AppManifest/manifest.json diff --git a/samples/tab-adaptive-cards/csharp/TabWithAdpativeCardFlow/AppPackage/outline.png b/samples/tab-adaptive-cards/csharp/TabWithAdpativeCardFlow/AppManifest/outline.png similarity index 100% rename from samples/tab-adaptive-cards/csharp/TabWithAdpativeCardFlow/AppPackage/outline.png rename to samples/tab-adaptive-cards/csharp/TabWithAdpativeCardFlow/AppManifest/outline.png diff --git a/samples/tab-channel-group-config-page-auth/csharp/ConfigTabAuthentication/Manifest/color.png b/samples/tab-channel-group-config-page-auth/csharp/ConfigTabAuthentication/AppManifest/color.png similarity index 100% rename from samples/tab-channel-group-config-page-auth/csharp/ConfigTabAuthentication/Manifest/color.png rename to samples/tab-channel-group-config-page-auth/csharp/ConfigTabAuthentication/AppManifest/color.png diff --git a/samples/tab-channel-group-config-page-auth/csharp/ConfigTabAuthentication/Manifest/manifest.json b/samples/tab-channel-group-config-page-auth/csharp/ConfigTabAuthentication/AppManifest/manifest.json similarity index 100% rename from samples/tab-channel-group-config-page-auth/csharp/ConfigTabAuthentication/Manifest/manifest.json rename to samples/tab-channel-group-config-page-auth/csharp/ConfigTabAuthentication/AppManifest/manifest.json diff --git a/samples/tab-channel-group-config-page-auth/csharp/ConfigTabAuthentication/Manifest/outline.png b/samples/tab-channel-group-config-page-auth/csharp/ConfigTabAuthentication/AppManifest/outline.png similarity index 100% rename from samples/tab-channel-group-config-page-auth/csharp/ConfigTabAuthentication/Manifest/outline.png rename to samples/tab-channel-group-config-page-auth/csharp/ConfigTabAuthentication/AppManifest/outline.png diff --git a/samples/tab-channel-group-config-page-auth/csharp/README.md b/samples/tab-channel-group-config-page-auth/csharp/README.md index 4c7a4c683d..bd498ebba7 100644 --- a/samples/tab-channel-group-config-page-auth/csharp/README.md +++ b/samples/tab-channel-group-config-page-auth/csharp/README.md @@ -26,7 +26,7 @@ OAuth 2.0 is an open standard for authentication used by Azure AD and many other ![Initial Config Page](ConfigTabAuthentication/Images/Configtabauthenticatonmodule.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Config Tab Authentication:** [Manifest](/samples/tab-channel-group-config-page-auth/csharp/demo-manifest/tab-channel-group-config-page-auth.zip) @@ -109,15 +109,15 @@ Azure AD, like most identity providers, does not allow its content to be placed 4. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./Manifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - **Edit** the `manifest.json` for `webApplicationInfo` resource `"api://<>/<>"` with MicrosoftAppId. E.g. `""api://1235.ngrok-free.app/0000000000-0000000-000000""`. - - **Zip** up the contents of the `Manifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./Manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. 5) Run your tab, either from Visual Studio with `F5` or using `dotnet run` in the appropriate folder. diff --git a/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/appPackage/color.png b/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/AppManifest/color.png similarity index 100% rename from samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/appPackage/color.png rename to samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/AppManifest/color.png diff --git a/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/appPackage/manifest.json b/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/AppManifest/manifest.json similarity index 100% rename from samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/appPackage/manifest.json rename to samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/AppManifest/manifest.json diff --git a/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/appPackage/outline.png b/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/AppManifest/outline.png similarity index 100% rename from samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/appPackage/outline.png rename to samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/AppManifest/outline.png diff --git a/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/README.md b/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/README.md index 9ccfc55361..4a88a1228c 100644 --- a/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/README.md +++ b/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/README.md @@ -126,15 +126,15 @@ urlFragment: officedev-microsoft-teams-samples-tab-channel-group-sso-quickstart- 4. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./AppPackage folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - **Edit** the `manifest.json` for `webApplicationInfo` resource `"api://<>/<>""` with MicrosoftAppId. E.g. `"api://ngrok-free.app/0000000000-0000000000-0000000"`. - - **Zip** up the contents of the `AppPackage` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./AppPackage folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. ## Running the sample. diff --git a/samples/tab-channel-group/mvc-csharp/README.md b/samples/tab-channel-group/mvc-csharp/README.md index ee5a61942f..44fb80af6d 100644 --- a/samples/tab-channel-group/mvc-csharp/README.md +++ b/samples/tab-channel-group/mvc-csharp/README.md @@ -37,7 +37,7 @@ In this quickstart we'll walk-through creating a custom channel/group tab with A ![configureteams](Images/ChannelGroupTabModule.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Channel and group tabs in ASP.NET Core with MVC:** [Manifest](/samples/tab-channel-group/mvc-csharp/demo-manifest/tab-channel-group.zip) diff --git a/samples/tab-channel-group/razor-csharp/README.md b/samples/tab-channel-group/razor-csharp/README.md index 6fdbcdcb5d..78ef9a8214 100644 --- a/samples/tab-channel-group/razor-csharp/README.md +++ b/samples/tab-channel-group/razor-csharp/README.md @@ -25,7 +25,7 @@ In this quickstart we'll walk-through creating a custom channel/group tab with C ![Group Channel Tab](Images/ChannelGroupTabModule.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Channel and group tabs in ASP.NET Core with MVC:** [Manifest](/samples/tab-channel-group/mvc-csharp/demo-manifest/tab-channel-group.zip) diff --git a/samples/tab-conversations/csharp/README.md b/samples/tab-conversations/csharp/README.md index c6685b2e2f..56b8868d13 100644 --- a/samples/tab-conversations/csharp/README.md +++ b/samples/tab-conversations/csharp/README.md @@ -25,7 +25,7 @@ This Teams tab app provides a way to allow users to have conversations about sub ![TabConversationModule](TabConversation/Images/tabconversationmodule.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Conversational Tabs:** [Manifest](/samples/tab-conversations/csharp/demo-manifest/tab-conversations.zip) diff --git a/samples/tab-deeplink/csharp/DeepLinkBot/Manifest/color.png b/samples/tab-deeplink/csharp/DeepLinkBot/AppManifest/color.png similarity index 100% rename from samples/tab-deeplink/csharp/DeepLinkBot/Manifest/color.png rename to samples/tab-deeplink/csharp/DeepLinkBot/AppManifest/color.png diff --git a/samples/tab-deeplink/csharp/DeepLinkBot/Manifest/manifest.json b/samples/tab-deeplink/csharp/DeepLinkBot/AppManifest/manifest.json similarity index 100% rename from samples/tab-deeplink/csharp/DeepLinkBot/Manifest/manifest.json rename to samples/tab-deeplink/csharp/DeepLinkBot/AppManifest/manifest.json diff --git a/samples/tab-deeplink/csharp/DeepLinkBot/Manifest/outline.png b/samples/tab-deeplink/csharp/DeepLinkBot/AppManifest/outline.png similarity index 100% rename from samples/tab-deeplink/csharp/DeepLinkBot/Manifest/outline.png rename to samples/tab-deeplink/csharp/DeepLinkBot/AppManifest/outline.png diff --git a/samples/tab-deeplink/csharp/DeepLinkBot/Manifest_Hub/color.png b/samples/tab-deeplink/csharp/DeepLinkBot/AppManifest_Hub/color.png similarity index 100% rename from samples/tab-deeplink/csharp/DeepLinkBot/Manifest_Hub/color.png rename to samples/tab-deeplink/csharp/DeepLinkBot/AppManifest_Hub/color.png diff --git a/samples/tab-deeplink/csharp/DeepLinkBot/Manifest_Hub/manifest.json b/samples/tab-deeplink/csharp/DeepLinkBot/AppManifest_Hub/manifest.json similarity index 100% rename from samples/tab-deeplink/csharp/DeepLinkBot/Manifest_Hub/manifest.json rename to samples/tab-deeplink/csharp/DeepLinkBot/AppManifest_Hub/manifest.json diff --git a/samples/tab-deeplink/csharp/DeepLinkBot/Manifest_Hub/outline.png b/samples/tab-deeplink/csharp/DeepLinkBot/AppManifest_Hub/outline.png similarity index 100% rename from samples/tab-deeplink/csharp/DeepLinkBot/Manifest_Hub/outline.png rename to samples/tab-deeplink/csharp/DeepLinkBot/AppManifest_Hub/outline.png diff --git a/samples/tab-deeplink/csharp/README.md b/samples/tab-deeplink/csharp/README.md index 9023033603..73567c30ee 100644 --- a/samples/tab-deeplink/csharp/README.md +++ b/samples/tab-deeplink/csharp/README.md @@ -98,11 +98,11 @@ urlFragment: officedev-microsoft-teams-samples-tab-deeplink-csharp - Run your bot, either from Visual Studio with `F5` or using `dotnet run` in the appropriate folder. 5. __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the `Manifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* + - **Edit** the `manifest.json` contained in the `AppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<>` value(depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json` and `{{domain-name}}` with base Url domain. E.g. if you are using ngrok it would be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be `12345.devtunnels.ms`. - **Edit** the `manifest.json` for `validDomains` with base Url domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `tab-deeplink\csharp\DeepLinkBot\Manifest_Hub` folder with the required values. - - **Zip** up the contents of the `Manifest` folder to create a `Manifest.zip` or `Manifest_Hub` folder into a `Manifest_Hub.zip`. (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `tab-deeplink\csharp\DeepLinkBot\AppManifest_Hub` folder with the required values. + - **Zip** up the contents of the `Manifest` folder to create a `Manifest.zip` or `AppManifest_Hub` folder into a `AppManifest_Hub.zip`. (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - **Upload** the `manifest.zip` to Teams (In Teams Apps/Manage your apps click "Upload an app". Browse to and Open the .zip file. At the next dialog, click the Add button.) - Add the app to personal/team/groupChat scope (Supported scopes) diff --git a/samples/tab-graph-toolkit/csharp/README.md b/samples/tab-graph-toolkit/csharp/README.md index 063aa7d90d..2dcbfd83cc 100644 --- a/samples/tab-graph-toolkit/csharp/README.md +++ b/samples/tab-graph-toolkit/csharp/README.md @@ -99,14 +99,14 @@ This is the demo app for [Teams tab using miscrosoft graph toolkit](https://docs 4. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./AppPackage folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `tab-graph-toolkit\csharp\TabGraphToolkit` folder with the required values. - - **Zip** up the contents of the `appPackage` folder to create a `manifest.zip` or `Manifest_Hub` folder into a `manifest.zip`.(Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `AppManifest` folder to create a `manifest.zip` or `AppManifest_Hub` folder into a `manifest.zip`.(Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./AppPackage folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. ## Running the sample diff --git a/samples/tab-graph-toolkit/csharp/TabGraphToolkit/appPackage/color.png b/samples/tab-graph-toolkit/csharp/TabGraphToolkit/AppManifest/color.png similarity index 100% rename from samples/tab-graph-toolkit/csharp/TabGraphToolkit/appPackage/color.png rename to samples/tab-graph-toolkit/csharp/TabGraphToolkit/AppManifest/color.png diff --git a/samples/tab-graph-toolkit/csharp/TabGraphToolkit/appPackage/manifest.json b/samples/tab-graph-toolkit/csharp/TabGraphToolkit/AppManifest/manifest.json similarity index 100% rename from samples/tab-graph-toolkit/csharp/TabGraphToolkit/appPackage/manifest.json rename to samples/tab-graph-toolkit/csharp/TabGraphToolkit/AppManifest/manifest.json diff --git a/samples/tab-graph-toolkit/csharp/TabGraphToolkit/appPackage/outline.png b/samples/tab-graph-toolkit/csharp/TabGraphToolkit/AppManifest/outline.png similarity index 100% rename from samples/tab-graph-toolkit/csharp/TabGraphToolkit/appPackage/outline.png rename to samples/tab-graph-toolkit/csharp/TabGraphToolkit/AppManifest/outline.png diff --git a/samples/tab-people-picker/csharp/README.md b/samples/tab-people-picker/csharp/README.md index 0589846e4e..8c0746efef 100644 --- a/samples/tab-people-picker/csharp/README.md +++ b/samples/tab-people-picker/csharp/README.md @@ -87,14 +87,14 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 4. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./Manifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - **Zip** up the contents of the `Manifest` folder to create a `manifest.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./Manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. - [Upload app manifest file](https://docs.microsoft.com/microsoftteams/platform/concepts/deploy-and-publish/apps-upload#load-your-package-into-teams) (zip file) to your team diff --git a/samples/tab-people-picker/csharp/TabPeoplePicker/Manifest/color.png b/samples/tab-people-picker/csharp/TabPeoplePicker/AppManifest/color.png similarity index 100% rename from samples/tab-people-picker/csharp/TabPeoplePicker/Manifest/color.png rename to samples/tab-people-picker/csharp/TabPeoplePicker/AppManifest/color.png diff --git a/samples/tab-people-picker/csharp/TabPeoplePicker/Manifest/color.zip b/samples/tab-people-picker/csharp/TabPeoplePicker/AppManifest/color.zip similarity index 100% rename from samples/tab-people-picker/csharp/TabPeoplePicker/Manifest/color.zip rename to samples/tab-people-picker/csharp/TabPeoplePicker/AppManifest/color.zip diff --git a/samples/tab-people-picker/csharp/TabPeoplePicker/Manifest/manifest.json b/samples/tab-people-picker/csharp/TabPeoplePicker/AppManifest/manifest.json similarity index 100% rename from samples/tab-people-picker/csharp/TabPeoplePicker/Manifest/manifest.json rename to samples/tab-people-picker/csharp/TabPeoplePicker/AppManifest/manifest.json diff --git a/samples/tab-people-picker/csharp/TabPeoplePicker/Manifest/outline.png b/samples/tab-people-picker/csharp/TabPeoplePicker/AppManifest/outline.png similarity index 100% rename from samples/tab-people-picker/csharp/TabPeoplePicker/Manifest/outline.png rename to samples/tab-people-picker/csharp/TabPeoplePicker/AppManifest/outline.png diff --git a/samples/tab-personal-sso-quickstart/csharp_dotnetcore/Manifest/color.png b/samples/tab-personal-sso-quickstart/csharp_dotnetcore/AppManifest/color.png similarity index 100% rename from samples/tab-personal-sso-quickstart/csharp_dotnetcore/Manifest/color.png rename to samples/tab-personal-sso-quickstart/csharp_dotnetcore/AppManifest/color.png diff --git a/samples/tab-personal-sso-quickstart/csharp_dotnetcore/Manifest/manifest.json b/samples/tab-personal-sso-quickstart/csharp_dotnetcore/AppManifest/manifest.json similarity index 100% rename from samples/tab-personal-sso-quickstart/csharp_dotnetcore/Manifest/manifest.json rename to samples/tab-personal-sso-quickstart/csharp_dotnetcore/AppManifest/manifest.json diff --git a/samples/tab-personal-sso-quickstart/csharp_dotnetcore/Manifest/outline.png b/samples/tab-personal-sso-quickstart/csharp_dotnetcore/AppManifest/outline.png similarity index 100% rename from samples/tab-personal-sso-quickstart/csharp_dotnetcore/Manifest/outline.png rename to samples/tab-personal-sso-quickstart/csharp_dotnetcore/AppManifest/outline.png diff --git a/samples/tab-personal-sso-quickstart/csharp_dotnetcore/Manifest_Hub/color.png b/samples/tab-personal-sso-quickstart/csharp_dotnetcore/AppManifest_Hub/color.png similarity index 100% rename from samples/tab-personal-sso-quickstart/csharp_dotnetcore/Manifest_Hub/color.png rename to samples/tab-personal-sso-quickstart/csharp_dotnetcore/AppManifest_Hub/color.png diff --git a/samples/tab-personal-sso-quickstart/csharp_dotnetcore/Manifest_Hub/manifest.json b/samples/tab-personal-sso-quickstart/csharp_dotnetcore/AppManifest_Hub/manifest.json similarity index 100% rename from samples/tab-personal-sso-quickstart/csharp_dotnetcore/Manifest_Hub/manifest.json rename to samples/tab-personal-sso-quickstart/csharp_dotnetcore/AppManifest_Hub/manifest.json diff --git a/samples/tab-personal-sso-quickstart/csharp_dotnetcore/Manifest_Hub/outline.png b/samples/tab-personal-sso-quickstart/csharp_dotnetcore/AppManifest_Hub/outline.png similarity index 100% rename from samples/tab-personal-sso-quickstart/csharp_dotnetcore/Manifest_Hub/outline.png rename to samples/tab-personal-sso-quickstart/csharp_dotnetcore/AppManifest_Hub/outline.png diff --git a/samples/tab-personal-sso-quickstart/csharp_dotnetcore/README.md b/samples/tab-personal-sso-quickstart/csharp_dotnetcore/README.md index 423b5e302f..248c397819 100644 --- a/samples/tab-personal-sso-quickstart/csharp_dotnetcore/README.md +++ b/samples/tab-personal-sso-quickstart/csharp_dotnetcore/README.md @@ -122,16 +122,16 @@ This sample illustrates how to implement SSO authentication for Teams Tab. 4. Setup Manifest for Teams - __*This step is specific to Teams.*__ - **Edit** the `manifest.json` contained in the ./Manifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `<>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. **Edit** the `manifest.json` for `webApplicationInfo` resource `"api://{{domain-name}}/<>"` with MicrosoftAppId. E.g. `"api://1234.ngrok-free.app/00000000-0000-0000-0000-000000000000"`. - **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `tab-personal-sso-quickstart\csharp_dotnetcore\Manifest_Hub` folder with the required values. - **Zip** up the contents of the `Manifest` folder to create a `Manifest.zip` or `Manifest_Hub` folder to create a `Manifest_Hub.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `tab-personal-sso-quickstart\csharp_dotnetcore\AppManifest_Hub` folder with the required values. + **Zip** up the contents of the `Manifest` folder to create a `Manifest.zip` or `AppManifest_Hub` folder to create a `AppManifest_Hub.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./Manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. 1) Run your app, either from Visual Studio with `F5` or using `dotnet run` in the appropriate folder. diff --git a/samples/tab-product-inspection/csharp/ProductInspection/Manifest/color.png b/samples/tab-product-inspection/csharp/ProductInspection/AppManifest/color.png similarity index 100% rename from samples/tab-product-inspection/csharp/ProductInspection/Manifest/color.png rename to samples/tab-product-inspection/csharp/ProductInspection/AppManifest/color.png diff --git a/samples/tab-product-inspection/csharp/ProductInspection/Manifest/manifest.json b/samples/tab-product-inspection/csharp/ProductInspection/AppManifest/manifest.json similarity index 100% rename from samples/tab-product-inspection/csharp/ProductInspection/Manifest/manifest.json rename to samples/tab-product-inspection/csharp/ProductInspection/AppManifest/manifest.json diff --git a/samples/tab-product-inspection/csharp/ProductInspection/Manifest/outline.png b/samples/tab-product-inspection/csharp/ProductInspection/AppManifest/outline.png similarity index 100% rename from samples/tab-product-inspection/csharp/ProductInspection/Manifest/outline.png rename to samples/tab-product-inspection/csharp/ProductInspection/AppManifest/outline.png diff --git a/samples/tab-product-inspection/csharp/ProductInspection/Manifest_Hub/color.png b/samples/tab-product-inspection/csharp/ProductInspection/AppManifest_Hub/color.png similarity index 100% rename from samples/tab-product-inspection/csharp/ProductInspection/Manifest_Hub/color.png rename to samples/tab-product-inspection/csharp/ProductInspection/AppManifest_Hub/color.png diff --git a/samples/tab-product-inspection/csharp/ProductInspection/Manifest_Hub/manifest.json b/samples/tab-product-inspection/csharp/ProductInspection/AppManifest_Hub/manifest.json similarity index 100% rename from samples/tab-product-inspection/csharp/ProductInspection/Manifest_Hub/manifest.json rename to samples/tab-product-inspection/csharp/ProductInspection/AppManifest_Hub/manifest.json diff --git a/samples/tab-product-inspection/csharp/ProductInspection/Manifest_Hub/outline.png b/samples/tab-product-inspection/csharp/ProductInspection/AppManifest_Hub/outline.png similarity index 100% rename from samples/tab-product-inspection/csharp/ProductInspection/Manifest_Hub/outline.png rename to samples/tab-product-inspection/csharp/ProductInspection/AppManifest_Hub/outline.png diff --git a/samples/tab-product-inspection/csharp/README.md b/samples/tab-product-inspection/csharp/README.md index f47775c689..1b99da5f96 100644 --- a/samples/tab-product-inspection/csharp/README.md +++ b/samples/tab-product-inspection/csharp/README.md @@ -26,7 +26,7 @@ This sample app demonstrate a feature where user can scan a product, capture a i ![ProductInspection](ProductInspection/Images/PreviewImg.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Product Inspection:** [Manifest](/samples/tab-product-inspection/csharp/demo-manifest/Tab-Product-Inspection.zip) @@ -77,15 +77,15 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 4. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./Manifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `tab-product-inspection\csharp\ProductInspection\Manifest_Hub` folder with the required values. - - **Zip** up the contents of the `Manifest` folder to create a `Manifest.zip` or `Manifest_Hub` folder to create a `Manifest_Hub.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `tab-product-inspection\csharp\ProductInspection\AppManifest_Hub` folder with the required values. + - **Zip** up the contents of the `Manifest` folder to create a `Manifest.zip` or `AppManifest_Hub` folder to create a `AppManifest_Hub.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./Manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. ## Running the sample. diff --git a/samples/tab-request-approval/csharp/TabRequestApproval/AppPackage/color.png b/samples/tab-request-approval/csharp/TabRequestApproval/AppManifest/color.png similarity index 100% rename from samples/tab-request-approval/csharp/TabRequestApproval/AppPackage/color.png rename to samples/tab-request-approval/csharp/TabRequestApproval/AppManifest/color.png diff --git a/samples/tab-request-approval/csharp/TabRequestApproval/AppPackage/manifest.json b/samples/tab-request-approval/csharp/TabRequestApproval/AppManifest/manifest.json similarity index 100% rename from samples/tab-request-approval/csharp/TabRequestApproval/AppPackage/manifest.json rename to samples/tab-request-approval/csharp/TabRequestApproval/AppManifest/manifest.json diff --git a/samples/tab-request-approval/csharp/TabRequestApproval/AppPackage/outline.png b/samples/tab-request-approval/csharp/TabRequestApproval/AppManifest/outline.png similarity index 100% rename from samples/tab-request-approval/csharp/TabRequestApproval/AppPackage/outline.png rename to samples/tab-request-approval/csharp/TabRequestApproval/AppManifest/outline.png diff --git a/samples/tab-sso/csharp/README.md b/samples/tab-sso/csharp/README.md index e2583ed4aa..945c10780a 100644 --- a/samples/tab-sso/csharp/README.md +++ b/samples/tab-sso/csharp/README.md @@ -131,16 +131,16 @@ This sample illustrates how to implement SSO authentication for Teams Tab. 4. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./Manifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `tab-sso\csharp\TeamsTabSSO\Manifest_Hub` folder with the required values. + **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `tab-sso\csharp\TeamsTabSSO\AppManifest_Hub` folder with the required values. - **Edit** the `manifest.json` for `webApplicationInfo` resource `"api://{{domain-name}}/{{Microsoft-App-Id}}"` with MicrosoftAppId. E.g. `"api://1245.ngrok-free.app/{{Microsoft-App-Id}}`. - - **Zip** up the contents of the `Manifest` folder to create a `Manifest.zip` or `Manifest_Hub` folder to create a `Manifest_Hub.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `Manifest` folder to create a `Manifest.zip` or `AppManifest_Hub` folder to create a `AppManifest_Hub.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./Manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. ## Running the sample diff --git a/samples/tab-sso/csharp/TeamsTabSSO/Manifest/color.png b/samples/tab-sso/csharp/TeamsTabSSO/AppManifest/color.png similarity index 100% rename from samples/tab-sso/csharp/TeamsTabSSO/Manifest/color.png rename to samples/tab-sso/csharp/TeamsTabSSO/AppManifest/color.png diff --git a/samples/tab-sso/csharp/TeamsTabSSO/Manifest/manifest.json b/samples/tab-sso/csharp/TeamsTabSSO/AppManifest/manifest.json similarity index 100% rename from samples/tab-sso/csharp/TeamsTabSSO/Manifest/manifest.json rename to samples/tab-sso/csharp/TeamsTabSSO/AppManifest/manifest.json diff --git a/samples/tab-sso/csharp/TeamsTabSSO/Manifest/outline.png b/samples/tab-sso/csharp/TeamsTabSSO/AppManifest/outline.png similarity index 100% rename from samples/tab-sso/csharp/TeamsTabSSO/Manifest/outline.png rename to samples/tab-sso/csharp/TeamsTabSSO/AppManifest/outline.png diff --git a/samples/tab-sso/csharp/TeamsTabSSO/Manifest_Hub/color.png b/samples/tab-sso/csharp/TeamsTabSSO/AppManifest_Hub/color.png similarity index 100% rename from samples/tab-sso/csharp/TeamsTabSSO/Manifest_Hub/color.png rename to samples/tab-sso/csharp/TeamsTabSSO/AppManifest_Hub/color.png diff --git a/samples/tab-sso/csharp/TeamsTabSSO/Manifest_Hub/manifest.json b/samples/tab-sso/csharp/TeamsTabSSO/AppManifest_Hub/manifest.json similarity index 100% rename from samples/tab-sso/csharp/TeamsTabSSO/Manifest_Hub/manifest.json rename to samples/tab-sso/csharp/TeamsTabSSO/AppManifest_Hub/manifest.json diff --git a/samples/tab-sso/csharp/TeamsTabSSO/Manifest_Hub/outline.png b/samples/tab-sso/csharp/TeamsTabSSO/AppManifest_Hub/outline.png similarity index 100% rename from samples/tab-sso/csharp/TeamsTabSSO/Manifest_Hub/outline.png rename to samples/tab-sso/csharp/TeamsTabSSO/AppManifest_Hub/outline.png diff --git a/samples/tab-sso/nodejs/README.md b/samples/tab-sso/nodejs/README.md index 6805ee3dc7..41c492f358 100644 --- a/samples/tab-sso/nodejs/README.md +++ b/samples/tab-sso/nodejs/README.md @@ -109,8 +109,8 @@ Your tab needs to run as a registered Azure AD application in order to obtain an * Edit the `manifest.json` contained in the ./appManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{AppId}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) * Replace `{your_tunnel_domain}` with the subdomain you've assigned to your Ngrok account in step #1 above. * Edit the `manifest.json` for `webApplicationInfo` resource `"api://{your_tunnel_domain}/{{AppId}}"` with MicrosoftAppId. E.g. `"api://1245.ngrok-free.app/{{AppId}}`. - **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `tab-sso\nodejs\Manifest_Hub` folder with the required values. - **Zip** up the contents of the `appPackage` folder to create a `Manifest.zip` or `Manifest_Hub` folder to create a `Manifest_Hub.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `tab-sso\nodejs\appManifest_Hub` folder with the required values. + **Zip** up the contents of the `appManifest` folder to create a `Manifest.zip` or `appManifest_Hub` folder to create a `Manifest_Hub.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) 2. Update your `config/default.json` file * Replace the `tab.appId` property with you Azure AD application ID diff --git a/samples/tab-stage-view/csharp/README.md b/samples/tab-stage-view/csharp/README.md index afdd4e8241..8ee2c54399 100644 --- a/samples/tab-stage-view/csharp/README.md +++ b/samples/tab-stage-view/csharp/README.md @@ -27,7 +27,7 @@ For reference please check [Tabs link unfurling and Stage View](https://docs.mic ![TabStageView Modules](TabInStageView/Images/TabStageView.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Stage View:** [Manifest](/samples/tab-stage-view/csharp/demo-manifest/tab-stage-view.zip) @@ -107,15 +107,15 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 5. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./Manifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id or Bot-id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id or Bot-id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `TabInStageView\Manifest_Hub` folder with the required values. - - **Zip** up the contents of the `Manifest` folder to create a `Manifest.zip` or `Manifest_Hub` folder to create a `Manifest_Hub.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `TabInStageView\AppManifest_Hub` folder with the required values. + - **Zip** up the contents of the `Manifest` folder to create a `Manifest.zip` or `AppManifest_Hub` folder to create a `AppManifest_Hub.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./Manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. **Note**: If you are facing any issue in your app, please uncomment [this](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/tab-stage-view/csharp/TabInStageView/AdapterWithErrorHandler.cs#L26) line and put your debugger for local debug. diff --git a/samples/tab-stage-view/csharp/TabInStageView/Manifest/color.png b/samples/tab-stage-view/csharp/TabInStageView/AppManifest/color.png similarity index 100% rename from samples/tab-stage-view/csharp/TabInStageView/Manifest/color.png rename to samples/tab-stage-view/csharp/TabInStageView/AppManifest/color.png diff --git a/samples/tab-stage-view/csharp/TabInStageView/Manifest/manifest.json b/samples/tab-stage-view/csharp/TabInStageView/AppManifest/manifest.json similarity index 100% rename from samples/tab-stage-view/csharp/TabInStageView/Manifest/manifest.json rename to samples/tab-stage-view/csharp/TabInStageView/AppManifest/manifest.json diff --git a/samples/tab-stage-view/csharp/TabInStageView/Manifest/outline.png b/samples/tab-stage-view/csharp/TabInStageView/AppManifest/outline.png similarity index 100% rename from samples/tab-stage-view/csharp/TabInStageView/Manifest/outline.png rename to samples/tab-stage-view/csharp/TabInStageView/AppManifest/outline.png diff --git a/samples/tab-stage-view/csharp/TabInStageView/Manifest_Hub/color.png b/samples/tab-stage-view/csharp/TabInStageView/AppManifest_Hub/color.png similarity index 100% rename from samples/tab-stage-view/csharp/TabInStageView/Manifest_Hub/color.png rename to samples/tab-stage-view/csharp/TabInStageView/AppManifest_Hub/color.png diff --git a/samples/tab-stage-view/csharp/TabInStageView/Manifest_Hub/manifest.json b/samples/tab-stage-view/csharp/TabInStageView/AppManifest_Hub/manifest.json similarity index 100% rename from samples/tab-stage-view/csharp/TabInStageView/Manifest_Hub/manifest.json rename to samples/tab-stage-view/csharp/TabInStageView/AppManifest_Hub/manifest.json diff --git a/samples/tab-stage-view/csharp/TabInStageView/Manifest_Hub/outline.png b/samples/tab-stage-view/csharp/TabInStageView/AppManifest_Hub/outline.png similarity index 100% rename from samples/tab-stage-view/csharp/TabInStageView/Manifest_Hub/outline.png rename to samples/tab-stage-view/csharp/TabInStageView/AppManifest_Hub/outline.png diff --git a/samples/tab-stage-view/nodejs/Readme.md b/samples/tab-stage-view/nodejs/Readme.md index cd63ab656d..46b5f3692e 100644 --- a/samples/tab-stage-view/nodejs/Readme.md +++ b/samples/tab-stage-view/nodejs/Readme.md @@ -126,8 +126,8 @@ Also update `BaseUrl` according to your code runtime environment. - `<>` with your application's base url, e.g. https://1234.ngrok-free.app - `<>` with the `MicrosoftAppId` received from AAD app registration in Azure portal. - `<>` with the ngrok URL or app hosted base url. - **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `tab-stage-view\nodejs\Manifest_Hub` folder with the required values. - - **Zip** up the contents of the `Manifest` folder to create a `Manifest.zip` or `Manifest_Hub` folder to create a `Manifest_Hub.zip` + **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `tab-stage-view\nodejs\appManifest_Hub` folder with the required values. + - **Zip** up the contents of the `appManifest` folder to create a `Manifest.zip` or `appManifest_Hub` folder to create a `appManifest_Hub.zip` - **Upload** the `manifest.zip` to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App diff --git a/samples/tab-staggered-permission/csharp/README.md b/samples/tab-staggered-permission/csharp/README.md index 67ac17927e..8583caf670 100644 --- a/samples/tab-staggered-permission/csharp/README.md +++ b/samples/tab-staggered-permission/csharp/README.md @@ -27,7 +27,7 @@ Using this csharp sample, you can check how to get staggered graph api permissio ![Staggered Module](StaggeredPermission/Images/StaggeredModule.gif) ## Try it yourself - experience the App in your Microsoft Teams client -Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). +Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)). **Staggered Permission sample:** [Manifest](/samples/tab-staggered-permission/csharp/demo-manifest/tab-staggered-permission.zip) @@ -123,16 +123,16 @@ Please find below demo manifest which is deployed on Microsoft Azure and you can 4. Setup Manifest for Teams - __*This step is specific to Teams.*__ - - **Edit** the `manifest.json` contained in the ./Manifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) + - **Edit** the `manifest.json` contained in the ./AppManifest folder to replace your Microsoft App Id (that was created when you registered your app registration earlier) *everywhere* you see the place holder string `{{Microsoft-App-Id}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`) - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - **Edit** the `manifest.json` for `webApplicationInfo` resource `"api://{{domain-name}}/{{Microsoft-App-Id}}"` with MicrosoftAppId. E.g. `"api://ngrok-free.app/00000000-0000-0000-0000-000000000000"` - - **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `tab-staggered-permission\csharp\StaggeredPermission\Manifest_Hub` folder with the required values. - - **Zip** up the contents of the `Manifest` folder to create a `Manifest.zip` or `Manifest_Hub` folder to create a `Manifest_Hub.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `tab-staggered-permission\csharp\StaggeredPermission\AppManifest_Hub` folder with the required values. + - **Zip** up the contents of the `Manifest` folder to create a `Manifest.zip` or `AppManifest_Hub` folder to create a `AppManifest_Hub.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps - From the lower left corner, choose Upload a custom App - - Go to your project directory, the ./Manifest folder, select the zip folder, and choose Open. + - Go to your project directory, the ./AppManifest folder, select the zip folder, and choose Open. - Select Add in the pop-up dialog box. Your app is uploaded to Teams. ## Running the sample diff --git a/samples/tab-staggered-permission/csharp/StaggeredPermission/Manifest/color.png b/samples/tab-staggered-permission/csharp/StaggeredPermission/AppManifest/color.png similarity index 100% rename from samples/tab-staggered-permission/csharp/StaggeredPermission/Manifest/color.png rename to samples/tab-staggered-permission/csharp/StaggeredPermission/AppManifest/color.png diff --git a/samples/tab-staggered-permission/csharp/StaggeredPermission/Manifest/manifest.json b/samples/tab-staggered-permission/csharp/StaggeredPermission/AppManifest/manifest.json similarity index 100% rename from samples/tab-staggered-permission/csharp/StaggeredPermission/Manifest/manifest.json rename to samples/tab-staggered-permission/csharp/StaggeredPermission/AppManifest/manifest.json diff --git a/samples/tab-staggered-permission/csharp/StaggeredPermission/Manifest/outline.png b/samples/tab-staggered-permission/csharp/StaggeredPermission/AppManifest/outline.png similarity index 100% rename from samples/tab-staggered-permission/csharp/StaggeredPermission/Manifest/outline.png rename to samples/tab-staggered-permission/csharp/StaggeredPermission/AppManifest/outline.png diff --git a/samples/tab-staggered-permission/csharp/StaggeredPermission/Manifest_Hub/color.png b/samples/tab-staggered-permission/csharp/StaggeredPermission/AppManifest_Hub/color.png similarity index 100% rename from samples/tab-staggered-permission/csharp/StaggeredPermission/Manifest_Hub/color.png rename to samples/tab-staggered-permission/csharp/StaggeredPermission/AppManifest_Hub/color.png diff --git a/samples/tab-staggered-permission/csharp/StaggeredPermission/Manifest_Hub/manifest.json b/samples/tab-staggered-permission/csharp/StaggeredPermission/AppManifest_Hub/manifest.json similarity index 100% rename from samples/tab-staggered-permission/csharp/StaggeredPermission/Manifest_Hub/manifest.json rename to samples/tab-staggered-permission/csharp/StaggeredPermission/AppManifest_Hub/manifest.json diff --git a/samples/tab-staggered-permission/csharp/StaggeredPermission/Manifest_Hub/outline.png b/samples/tab-staggered-permission/csharp/StaggeredPermission/AppManifest_Hub/outline.png similarity index 100% rename from samples/tab-staggered-permission/csharp/StaggeredPermission/Manifest_Hub/outline.png rename to samples/tab-staggered-permission/csharp/StaggeredPermission/AppManifest_Hub/outline.png diff --git a/samples/tab-staggered-permission/nodejs/README.md b/samples/tab-staggered-permission/nodejs/README.md index 29d9ab6290..bad4a69d1a 100644 --- a/samples/tab-staggered-permission/nodejs/README.md +++ b/samples/tab-staggered-permission/nodejs/README.md @@ -148,7 +148,7 @@ Make sure you've downloaded and installed Ngrok on your local machine. ngrok wil - **Edit** the `manifest.json` for `validDomains` and replace `{{domain-name}}` with base Url of your domain. E.g. if you are using ngrok it would be `https://1234.ngrok-free.app` then your domain-name will be `1234.ngrok-free.app` and if you are using dev tunnels then your domain will be like: `12345.devtunnels.ms`. - **Edit** the `manifest.json` for `webApplicationInfo` resource `"api://{{domain-name}}/{{Microsoft-App-Id}}"` with MicrosoftAppId. E.g. `"api://ngrok-free.app/00000-0000-0000"` - **Note:** If you want to test your app across multi hub like: Outlook/Office.com, please update the `manifest.json` in the `tab-staggered-permission\nodejs\appManifest_Hub` folder with the required values. - - **Zip** up the contents of the `appManifest` folder to create a `Manifest.zip` or `appManifest_Hub` folder to create a `Manifest_Hub.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) + - **Zip** up the contents of the `appManifest` folder to create a `Manifest.zip` or `appManifest_Hub` folder to create a `appManifest_Hub.zip` (Make sure that zip file does not contains any subfolder otherwise you will get error while uploading your .zip package) - Upload the manifest.zip to Teams (in the Apps view click "Upload a custom app") - Go to Microsoft Teams. From the lower left corner, select Apps