-
Notifications
You must be signed in to change notification settings - Fork 808
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1422 from OfficeDev/v-hrajandira/CsharpTTKMigration
Implement New toolkit version csharp samples
- Loading branch information
Showing
76 changed files
with
1,861 additions
and
120 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
samples/app-checkin-location/csharp/AppCheckinLocation.slnLaunch.user
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| [ | ||
| { | ||
| "Name": "Microsoft Teams (browser)", | ||
| "Projects": [ | ||
| { | ||
| "Path": "AppCheckinLocation\\AppCheckinLocation.csproj", | ||
| "Action": "Start", | ||
| "DebugTarget": "Start Project" | ||
| }, | ||
| { | ||
| "Path": "TeamsApp\\TeamsApp.ttkproj", | ||
| "Action": "StartWithoutDebugging", | ||
| "DebugTarget": "Microsoft Teams (Browser)" | ||
| } | ||
| ] | ||
| } | ||
| ] |
25 changes: 25 additions & 0 deletions
25
samples/app-checkin-location/csharp/AppCheckinLocation/.gitignore
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| # TeamsFx files | ||
| build | ||
| appPackage/build | ||
| env/.env.*.user | ||
| env/.env.local | ||
| appsettings.Development.json | ||
| .deployment | ||
|
|
||
| # User-specific files | ||
| *.user | ||
|
|
||
| # Build results | ||
| [Dd]ebug/ | ||
| [Dd]ebugPublic/ | ||
| [Rr]elease/ | ||
| [Rr]eleases/ | ||
| x64/ | ||
| x86/ | ||
| bld/ | ||
| [Bb]in/ | ||
| [Oo]bj/ | ||
| [Ll]og/ | ||
|
|
||
| # Notification local store | ||
| .notification.localstore.json |
25 changes: 5 additions & 20 deletions
25
samples/app-checkin-location/csharp/AppCheckinLocation/Properties/launchSettings.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,13 @@ | ||
| { | ||
| "iisSettings": { | ||
| "windowsAuthentication": false, | ||
| "anonymousAuthentication": true, | ||
| "iisExpress": { | ||
| "applicationUrl": "http://localhost:3978", | ||
| "sslPort": 0 | ||
| } | ||
| }, | ||
| "$schema": "http://json.schemastore.org/launchsettings.json", | ||
| { | ||
| "profiles": { | ||
| "IIS Express": { | ||
| "commandName": "IISExpress", | ||
| "launchBrowser": true, | ||
| "environmentVariables": { | ||
| "ASPNETCORE_ENVIRONMENT": "Development" | ||
| } | ||
| }, | ||
| "EchoBot": { | ||
| "Start Project": { | ||
| "commandName": "Project", | ||
| "launchBrowser": true, | ||
| "dotnetRunMessages": true, | ||
| "applicationUrl": "http://localhost:3978", | ||
| "environmentVariables": { | ||
| "ASPNETCORE_ENVIRONMENT": "Development" | ||
| }, | ||
| "applicationUrl": "http://localhost:3978" | ||
| "hotReloadProfile": "aspnetcore" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
samples/app-checkin-location/csharp/TeamsApp/TeamsApp.ttkproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="15.0" Sdk="Microsoft.TeamsFx.Sdk"> | ||
| <PropertyGroup Label="Globals"> | ||
| <ProjectGuid>c7fd0e24-2254-4184-bf12-6c75d2752f28</ProjectGuid> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <ProjectCapability Include="ProjectConfigurationsDeclaredDimensions" /> | ||
| </ItemGroup> | ||
| </Project> |
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes
25 changes: 25 additions & 0 deletions
25
samples/app-checkin-location/csharp/TeamsApp/env/.env.local
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| # This file includes environment variables that can be committed to git. It's gitignored by default because it represents your local development environment. | ||
|
|
||
| # Built-in environment variables | ||
| TEAMSFX_ENV=local | ||
| APP_NAME_SUFFIX=local | ||
|
|
||
| # Generated during provision, you can also add your own variables. | ||
| BOT_ID= | ||
| TEAMS_APP_ID= | ||
| TEAMSFX_M365_USER_NAME= | ||
|
|
||
| BOT_ENDPOINT= | ||
| BOT_DOMAIN= | ||
|
|
||
| RESOURCE_SUFFIX= | ||
| AZURE_SUBSCRIPTION_ID= | ||
| AZURE_RESOURCE_GROUP_NAME= | ||
| AAD_APP_CLIENT_ID= | ||
| AAD_APP_OBJECT_ID= | ||
| AAD_APP_TENANT_ID= | ||
| AAD_APP_OAUTH_AUTHORITY= | ||
| AAD_APP_OAUTH_AUTHORITY_HOST= | ||
| TEAMS_APP_TENANT_ID= | ||
| MICROSOFT_APP_TYPE= | ||
| MICROSOFT_APP_TENANT_ID= |
44 changes: 44 additions & 0 deletions
44
samples/app-checkin-location/csharp/TeamsApp/infra/azure.bicep
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| @maxLength(20) | ||
| @minLength(4) | ||
| @description('Used to generate names for all resources in this file') | ||
| param resourceBaseName string | ||
|
|
||
| @description('Required when create Azure Bot service') | ||
| param botAadAppClientId string | ||
|
|
||
| param botAppDomain string | ||
|
|
||
| @maxLength(42) | ||
| param botDisplayName string | ||
|
|
||
| param botServiceName string = resourceBaseName | ||
| param botServiceSku string = 'F0' | ||
| param microsoftAppType string | ||
| param microsoftAppTenantId string | ||
|
|
||
| // Register your web service as a bot with the Bot Framework | ||
| resource botService 'Microsoft.BotService/botServices@2021-03-01' = { | ||
| kind: 'azurebot' | ||
| location: 'global' | ||
| name: botServiceName | ||
| properties: { | ||
| displayName: botDisplayName | ||
| endpoint: 'https://${botAppDomain}/api/messages' | ||
| msaAppId: botAadAppClientId | ||
| msaAppType: microsoftAppType | ||
| msaAppTenantId: microsoftAppType == 'SingleTenant' ? microsoftAppTenantId : '' | ||
| } | ||
| sku: { | ||
| name: botServiceSku | ||
| } | ||
| } | ||
|
|
||
| // Connect the bot service to Microsoft Teams | ||
| resource botServiceMsTeamsChannel 'Microsoft.BotService/botServices/channels@2021-03-01' = { | ||
| parent: botService | ||
| location: 'global' | ||
| name: 'MsTeamsChannel' | ||
| properties: { | ||
| channelName: 'MsTeamsChannel' | ||
| } | ||
| } |
24 changes: 24 additions & 0 deletions
24
samples/app-checkin-location/csharp/TeamsApp/infra/azure.parameters.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| { | ||
| "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", | ||
| "contentVersion": "1.0.0.0", | ||
| "parameters": { | ||
| "resourceBaseName": { | ||
| "value": "bot${{RESOURCE_SUFFIX}}" | ||
| }, | ||
| "botAadAppClientId": { | ||
| "value": "${{AAD_APP_CLIENT_ID}}" | ||
| }, | ||
| "botAppDomain": { | ||
| "value": "${{BOT_DOMAIN}}" | ||
| }, | ||
| "botDisplayName": { | ||
| "value": "app-checkin-location" | ||
| }, | ||
| "microsoftAppType": { | ||
| "value": "${{MICROSOFT_APP_TYPE}}" | ||
| }, | ||
| "microsoftAppTenantId": { | ||
| "value": "${{MICROSOFT_APP_TENANT_ID}}" | ||
| } | ||
| } | ||
| } |
9 changes: 9 additions & 0 deletions
9
samples/app-checkin-location/csharp/TeamsApp/launchSettings.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "profiles": { | ||
| // Debug project within Teams | ||
| "Microsoft Teams (browser)": { | ||
| "commandName": "Project", | ||
| "launchUrl": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&appTenantId=${{TEAMS_APP_TENANT_ID}}&login_hint=${{TEAMSFX_M365_USER_NAME}}" | ||
| } | ||
| } | ||
| } |
84 changes: 84 additions & 0 deletions
84
samples/app-checkin-location/csharp/TeamsApp/teamsapp.local.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| # yaml-language-server: $schema=https://aka.ms/teams-toolkit/v1.2/yaml.schema.json | ||
| # Visit https://aka.ms/teamsfx-v5.0-guide for details on this file | ||
| # Visit https://aka.ms/teamsfx-actions for details on actions | ||
| version: v1.2 | ||
|
|
||
| additionalMetadata: | ||
| sampleTag: Microsoft-Teams-Samples:app-checkin-location-csharp | ||
|
|
||
| provision: | ||
| - uses: aadApp/create # Creates a new Azure Active Directory (AAD) app to authenticate users if the environment variable that stores clientId is empty | ||
| with: | ||
| name: app-checkin-location-aad # Note: when you run aadApp/update, the AAD app name will be updated based on the definition in manifest. If you don't want to change the name, make sure the name in AAD manifest is the same with the name defined here. | ||
| generateClientSecret: true # If the value is false, the action will not generate client secret for you | ||
| signInAudience: "AzureADMultipleOrgs" # Multitenant | ||
| writeToEnvironmentFile: # Write the information of created resources into environment file for the specified environment variable(s). | ||
| clientId: AAD_APP_CLIENT_ID | ||
| clientSecret: SECRET_AAD_APP_CLIENT_SECRET # Environment variable that starts with `SECRET_` will be stored to the .env.{envName}.user environment file | ||
| objectId: AAD_APP_OBJECT_ID | ||
| tenantId: AAD_APP_TENANT_ID | ||
| authority: AAD_APP_OAUTH_AUTHORITY | ||
| authorityHost: AAD_APP_OAUTH_AUTHORITY_HOST | ||
|
|
||
| # Creates a Teams app | ||
| - uses: teamsApp/create | ||
| with: | ||
| # Teams app name | ||
| name: app-checkin-location-${{TEAMSFX_ENV}} | ||
| # Write the information of created resources into environment file for | ||
| # the specified environment variable(s). | ||
| writeToEnvironmentFile: | ||
| teamsAppId: TEAMS_APP_ID | ||
|
|
||
| - uses: script | ||
| with: | ||
| run: | ||
| # echo "::set-teamsfx-env MICROSOFT_APP_TYPE=SingleTenant"; | ||
| echo "::set-teamsfx-env MICROSOFT_APP_TYPE=MultiTenant"; | ||
| echo "::set-teamsfx-env MICROSOFT_APP_TENANT_ID=${{AAD_APP_TENANT_ID}}"; | ||
|
|
||
| # Generate runtime appsettings to JSON file | ||
| - uses: file/createOrUpdateJsonFile | ||
| with: | ||
| target: ../AppCheckinLocation/appsettings.json | ||
| content: | ||
| MicrosoftAppId: ${{AAD_APP_CLIENT_ID}} | ||
| MicrosoftAppPassword: ${{SECRET_AAD_APP_CLIENT_SECRET}} | ||
| ApplicationBaseUrl: ${{BOT_ENDPOINT}} | ||
|
|
||
| - uses: arm/deploy # Deploy given ARM templates parallelly. | ||
| with: | ||
| subscriptionId: ${{AZURE_SUBSCRIPTION_ID}} # The AZURE_SUBSCRIPTION_ID is a built-in environment variable. TeamsFx will ask you select one subscription if its value is empty. You're free to reference other environment varialbe here, but TeamsFx will not ask you to select subscription if it's empty in this case. | ||
| resourceGroupName: ${{AZURE_RESOURCE_GROUP_NAME}} # The AZURE_RESOURCE_GROUP_NAME is a built-in environment variable. TeamsFx will ask you to select or create one resource group if its value is empty. You're free to reference other environment varialbe here, but TeamsFx will not ask you to select or create resource grouop if it's empty in this case. | ||
| templates: | ||
| - path: ./infra/azure.bicep | ||
| parameters: ./infra/azure.parameters.json | ||
| deploymentName: Create-resources-for-bot | ||
| bicepCliVersion: v0.9.1 # Teams Toolkit will download this bicep CLI version from github for you, will use bicep CLI in PATH if you remove this config. | ||
|
|
||
| # Validate using manifest schema | ||
| - uses: teamsApp/validateManifest | ||
| with: | ||
| # Path to manifest template | ||
| manifestPath: ./appPackage/manifest.json | ||
|
|
||
| # Build Teams app package with latest env value | ||
| - uses: teamsApp/zipAppPackage | ||
| with: | ||
| # Path to manifest template | ||
| manifestPath: ./appPackage/manifest.json | ||
| outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip | ||
| outputJsonPath: ./appPackage/build/manifest.${{TEAMSFX_ENV}}.json | ||
| # Validate app package using validation rules | ||
| - uses: teamsApp/validateAppPackage | ||
| with: | ||
| # Relative path to this file. This is the path for built zip file. | ||
| appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip | ||
|
|
||
| # Apply the Teams app manifest to an existing Teams app in | ||
| # Teams Developer Portal. | ||
| # Will use the app id in manifest file to determine which Teams app to update. | ||
| - uses: teamsApp/update | ||
| with: | ||
| # Relative path to this file. This is the path for built zip file. | ||
| appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| # yaml-language-server: $schema=https://aka.ms/teams-toolkit/v1.2/yaml.schema.json | ||
| # Visit https://aka.ms/teamsfx-v5.0-guide for details on this file | ||
| # Visit https://aka.ms/teamsfx-actions for details on actions | ||
| version: v1.2 | ||
|
|
||
| additionalMetadata: | ||
| sampleTag: Microsoft-Teams-Samples:app-checkin-location-csharp | ||
|
|
||
| environmentFolderPath: ./env |
Oops, something went wrong.