-
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 #1248 from OfficeDev/v-hrajandira/CsharpNewToolkitPR2
PR 3 - Implement New toolkit version csharp samples
- Loading branch information
Showing
71 changed files
with
453 additions
and
263 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
31 changes: 8 additions & 23 deletions
31
samples/bot-file-upload/csharp/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 @@ | ||
| { | ||
| "profiles": { | ||
| // Debug project within Teams | ||
| "Microsoft Teams (browser)": { | ||
| "commandName": "Project", | ||
| "dotnetRunMessages": true, | ||
| "launchBrowser": true, | ||
| "launchUrl": "https://teams.microsoft.com/l/app/%TEAMSAPPID%?installAppPackage=true&webjoin=true&appTenantId=%TENANTID%&login_hint=%USERNAME%", | ||
| "applicationUrl": "http://localhost:5130", | ||
| "environmentVariables": { | ||
| "ASPNETCORE_ENVIRONMENT": "Development" | ||
| }, | ||
| "hotReloadProfile": "aspnetcore" | ||
| "Start Project": { | ||
| "commandName": "Project", | ||
| "dotnetRunMessages": true, | ||
| "applicationUrl": "https://localhost:7130;http://localhost:5130", | ||
| "environmentVariables": { | ||
| "ASPNETCORE_ENVIRONMENT": "Development" | ||
| }, | ||
| "hotReloadProfile": "aspnetcore" | ||
| } | ||
| //// Uncomment following profile to debug project only (without launching Teams) | ||
| //, | ||
| //"Start Project (not in Teams)": { | ||
| // "commandName": "Project", | ||
| // "dotnetRunMessages": true, | ||
| // "launchBrowser": true, | ||
| // "applicationUrl": "https://localhost:7130;http://localhost:5130", | ||
| // "environmentVariables": { | ||
| // "ASPNETCORE_ENVIRONMENT": "Development" | ||
| // }, | ||
| // "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
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
File renamed without changes
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.
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
| 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}}" | ||
| } | ||
| } | ||
| } |
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.
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
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/bot-file-upload/csharp/TeamsFileUpload.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": "TeamsFileUpload.csproj", | ||
| "Action": "Start", | ||
| "DebugTarget": "Start Project" | ||
| }, | ||
| { | ||
| "Path": "TeamsApp\\TeamsApp.ttkproj", | ||
| "Action": "StartWithoutDebugging", | ||
| "DebugTarget": "Microsoft Teams (browser)" | ||
| } | ||
| ] | ||
| } | ||
| ] |
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
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/tab-conversations/csharp/TabConversation.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": "TabConversation\\TabConversation.csproj", | ||
| "Action": "Start", | ||
| "DebugTarget": "Start Project" | ||
| }, | ||
| { | ||
| "Path": "TeamsApp\\TeamsApp.ttkproj", | ||
| "Action": "StartWithoutDebugging", | ||
| "DebugTarget": "Microsoft Teams (browser)" | ||
| } | ||
| ] | ||
| } | ||
| ] |
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
31 changes: 8 additions & 23 deletions
31
samples/tab-conversations/csharp/TabConversation/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 @@ | ||
| { | ||
| "profiles": { | ||
| // Debug project within Teams | ||
| "Microsoft Teams (browser)": { | ||
| "commandName": "Project", | ||
| "dotnetRunMessages": true, | ||
| "launchBrowser": true, | ||
| "launchUrl": "https://teams.microsoft.com/l/app/294d0749-3209-4cfe-9f85-2d0c99684e8d?installAppPackage=true&webjoin=true&appTenantId=72f988bf-86f1-41af-91ab-2d7cd011db47&[email protected]", | ||
| "applicationUrl": "https://localhost:44302;http://localhost:2544", | ||
| "environmentVariables": { | ||
| "ASPNETCORE_ENVIRONMENT": "Development" | ||
| }, | ||
| "hotReloadProfile": "aspnetcore" | ||
| "Start Project": { | ||
| "commandName": "Project", | ||
| "dotnetRunMessages": true, | ||
| "applicationUrl": "https://localhost:44302;http://localhost:2544", | ||
| "environmentVariables": { | ||
| "ASPNETCORE_ENVIRONMENT": "Development" | ||
| }, | ||
| "hotReloadProfile": "aspnetcore" | ||
| } | ||
| //// Uncomment following profile to debug project only (without launching Teams) | ||
| //, | ||
| //"Start Project (not in Teams)": { | ||
| // "commandName": "Project", | ||
| // "dotnetRunMessages": true, | ||
| // "launchBrowser": true, | ||
| // "applicationUrl": "https://localhost:44302;http://localhost:2544", | ||
| // "environmentVariables": { | ||
| // "ASPNETCORE_ENVIRONMENT": "Development" | ||
| // }, | ||
| // "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
| 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>696f2f0a-c3aa-4ff8-8d35-98a5f4ce4960</ProjectGuid> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <ProjectCapability Include="ProjectConfigurationsDeclaredDimensions" /> | ||
| </ItemGroup> | ||
| </Project> |
File renamed without changes
4 changes: 2 additions & 2 deletions
4
...TabConversation/AppManifest/manifest.json → .../csharp/TeamsApp/appPackage/manifest.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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,4 +10,7 @@ TAB_ENDPOINT= | |
| APP_NAME_SUFFIX= | ||
| TAB_DOMAIN= | ||
| TEAMS_APP_TENANT_ID= | ||
|
|
||
|
|
||
|
|
||
| TEAMSFX_M365_USER_NAME= | ||
Oops, something went wrong.