-
Notifications
You must be signed in to change notification settings - Fork 802
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 #1334 from OfficeDev/v-hrajandira/CsharpNewToolkit…
…PR13 PR 13 - Implement New toolkit version csharp samples
- Loading branch information
Showing
79 changed files
with
1,752 additions
and
160 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
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,47 @@ | ||
| [ | ||
| { | ||
| "Name": "Microsoft Teams (browser)", | ||
| "Projects": [ | ||
| { | ||
| "Path": "App SSO Sample\\App SSO Sample.csproj", | ||
| "Action": "Start", | ||
| "DebugTarget": "Start Project" | ||
| }, | ||
| { | ||
| "Path": "TeamsApp\\TeamsApp.ttkproj", | ||
| "Action": "StartWithoutDebugging", | ||
| "DebugTarget": "Microsoft Teams (browser)" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "Name": "Microsoft 365 app (browser)", | ||
| "Projects": [ | ||
| { | ||
| "Path": "App SSO Sample\\App SSO Sample.csproj", | ||
| "Action": "Start", | ||
| "DebugTarget": "Start Project" | ||
| }, | ||
| { | ||
| "Path": "TeamsApp\\TeamsApp.ttkproj", | ||
| "Action": "StartWithoutDebugging", | ||
| "DebugTarget": "Microsoft 365 app (browser)" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "Name": "Outlook (browser)", | ||
| "Projects": [ | ||
| { | ||
| "Path": "App SSO Sample\\App SSO Sample.csproj", | ||
| "Action": "Start", | ||
| "DebugTarget": "Start Project" | ||
| }, | ||
| { | ||
| "Path": "TeamsApp\\TeamsApp.ttkproj", | ||
| "Action": "StartWithoutDebugging", | ||
| "DebugTarget": "Outlook (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
| 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 |
29 changes: 7 additions & 22 deletions
29
samples/app-sso/csharp/App SSO Sample/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 @@ | ||
| { | ||
| "$schema": "http://json.schemastore.org/launchsettings.json", | ||
| "iisSettings": { | ||
| "windowsAuthentication": false, | ||
| "anonymousAuthentication": true, | ||
| "iisExpress": { | ||
| "applicationUrl": "http://localhost:3978", | ||
| "sslPort": 0 | ||
| } | ||
| }, | ||
| { | ||
| "profiles": { | ||
| "IIS Express": { | ||
| "commandName": "IISExpress", | ||
| "launchBrowser": true, | ||
| "environmentVariables": { | ||
| "ASPNETCORE_ENVIRONMENT": "Development" | ||
| } | ||
| }, | ||
| "AuthenticationBot": { | ||
| "Start Project": { | ||
| "commandName": "Project", | ||
| "launchBrowser": true, | ||
| "applicationUrl": "http://localhost:3978", | ||
| "dotnetRunMessages": 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>69e88168-fa38-42bb-ba99-200d2bd3f67c</ProjectGuid> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <ProjectCapability Include="ProjectConfigurationsDeclaredDimensions" /> | ||
| </ItemGroup> | ||
| </Project> |
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,123 @@ | ||
| { | ||
| "id": "${{AAD_APP_OBJECT_ID}}", | ||
| "appId": "${{AAD_APP_CLIENT_ID}}", | ||
| "name": "app-sso-aad", | ||
| "accessTokenAcceptedVersion": 2, | ||
| "signInAudience": "AzureADMultipleOrgs", | ||
| "oauth2AllowIdTokenImplicitFlow": true, | ||
| "oauth2AllowImplicitFlow": true, | ||
| "optionalClaims": { | ||
| "idToken": [], | ||
| "accessToken": [ | ||
| { | ||
| "name": "idtyp", | ||
| "source": null, | ||
| "essential": false, | ||
| "additionalProperties": [] | ||
| } | ||
| ], | ||
| "saml2Token": [] | ||
| }, | ||
| "requiredResourceAccess": [ | ||
| { | ||
| "resourceAppId": "Microsoft Graph", | ||
| "resourceAccess": [ | ||
| { | ||
| "id": "User.Read", | ||
| "type": "Scope" | ||
| }, | ||
| { | ||
| "id": "email", | ||
| "type": "Scope" | ||
| }, | ||
| { | ||
| "id": "offline_access", | ||
| "type": "Scope" | ||
| }, | ||
| { | ||
| "id": "openid", | ||
| "type": "Scope" | ||
| }, | ||
| { | ||
| "id": "profile", | ||
| "type": "Scope" | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "oauth2Permissions": [ | ||
| { | ||
| "adminConsentDescription": "Allows Teams to call the app's web APIs as the current user.", | ||
| "adminConsentDisplayName": "Teams can access app's web APIs", | ||
| "id": "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}", | ||
| "isEnabled": true, | ||
| "type": "User", | ||
| "userConsentDescription": "Enable Teams to call this app's web APIs with the same rights that you have", | ||
| "userConsentDisplayName": "Teams can access app's web APIs and make requests on your behalf", | ||
| "value": "access_as_user" | ||
| } | ||
| ], | ||
| "preAuthorizedApplications": [ | ||
| { | ||
| "appId": "1fec8e78-bce4-4aaf-ab1b-5451cc387264", | ||
| "permissionIds": [ | ||
| "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}" | ||
| ] | ||
| }, | ||
| { | ||
| "appId": "5e3ce6c0-2b1f-4285-8d4b-75ee78787346", | ||
| "permissionIds": [ | ||
| "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}" | ||
| ] | ||
| }, | ||
| { | ||
| "appId": "d3590ed6-52b3-4102-aeff-aad2292ab01c", | ||
| "permissionIds": [ | ||
| "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}" | ||
| ] | ||
| }, | ||
| { | ||
| "appId": "00000002-0000-0ff1-ce00-000000000000", | ||
| "permissionIds": [ | ||
| "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}" | ||
| ] | ||
| }, | ||
| { | ||
| "appId": "bc59ab01-8403-45c6-8796-ac3ef710b3e3", | ||
| "permissionIds": [ | ||
| "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}" | ||
| ] | ||
| }, | ||
| { | ||
| "appId": "0ec893e0-5785-4de6-99da-4ed124e5296c", | ||
| "permissionIds": [ | ||
| "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}" | ||
| ] | ||
| }, | ||
| { | ||
| "appId": "4765445b-32c6-49b0-83e6-1d93765276ca", | ||
| "permissionIds": [ | ||
| "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}" | ||
| ] | ||
| }, | ||
| { | ||
| "appId": "4345a7b9-9a63-4910-a426-35363201d503", | ||
| "permissionIds": [ | ||
| "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}" | ||
| ] | ||
| } | ||
| ], | ||
| "identifierUris": [ | ||
| "api://${{BOT_DOMAIN}}/botid-${{AAD_APP_CLIENT_ID}}" | ||
| ], | ||
| "replyUrlsWithType": [ | ||
| { | ||
| "url": "https://${{BOT_DOMAIN}}/Auth/End", | ||
| "type": "Spa" | ||
| }, | ||
| { | ||
| "url": "https://token.botframework.com/.auth/web/redirect", | ||
| "type": "Web" | ||
| } | ||
| ] | ||
| } |
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
Oops, something went wrong.