Skip to content

Commit 9d8371b

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 65f8f65 + b396c67 commit 9d8371b

File tree

133 files changed

+2351
-5587
lines changed

Some content is hidden

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

133 files changed

+2351
-5587
lines changed

.openpublishing.redirection.json

Lines changed: 81 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
"redirect_url": "articles/azure-monitor/insights/container-insights-azure-redhat4-setup.md",
66
"redirect_document_id": false
77
},
8+
{
9+
"source_path": "articles/container-registry/container-registry-tasks-agent-pools.md",
10+
"redirect_url": "/azure/container-registry/container-registry-tasks-overview",
11+
"redirect_document_id": false
12+
},
813
{
914
"source_path": "articles/openshift/tutorial-scale-cluster.md",
1015
"redirect_url": "articles/openshift/tutorial-connect-cluster.md",
@@ -17943,7 +17948,7 @@
1794317948
{
1794417949
"source_path": "articles/sql-data-warehouse/sql-data-warehouse-get-started-visualize-with-power-bi.md",
1794517950
"redirect_url": "/power-bi/service-azure-sql-data-warehouse-with-direct-connect",
17946-
"redirect_document_id": true
17951+
"redirect_document_id": false
1794717952
},
1794817953
{
1794917954
"source_path": "articles/sql-data-warehouse/sql-data-warehouse-how-to-configure-workload-importance.md",
@@ -52343,7 +52348,81 @@
5234352348
"source_path": "articles/load-balancer/azure-media-player/components-limitations.md",
5234452349
"redirect_url": "/articles/load-balancer/concepts",
5234552350
"redirect_document_id": false
52351+
},
52352+
{
52353+
"source_path": "articles/visual-studio/vs-storage-webjobs-what-happened.md",
52354+
"redirect_url": "/azure/storage",
52355+
"redirect_document_id": false
52356+
},
52357+
{
52358+
"source_path": "articles/visual-studio/vs-storage-aspnet5-getting-started-blobs.md",
52359+
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-dotnet-legacy",
52360+
"redirect_document_id": false
52361+
},
52362+
{
52363+
"source_path": "articles/visual-studio/vs-storage-aspnet5-getting-started-tables.md",
52364+
"redirect_url": "/azure/storage/tables/table-storage-overview",
52365+
"redirect_document_id": false
52366+
},
52367+
{
52368+
"source_path": "articles/visual-studio/vs-storage-aspnet-getting-started-queues.md",
52369+
"redirect_url": "/azure/storage/queues/",
52370+
"redirect_document_id": false
52371+
},
52372+
{
52373+
"source_path": "articles/visual-studio/vs-storage-aspnet-what-happened.md",
52374+
"redirect_url": "/azure/storage",
52375+
"redirect_document_id": false
52376+
},
52377+
{
52378+
"source_path": "articles/visual-studio/vs-storage-webjobs-getting-started-tables.md",
52379+
"redirect_url": "/azure/storage/tables/table-storage-overview",
52380+
"redirect_document_id": false
52381+
},
52382+
{
52383+
"source_path": "articles/visual-studio/vs-storage-aspnet-core-getting-started-blobs.md",
52384+
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-dotnet-legacy",
52385+
"redirect_document_id": false
52386+
},
52387+
{
52388+
"source_path": "articles/visual-studio/vs-storage-aspnet5-getting-started-queues.md",
52389+
"redirect_url": "/azure/storage/queues/",
52390+
"redirect_document_id": false
52391+
},
52392+
{
52393+
"source_path": "articles/vs-azure-tools-storage-emulator-using.md",
52394+
"redirect_url": "/azure/storage/common/storage-use-emulator",
52395+
"redirect_document_id": false
52396+
},
52397+
{
52398+
"source_path": "articles/visual-studio/vs-storage-aspnet-getting-started-blobs.md",
52399+
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-dotnet-legacy",
52400+
"redirect_document_id": false
52401+
},
52402+
{
52403+
"source_path": "articles/visual-studio/vs-storage-aspnet5-what-happened.md",
52404+
"redirect_url": "/azure/storage",
52405+
"redirect_document_id": false
52406+
},
52407+
{
52408+
"source_path": "articles/visual-studio/vs-storage-aspnet-getting-started-tables.md",
52409+
"redirect_url": "/azure/storage/tables/table-storage-overview",
52410+
"redirect_document_id": false
52411+
},
52412+
{
52413+
"source_path": "articles/visual-studio/vs-storage-webjobs-getting-started-blobs.md",
52414+
"redirect_url": "/azure/storage/blobs/",
52415+
"redirect_document_id": false
52416+
},
52417+
{
52418+
"source_path": "articles/visual-studio/vs-storage-webjobs-getting-started-queues.md",
52419+
"redirect_url": "/azure/storage/queues/",
52420+
"redirect_document_id": false
52421+
},
52422+
{
52423+
"source_path": "articles/visual-studio/vs-storage-cloud-services-what-happened.md",
52424+
"redirect_url": "/azure/storage",
52425+
"redirect_document_id": false
5234652426
}
52347-
5234852427
]
5234952428
}

articles/active-directory/azuread-dev/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
- name: Use the Microsoft Graph API
159159
href: ../develop/microsoft-graph-intro.md?toc=/azure/active-directory/azuread-dev/toc.json&bc=/azure/active-directory/azuread-dev/breadcrumb/toc.json
160160
- name: AD FS for developers
161-
href: https://docs.microsoft.com/windows-server/identity/ad-fs/overview/ad-fs-scenarios-for-developers
161+
href: https://docs.microsoft.com/windows-server/identity/ad-fs/ad-fs-overview
162162
- name: References
163163
items:
164164
- name: Authentication libraries

articles/active-directory/develop/app-registration-portal-training-guide.md

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.custom: aaddev
1818

1919
# The new Azure portal app registration experience
2020

21-
There are many improvements in the new [App registrations](https://go.microsoft.com/fwlink/?linkid=2083908) experience in the Azure portal. If you're more familiar with the Application registration portal (apps.dev.microsoft.com) experience for registering or managing converged applications, referred to as the old experience, this training guide will get you started using the new experience.
21+
There are many improvements in the new [App registrations](https://go.microsoft.com/fwlink/?linkid=2083908) experience in the Azure portal. If you're more familiar with the Application registration portal (apps.dev.microsoft.com) for registering or managing applications, referred to here as the "old experience," this guide will get you started using the new experience.
2222

2323
## What's not changing?
2424

@@ -41,8 +41,8 @@ There are many improvements in the new [App registrations](https://go.microsoft.
4141

4242
## Key changes
4343

44-
- In the old experience, apps were by default registered as converged
45-
apps supporting all organizational accounts (multitenant) as well as
44+
- In the old experience, apps were by default registered as *converged*
45+
apps - apps that support all organizational accounts (multitenant) as well as
4646
personal Microsoft accounts. This could not be modified through the
4747
old experience, making it difficult to create apps that supported
4848
only organizational accounts (either multitenant or single tenant).
@@ -75,10 +75,10 @@ There are many improvements in the new [App registrations](https://go.microsoft.
7575

7676
## New app registration
7777

78-
In the old experience, to register a converged app you were only
78+
In the old experience, to register an app you were only
7979
required to provide a Name. The apps that were created were registered
80-
as converged apps supporting all organizational directory (multitenant)
81-
as well as personal Microsoft accounts. This could not be modified through the old experience, making it difficult to create apps that supported only organizational accounts (either multitenant or single tenant). [Learn more about supported account types](v2-supported-account-types.md)
80+
as *converged* apps - apps supporting all organizational directories (multitenant)
81+
as well as personal Microsoft accounts. This could not be modified through the old experience, making it difficult to create apps that supported only organizational accounts (either single- or multi-tenant). [Learn more about supported account types](v2-supported-account-types.md)
8282

8383
In the new experience, you must provide a Name for the app and choose
8484
the Supported account types. You can optionally provide a redirect URI.
@@ -89,25 +89,19 @@ quickstart](quickstart-register-app.md).
8989

9090
## App management page
9191

92-
The old experience had a single app management page for converged apps
92+
The old experience had a single app management page for apps
9393
with the following sections: Properties, Application secrets, Platforms,
9494
Owners, Microsoft Graph Permissions, Profile, and Advanced Options.
9595

96-
The new experience in the Azure portal represents these features into
96+
The new experience in the Azure portal presents these features in
9797
separate pages. Here's where you can find the equivalent functionality:
9898

99-
- Properties - Name and Application ID is on the Overview page.
100-
101-
- Application Secrets is on the Certificates & secrets page
102-
103-
- Platforms configuration is on the Authentication page
104-
105-
- Microsoft Graph permissions is on the API permissions page along
106-
with other permissions
107-
108-
- Profile is on Branding page
109-
110-
- Advanced option - Live SDK support is on the Authentication page.
99+
- Properties - Name and Application ID is on the Overview page.
100+
- Application Secrets is on the Certificates & secrets page
101+
- Platforms configuration is on the Authentication page
102+
- Microsoft Graph permissions is on the API permissions page along with other permissions
103+
- Profile is on Branding page
104+
- Advanced option - Live SDK support is on the Authentication page.
111105

112106
## Application secrets/Certificates & secrets
113107

@@ -179,7 +173,7 @@ the manifest editor or the API, or didn't exist.
179173
- Publisher domain (which is displayed to users on the [application\'s
180174
consent
181175
prompt](application-consent-experience.md))
182-
can be found on the Branding blade page. For more info on how to
176+
can be found on the Branding page. For more info on how to
183177
configure a publisher domain, see [this
184178
how-to](howto-configure-publisher-domain.md).
185179

@@ -199,3 +193,7 @@ The new experience has the following limitations:
199193

200194
> [!NOTE]
201195
> If you're a personal Microsoft account user in Azure AD tenant, and the tenant admin has restricted access to Azure portal, you may get an access denied. However, if you come through the shortcut by typing App registrations in the search bar or pinning it, you'll be able to access the new experience.
196+
197+
## Next steps
198+
199+
To get started with the new app registration experience, see [Quickstart: Register an application with the Microsoft identity platform](quickstart-register-app.md).

articles/active-directory/develop/msal-net-token-cache-serialization.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ The following classes and interfaces are used in token cache serialization:
4848
4949
The strategies are different depending on if you're writing a token cache serialization for a [public client application](msal-client-applications.md) (desktop), or a [confidential client application](msal-client-applications.md)) (web app / web API, daemon app).
5050

51-
### Token cache for a public client
51+
### Token cache for a public client
5252

5353
Since MSAL.NET v2.x you have several options for serializing the token cache of a public client. You can serialize the cache only to the MSAL.NET format (the unified format cache is common across MSAL and the platforms). You can also support the [legacy](https://github.com/AzureAD/azure-activedirectory-library-for-dotnet/wiki/Token-cache-serialization) token cache serialization of ADAL V3.
5454

@@ -323,9 +323,10 @@ services.AddDistributedSqlServerCache(options =>
323323
Their usage is featured in the [ASP.NET Core web app tutorial](https://docs.microsoft.com/aspnet/core/tutorials/first-mvc-app/) in the phase [2-2 Token Cache](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/tree/master/2-WebApp-graph-user/2-2-TokenCache).
324324

325325
## Next steps
326+
326327
The following samples illustrate token cache serialization.
327328

328329
| Sample | Platform | Description|
329330
| ------ | -------- | ----------- |
330331
|[active-directory-dotnet-desktop-msgraph-v2](https://github.com/azure-samples/active-directory-dotnet-desktop-msgraph-v2) | Desktop (WPF) | Windows Desktop .NET (WPF) application calling the Microsoft Graph API. ![Topology](media/msal-net-token-cache-serialization/topology.png)|
331-
|[active-directory-dotnet-v1-to-v2](https://github.com/Azure-Samples/active-directory-dotnet-v1-to-v2) | Desktop (Console) | Set of Visual Studio solutions illustrating the migration of Azure AD v1.0 applications (using ADAL.NET) to Azure AD v2.0 applications, also named converged applications (using MSAL.NET), in particular [Token Cache Migration](https://github.com/Azure-Samples/active-directory-dotnet-v1-to-v2/blob/master/TokenCacheMigration/README.md)|
332+
|[active-directory-dotnet-v1-to-v2](https://github.com/Azure-Samples/active-directory-dotnet-v1-to-v2) | Desktop (Console) | Set of Visual Studio solutions illustrating the migration of Azure AD v1.0 applications (using ADAL.NET) to Microsoft identity platform applications (using MSAL.NET). In particular, see [Token Cache Migration](https://github.com/Azure-Samples/active-directory-dotnet-v1-to-v2/blob/master/TokenCacheMigration/README.md)|

articles/active-directory/develop/quickstart-v2-javascript.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ In this quickstart, you use a code sample to learn how a JavaScript single-page
9090
> const msalConfig = {
9191
> auth: {
9292
> clientId: "Enter_the_Application_Id_Here",
93-
> authority: "Enter_the_Cloud_Instance_Id_HereEnter_the_Tenant_Info_Here",
93+
> authority: "Enter_the_Cloud_Instance_Id_Here_OR_Enter_the_Tenant_Info_Here",
9494
> redirectUri: "Enter_the_Redirect_Uri_Here",
9595
> },
9696
> cache: {

articles/active-directory/develop/registration-config-sso-how-to.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: CelesteDG
77

88
ms.service: active-directory
99
ms.subservice: develop
10-
ms.custom: aaddev
10+
ms.custom: aaddev
1111
ms.workload: identity
1212
ms.topic: conceptual
1313
ms.date: 07/15/2019
@@ -37,6 +37,6 @@ For iOS, see [Enabling Cross App SSO in iOS](https://docs.microsoft.com/azure/ac
3737

3838
[Integrating Apps to AzureAD](https://docs.microsoft.com/azure/active-directory/develop/active-directory-integrating-applications)<br>
3939

40-
[Consent and Permissioning for AzureAD v2.0 converged Apps](https://docs.microsoft.com/azure/active-directory/develop/active-directory-v2-scopes)<br>
40+
[Permissions and consent in the Microsoft identity platform endpoint](https://docs.microsoft.com/azure/active-directory/develop/active-directory-v2-scopes)<br>
4141

4242
[AzureAD StackOverflow](https://stackoverflow.com/questions/tagged/azure-active-directory)

articles/active-directory/develop/tutorial-v2-javascript-auth-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ You now have a simple server to serve your SPA. The intended folder structure at
277277

278278
## Register your application
279279

280-
Follow the instructions to [register a new single page application](https://docs.microsoft.com/zure/active-directory/develop/scenario-spa-app-registration).
280+
Follow the instructions to [register a new single page application](https://docs.microsoft.com/azure/active-directory/develop/scenario-spa-app-registration).
281281

282282
#### Set a redirect URL for Node.js
283283

0 commit comments

Comments
 (0)