Skip to content

Commit c148d34

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into labdistcollab0606
2 parents 58dc167 + e304656 commit c148d34

File tree

65 files changed

+1287
-226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1287
-226
lines changed

articles/active-directory/develop/sample-v2-code.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ The following samples illustrate web applications that sign in users. Some sampl
5757

5858
| Platform | Only signs in users | Signs in users and calls Microsoft Graph |
5959
| -------- | ------------------- | --------------------------------- |
60-
| ![ASP.NET Core](media/sample-v2-code/logo_NETcore.png)</p>ASP.NET Core 2.1 | [ASP.NET Core WebApp signs-in users tutorial](https://aka.ms/aspnetcore-webapp-sign-in) | Same sample in the [ASP.NET Core Web App calls Microsoft Graph](https://aka.ms/aspnetcore-webapp-call-msgraph) phase |
60+
| ![ASP.NET Core](media/sample-v2-code/logo_NETcore.png)</p>ASP.NET Core 2.2 | [ASP.NET Core WebApp signs-in users tutorial](https://aka.ms/aspnetcore-webapp-sign-in) | Same sample in the [ASP.NET Core Web App calls Microsoft Graph](https://aka.ms/aspnetcore-webapp-call-msgraph) phase |
6161
| ![ASP.NET](media/sample-v2-code/logo_NETframework.png)</p> ASP.NET | [ASP.NET Quickstart](https://github.com/AzureAdQuickstarts/AppModelv2-WebApp-OpenIDConnect-DotNet) </p> [dotnet-webapp-openidconnect-v2](https://github.com/azure-samples/active-directory-dotnet-webapp-openidconnect-v2) | [dotnet-admin-restricted-scopes-v2](https://github.com/azure-samples/active-directory-dotnet-admin-restricted-scopes-v2) </p> |[msgraph-training-aspnetmvcapp](https://github.com/microsoftgraph/msgraph-training-aspnetmvcapp)
6262
| ![Node.js](media/sample-v2-code/logo_nodejs.png) | | [Node.js Quickstart](https://github.com/azureadquickstarts/appmodelv2-webapp-openidconnect-nodejs) |
6363
| ![Ruby](media/sample-v2-code/logo_ruby.png) | | [msgraph-training-rubyrailsapp](https://github.com/microsoftgraph/msgraph-training-rubyrailsapp) |
@@ -94,11 +94,12 @@ The following sample shows a public client application running on a device witho
9494

9595
## Web APIs
9696

97-
The following sample shows how to protect a web API with the Microsoft identity platform endpoint. This API is exercised by a WPF application, but it can be called by any application. The web API also calls Microsoft Graph.
97+
The following samples shows how to protect a web API with the Microsoft identity platform endpoint, and how to call a downstream API from the Web API.
9898

9999
| Platform | Sample |
100100
| -------- | ------------------- |
101-
| ![.NET/C#](media/sample-v2-code/logo_NET.png) | WebAPI (service) of [dotnet-native-aspnetcore-v2](https://aka.ms/msidentity-aspnetcore-webapi-calls-msgraph) |
101+
| ![ASP.NET Core](media/sample-v2-code/logo_NETcore.png)</p>ASP.NET Core 2.2 | ASP.NET Core Web API (service) of [dotnet-native-aspnetcore-v2](https://aka.ms/msidentity-aspnetcore-webapi-calls-msgraph) |
102+
| ![ASP.NET](media/sample-v2-code/logo_NET.png)</p>ASP.NET MVC | Web API (service) of [ms-identity-aspnet-webapi-onbehalfof](https://github.com/Azure-Samples/ms-identity-aspnet-webapi-onbehalfof) |
102103

103104
## Other Microsoft Graph samples
104105

articles/active-directory/saas-apps/atlassian-cloud-tutorial.md

Lines changed: 70 additions & 121 deletions
Large diffs are not rendered by default.
80.8 KB
Loading
10.2 KB
Loading
50.5 KB
Loading
94.6 KB
Loading
43.8 KB
Loading
6.38 KB
Loading
69.5 KB
Loading
80.8 KB
Loading

0 commit comments

Comments
 (0)