Skip to content

Commit 004c076

Browse files
huypubhuypub
authored
Merge pull request #102603 from MicrosoftDocs/master
1/28 PM Publish
2 parents d602c42 + 13a155c commit 004c076

File tree

235 files changed

+2477
-1344
lines changed

Some content is hidden

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

235 files changed

+2477
-1344
lines changed

‎.openpublishing.redirection.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -841,6 +841,11 @@
841841
"redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-azure-subscription",
842842
"redirect_document_id": false
843843
},
844+
{
845+
"source_path": "articles/cognitive-services/QnAMaker/Concepts/data-sources-supported.md",
846+
"redirect_url": "/azure/cognitive-services/QnAMaker/concepts/knowledge-base",
847+
"redirect_document_id": false
848+
},
844849
{
845850
"source_path": "articles/cognitive-services/QnAMaker/How-To/create-knowledge-base.md",
846851
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/create-publish-knowledge-base",
@@ -2946,6 +2951,11 @@
29462951
"redirect_url": "/azure/cognitive-services/recommendations/overview",
29472952
"redirect_document_id": false
29482953
},
2954+
{
2955+
"source_path": "articles/cognitive-services/Recommendations/overview.md",
2956+
"redirect_url": "https://github.com/microsoft/Product-Recommendations/blob/master/README.md",
2957+
"redirect_document_id": false
2958+
},
29492959
{
29502960
"source_path": "articles/cognitive-services/Video/Home.md",
29512961
"redirect_url": "/azure/media-services/video-indexer/video-indexer-overview",
@@ -6851,6 +6861,11 @@
68516861
"redirect_url": "/azure/azure-functions/functions-create-vnet",
68526862
"redirect_document_id": false
68536863
},
6864+
{
6865+
"source_path": "articles/azure-functions/create-cli.md",
6866+
"redirect_url": "/azure/azure-functions/functions-create-first-azure-function-azure-cli",
6867+
"redirect_document_id": false
6868+
},
68546869
{
68556870
"source_path": "articles/azure-functions/create-visual-studio.md",
68566871
"redirect_url": "/azure/azure-functions/functions-create-your-first-function-visual-studio",

‎articles/active-directory-b2c/index.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
ms.collection: collection
1414
author: mmacy
1515
ms.author: marsma
16-
ms.date: 08/29/2019
16+
ms.date: 01/28/2020
1717

1818
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | whats-new
1919

@@ -27,7 +27,7 @@ landingContent:
2727
- linkListType: overview
2828
links:
2929
- text: What is Azure AD B2C?
30-
url: active-directory-b2c-overview.md
30+
url: overview.md
3131
- text: Technical & feature overview
3232
url: technical-overview.md
3333
- linkListType: get-started
@@ -49,13 +49,13 @@ landingContent:
4949
- linkListType: quickstart
5050
links:
5151
- text: Set up sign-in
52-
url: active-directory-b2c-quickstarts-web-app.md
52+
url: quickstart-web-app-dotnet.md
5353
- linkListType: tutorial
5454
links:
5555
- text: Authenticate users a .NET web application
56-
url: active-directory-b2c-tutorials-web-app.md
56+
url: tutorial-web-app-dotnet.md
5757
- text: Grant API access to a .NET web application
58-
url: active-directory-b2c-tutorials-web-api.md
58+
url: tutorial-web-api-dotnet.md
5959
- text: Enable enterprise and social login
6060
url: tutorial-add-identity-providers.md
6161
- linkListType: download
@@ -69,13 +69,13 @@ landingContent:
6969
- linkListType: quickstart
7070
links:
7171
- text: Set up sign-in
72-
url: active-directory-b2c-quickstarts-desktop-app.md
72+
url: quickstart-single-page-app.md
7373
- linkListType: tutorial
7474
links:
7575
- text: Authenticate users in a single-page app
76-
url: active-directory-b2c-tutorials-spa.md
76+
url: tutorial-single-page-app.md
7777
- text: Grant API access to a single-page app
78-
url: active-directory-b2c-tutorials-spa-webapi.md
78+
url: tutorial-single-page-app-webapi.md
7979
- text: Enable enterprise and social login
8080
url: tutorial-add-identity-providers.md
8181
- linkListType: download
@@ -89,13 +89,13 @@ landingContent:
8989
- linkListType: quickstart
9090
links:
9191
- text: Set up sign-in
92-
url: active-directory-b2c-quickstarts-desktop-app.md
92+
url: quickstart-native-app-desktop.md
9393
- linkListType: tutorial
9494
links:
9595
- text: Authenticate users in native clients
96-
url: active-directory-b2c-tutorials-desktop-app.md
96+
url: tutorial-desktop-app.md
9797
- text: Grant API access to native clients
98-
url: active-directory-b2c-tutorials-desktop-app-webapi.md
98+
url: tutorial-desktop-app-webapi.md
9999
- text: Enable enterprise and social login
100100
url: tutorial-add-identity-providers.md
101101
- linkListType: download
@@ -109,15 +109,15 @@ landingContent:
109109
- linkListType: concept
110110
links:
111111
- text: Introduction to user flows
112-
url: active-directory-b2c-reference-policies.md
112+
url: user-flow-overview.md
113113
- linkListType: how-to-guide
114114
links:
115115
- text: Sign up and sign in users
116116
url: tutorial-create-user-flows.md
117117
- text: Customize the user interface
118118
url: customize-ui-overview.md
119119
- text: Enable sign-in with Facebook
120-
url: active-directory-b2c-setup-fb-app.md
120+
url: identity-provider-facebook.md
121121
- linkListType: video
122122
links:
123123
- text: How to configure basic policies (9:41)
@@ -129,17 +129,17 @@ landingContent:
129129
- linkListType: concept
130130
links:
131131
- text: Introduction to custom policies
132-
url: active-directory-b2c-overview-custom.md
132+
url: custom-policy-overview.md
133133
- linkListType: how-to-guide
134134
links:
135135
- text: Sign up and sign in users
136-
url: active-directory-b2c-get-started-custom.md
136+
url: custom-policy-get-started.md
137137
- text: Customize the user interface
138-
url: active-directory-b2c-ui-customization-custom.md
138+
url: custom-policy-ui-customization.md
139139
- text: Enable sign-in with Azure AD multi-tenant
140-
url: active-directory-b2c-setup-commonaad-custom.md
140+
url: identity-provider-azure-ad-multi-tenant-custom.md
141141
- text: Add your own business logic with REST APIs
142-
url: active-directory-b2c-rest-api-validation-custom.md
142+
url: custom-policy-rest-api-claims-validation.md
143143
- linkListType: video
144144
links:
145145
- text: Advanced use cases with Azure AD B2C (4:54)

‎articles/active-directory/develop/access-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.topic: conceptual
1212
ms.date: 10/22/2019
1313
ms.author: ryanwi
1414
ms.reviewer: hirsin
15-
ms.custom: aaddev, fasttrack-edit
15+
ms.custom: aaddev, identityplatformtop40, fasttrack-edit
1616
---
1717

1818
# Microsoft identity platform access tokens

‎articles/active-directory/develop/active-directory-authentication-libraries.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.workload: identity
1313
ms.date: 12/01/2018
1414
ms.author: ryanwi
1515
ms.reviewer: saeeda, jmprieur
16-
ms.custom: aaddev, identityplatformtop40
16+
ms.custom: aaddev
1717
---
1818

1919
# Azure Active Directory Authentication Libraries

‎articles/active-directory/develop/index.yml

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
title: Microsoft identity platform (formerly Azure Active Directory for developers)
44
summary: Microsoft identity platform is an evolution of the Azure Active Directory (Azure AD) developer platform. It allows developers to build applications that sign in all Microsoft identities and get tokens to call Microsoft APIs such as Microsoft Graph or APIs that developers have built. It’s a full-featured platform that consists of an OAuth 2.0 and OpenID Connect standard-compliant authentication service, open-source libraries, application registration and configuration, robust conceptual and reference documentation, quickstart samples, code samples, tutorials, and how-to guides.
55

6-
metadata:
6+
metadata:
77
ms.topic: landing-page
88
ms.date: 06/22/2019
99
author: CelesteDG
1010
ms.author: celested
1111
ms.service: active-directory
1212
ms.subservice: develop
13-
ms.workload: identity
13+
ms.workload: identity
1414

1515
landingContent:
1616
- title: About Microsoft identity platform
@@ -46,7 +46,7 @@ landingContent:
4646
- text: JavaScript
4747
url: quickstart-v2-javascript.md
4848
- linkListType: tutorial
49-
links:
49+
links:
5050
- text: JavaScript
5151
url: tutorial-v2-javascript-spa.md
5252
- linkListType: download
@@ -67,27 +67,37 @@ landingContent:
6767
url: quickstart-v2-aspnet-core-webapp.md
6868
- text: ASP.NET
6969
url: quickstart-v2-aspnet-webapp.md
70+
- text: Java
71+
url: quickstart-v2-java-webapp.md
72+
- text: Python
73+
url: quickstart-v2-python-webapp.md
7074
- linkListType: tutorial
71-
links:
75+
links:
7276
- text: ASP.NET Core
7377
url: https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2
7478
- linkListType: download
7579
links:
76-
- text: Samples - ASP.NET Core, ASP.NET
80+
- text: Samples - ASP.NET Core, ASP.NET, Java, Python
7781
url: sample-v2-code.md#web-applications
7882
- title: Build a web app that calls web APIs
7983
linkLists:
8084
- linkListType: get-started
8185
links:
8286
- text: Scenario overview
8387
url: scenario-web-app-call-api-overview.md
88+
- linkListType: quickstart
89+
links:
90+
- text: Java
91+
url: quickstart-v2-java-webapp.md
92+
- text: Python
93+
url: quickstart-v2-python-webapp.md
8494
- linkListType: tutorial
85-
links:
95+
links:
8696
- text: ASP.NET Core
8797
url: https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2#scope-of-this-tutorial
8898
- linkListType: download
8999
links:
90-
- text: Samples - ASP.NET Core, ASP.NET, Node.js, Ruby
100+
- text: Samples - ASP.NET Core, ASP.NET, Node.js, Ruby, Java, Python
91101
url: sample-v2-code.md#web-applications
92102
- title: Build a protected web API
93103
linkLists:
@@ -96,7 +106,7 @@ landingContent:
96106
- text: Scenario overview
97107
url: scenario-protected-web-api-overview.md
98108
- linkListType: tutorial
99-
links:
109+
links:
100110
- text: ASP.NET Core web API
101111
url: https://github.com/Azure-Samples/active-directory-dotnet-native-aspnetcore-v2
102112
- linkListType: download
@@ -110,30 +120,32 @@ landingContent:
110120
- text: Scenario overview
111121
url: scenario-web-api-call-api-overview.md
112122
- linkListType: tutorial
113-
links:
123+
links:
114124
- text: ASP.NET Core web API that calls Microsoft Graph
115125
url: https://github.com/Azure-Samples/active-directory-dotnet-native-aspnetcore-v2/tree/master/2.%20Web%20API%20now%20calls%20Microsoft%20Graph
126+
- text: Java web API that calls Microsoft Graph
127+
url: https://github.com/Azure-Samples/ms-identity-java-webapi
116128
- title: Build a desktop app that calls web APIs
117129
linkLists:
118130
- linkListType: get-started
119131
links:
120132
- text: Scenario overview
121133
url: scenario-desktop-overview.md
122134
- linkListType: quickstart
123-
links:
135+
links:
124136
- text: Acquire a token & call Microsoft Graph API (Windows desktop)
125137
url: quickstart-v2-windows-desktop.md
126138
- text: Acquire a token & call Microsoft Graph API (UWP)
127139
url: quickstart-v2-uwp.md
128140
- linkListType: tutorial
129-
links:
141+
links:
130142
- text: Call Microsoft Graph API (Windows desktop)
131143
url: tutorial-v2-windows-desktop.md
132144
- text: Call Microsoft Graph API (UWP)
133145
url: tutorial-v2-windows-uwp.md
134146
- linkListType: download
135147
links:
136-
- text: Sample - .NET, .NET Core
148+
- text: Sample - .NET, .NET Core, Java, Python
137149
url: sample-v2-code.md#desktop-and-mobile-public-client-apps
138150
- title: Build a daemon app that calls web APIs
139151
linkLists:
@@ -142,14 +154,14 @@ landingContent:
142154
- text: Scenario overview
143155
url: scenario-daemon-overview.md
144156
- linkListType: quickstart
145-
links:
157+
links:
146158
- text: Acquire a token & call Microsoft Graph API (.NET Core console)
147159
url: quickstart-v2-netcore-daemon.md
148160
- text: Acquire a token & call Microsoft Graph API (ASP.NET web app)
149161
url: https://github.com/Azure-Samples/ms-identity-aspnet-daemon-webapp
150162
- linkListType: download
151163
links:
152-
- text: Samples - ASP.NET console, ASP.NET web
164+
- text: Samples - ASP.NET console, ASP.NET web, Java, Python
153165
url: sample-v2-code.md#daemon-applications
154166
- title: Build a mobile app that calls web APIs
155167
linkLists:
@@ -158,15 +170,15 @@ landingContent:
158170
- text: Scenario overview
159171
url: scenario-mobile-overview.md
160172
- linkListType: quickstart
161-
links:
173+
links:
162174
- text: Acquire a token & call Microsoft Graph API (Android)
163175
url: quickstart-v2-android.md
164176
- text: Acquire a token & call Microsoft Graph API (iOS)
165177
url: quickstart-v2-ios.md
166178
- text: Acquire a token & call Microsoft Graph API (Xamarin iOS & Android)
167179
url: https://github.com/Azure-Samples/active-directory-xamarin-native-v2
168180
- linkListType: tutorial
169-
links:
181+
links:
170182
- text: Sign in users & call Microsoft Graph API (Android)
171183
url: tutorial-v2-android.md
172184
- text: Sign in users & call Microsoft Graph API (iOS)
@@ -182,7 +194,7 @@ landingContent:
182194
- text: About Microsoft Graph
183195
url: https://docs.microsoft.com/graph/overview
184196
- linkListType: quickstart
185-
links:
197+
links:
186198
- text: Get up and running in 3 minutes
187199
url: https://developer.microsoft.com/graph/get-started
188200
- linkListType: learn
@@ -192,9 +204,9 @@ landingContent:
192204
- text: Microsoft Graph REST API v1.0
193205
url: https://docs.microsoft.com/graph/api/overview?toc=.%2Fref%2Ftoc.json&view=graph-rest-1.0
194206
- text: Microsoft Graph REST API Beta
195-
url: https://docs.microsoft.com/graph/api/overview?toc=.%2Fref%2Ftoc.json&view=graph-rest-beta
207+
url: https://docs.microsoft.com/graph/api/overview?toc=.%2Fref%2Ftoc.json&view=graph-rest-beta
196208
- linkListType: deploy
197-
links:
209+
links:
198210
- text: Graph Explorer
199211
url: https://developer.microsoft.com/graph/graph-explorer/
200212
- title: Build a customer-facing app that signs in social & local identities

‎articles/active-directory/develop/msal-differences-ios-macos.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.workload: identity
1313
ms.date: 08/28/2019
1414
ms.author: twhitney
1515
ms.reviewer: oldalton
16-
ms.custom: aaddev, identityplatformtop40
16+
ms.custom: aaddev
1717
#Customer intent: As an application developer, I want to learn about the Microsoft Authentication Library for macOS and iOS differences so I can decide if this platform meets my application development needs and requirements.
1818
---
1919

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ The following samples show public client applications (desktop or mobile applica
6969
| ------------------ | -------- | ----------| ---------- | ------------------------- |
7070
| Desktop (WPF) | ![This image shows the .NET/C# logo](media/sample-v2-code/logo_NET.png) | [interactive](msal-authentication-flows.md#interactive)| [dotnet-desktop-msgraph-v2](https://github.com/azure-samples/active-directory-dotnet-desktop-msgraph-v2) | [dotnet-native-aspnetcore-v2](https://aka.ms/msidentity-aspnetcore-webapi) |
7171
| Desktop (Console) | ![This image shows the .NET/C# (Desktop) logo](media/sample-v2-code/logo_NET.png) | [Integrated Windows Authentication](msal-authentication-flows.md#integrated-windows-authentication) | [dotnet-iwa-v2](https://github.com/azure-samples/active-directory-dotnet-iwa-v2) | |
72+
| Desktop (Console) | ![This image shows the Java logo](media/sample-v2-code/logo_java.png) | [Integrated Windows Authentication](msal-authentication-flows.md#integrated-windows-authentication) |[ms-identity-java-desktop](https://github.com/Azure-Samples/ms-identity-java-desktop/) | |
7273
| Desktop (Console) | ![This image shows the .NET/C# (Desktop) logo](media/sample-v2-code/logo_NETcore.png) | [Username/Password](msal-authentication-flows.md#usernamepassword) |[dotnetcore-up-v2](https://github.com/azure-samples/active-directory-dotnetcore-console-up-v2) | |
7374
| Desktop (Console) | ![This image shows the Java logo](media/sample-v2-code/logo_java.png) | [Username/Password](msal-authentication-flows.md#usernamepassword) |[ms-identity-java-desktop](https://github.com/Azure-Samples/ms-identity-java-desktop/) | |
7475
| Desktop (Console) | ![This image shows the Python logo](media/sample-v2-code/logo_python.png) | [Username/Password](msal-authentication-flows.md#usernamepassword) |[ms-identity-python-desktop](https://github.com/Azure-Samples/ms-identity-python-desktop) | |

0 commit comments

Comments
 (0)