Skip to content

Commit 69324cb

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into diberry/1108-howto-2
2 parents 4376f8c + 84c1e1b commit 69324cb

File tree

555 files changed

+3563
-1822
lines changed

Some content is hidden

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

555 files changed

+3563
-1822
lines changed

.openpublishing.redirection.json

Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -36465,57 +36465,57 @@
3646536465
},
3646636466
{
3646736467
"source_path": "articles/iot-central/core/concepts-connectivity-pnp.md",
36468-
"redirect_url": "/azure/iot-central/core/overview-iot-central-get-connected-pnp",
36468+
"redirect_url": "/azure/iot-central/preview/overview-iot-central-get-connected",
3646936469
"redirect_document_id": false
3647036470
},
3647136471
{
3647236472
"source_path": "articles/iot-central/core/concepts-stay-connected.md",
36473-
"redirect_url": "/azure/iot-central/core/overview-iot-central-stay-connected-pnp",
36473+
"redirect_url": "/azure/iot-central/preview/overview-iot-central-stay-connected",
3647436474
"redirect_document_id": false
3647536475
},
3647636476
{
3647736477
"source_path": "articles/iot-central/core/overview-iot-central-transform.md",
36478-
"redirect_url": "/azure/iot-central/core/overview-iot-central-transform-pnp",
36478+
"redirect_url": "/azure/iot-central/preview/overview-iot-central-transform",
3647936479
"redirect_document_id": false
3648036480
},
3648136481
{
3648236482
"source_path": "articles/iot-central/core/howto-create-event-rules-pnp.md",
36483-
"redirect_url": "/azure/iot-central/core/tutorial-create-telemetry-rules",
36483+
"redirect_url": "/azure/iot-central/preview/tutorial-create-telemetry-rules",
3648436484
"redirect_document_id": false
3648536485
},
3648636486
{
3648736487
"source_path": "articles/iot-central/core/howto-create-telemetry-rules-pnp.md",
36488-
"redirect_url": "/azure/iot-central/core/tutorial-create-telemetry-rules",
36488+
"redirect_url": "/azure/iot-central/preview/tutorial-create-telemetry-rules",
3648936489
"redirect_document_id": false
3649036490
},
3649136491
{
3649236492
"source_path": "articles/iot-central/core/tutorial-configure-rules-pnp.md",
36493-
"redirect_url": "/azure/iot-central/core/tutorial-create-telemetry-rules",
36493+
"redirect_url": "/azure/iot-central/preview/tutorial-create-telemetry-rules",
3649436494
"redirect_document_id": false
3649536495
},
3649636496
{
3649736497
"source_path": "articles/iot-central/core/tutorial-monitor-devices-pnp.md",
36498-
"redirect_url": "/azure/iot-central/core/quick-monitor-devices-pnp",
36498+
"redirect_url": "/azure/iot-central/preview/quick-monitor-devices",
3649936499
"redirect_document_id": false
3650036500
},
3650136501
{
3650236502
"source_path": "articles/iot-central/tutorial-add-device-pnp.md",
36503-
"redirect_url": "/azure/iot-central/core/quick-create-pnp-device-pnp",
36503+
"redirect_url": "/azure/iot-central/preview/quick-create-pnp-device",
3650436504
"redirect_document_id": false
3650536505
},
3650636506
{
3650736507
"source_path": "articles/iot-central/tutorial-define-device-type-pnp.md",
36508-
"redirect_url": "/azure/iot-central/core/quick-create-pnp-device-pnp",
36508+
"redirect_url": "/azure/iot-central/preview/quick-create-pnp-device",
3650936509
"redirect_document_id": false
3651036510
},
3651136511
{
3651236512
"source_path": "articles/iot-central/howto-export-data-blob-storage-pnp.md",
36513-
"redirect_url": "/azure/iot-central/core/howto-export-data-pnp",
36513+
"redirect_url": "/azure/iot-central/preview/howto-export-data",
3651436514
"redirect_document_id": false
3651536515
},
3651636516
{
3651736517
"source_path": "articles/iot-central/howto-export-data-event-hubs-service-bus-pnp.md",
36518-
"redirect_url": "/azure/iot-central/core/howto-export-data-pnp",
36518+
"redirect_url": "/azure/iot-central/preview/howto-export-data",
3651936519
"redirect_document_id": false
3652036520
},
3652136521
{
@@ -41733,6 +41733,11 @@
4173341733
"redirect_url": "/azure-stack/operator",
4173441734
"redirect_document_id": false
4173541735
},
41736+
{
41737+
"source_path": "articles/synapse-analytics/index.yml",
41738+
"redirect_url": "/azure/sql-data-warehouse/",
41739+
"redirect_document_id": false
41740+
},
4173641741
{
4173741742
"source_path": "articles/azure-stack/user/index.yml",
4173841743
"redirect_url": "/azure-stack/user",
@@ -41985,7 +41990,7 @@
4198541990
},
4198641991
{
4198741992
"source_path": "articles/iot-central/concepts-architecture-pnp.md",
41988-
"redirect_url": "/azure/iot-central/core/concepts-architecture-pnp/",
41993+
"redirect_url": "/azure/iot-central/preview/concepts-architecture/",
4198941994
"redirect_document_id": true
4199041995
},
4199141996
{
@@ -41995,7 +42000,7 @@
4199542000
},
4199642001
{
4199742002
"source_path": "articles/iot-central/concepts-connectivity-pnp.md",
41998-
"redirect_url": "/azure/iot-central/core/concepts-connectivity-pnp/",
42003+
"redirect_url": "/azure/iot-central/preview/concepts-connectivity/",
4199942004
"redirect_document_id": true
4200042005
},
4200142006
{
@@ -42010,7 +42015,7 @@
4201042015
},
4201142016
{
4201242017
"source_path": "articles/iot-central/howto-administer-pnp.md",
42013-
"redirect_url": "/azure/iot-central/core/howto-administer-pnp/",
42018+
"redirect_url": "/azure/iot-central/preview/howto-administer/",
4201442019
"redirect_document_id": true
4201542020
},
4201642021
{
@@ -42035,7 +42040,7 @@
4203542040
},
4203642041
{
4203742042
"source_path": "articles/iot-central/howto-connect-devkit-pnp.md",
42038-
"redirect_url": "/azure/iot-central/core/howto-connect-devkit-pnp/",
42043+
"redirect_url": "/azure/iot-central/preview/howto-connect-devkit/",
4203942044
"redirect_document_id": true
4204042045
},
4204142046
{
@@ -42045,7 +42050,7 @@
4204542050
},
4204642051
{
4204742052
"source_path": "articles/iot-central/howto-connect-pnp-device-pnp.md",
42048-
"redirect_url": "/azure/iot-central/core/howto-connect-pnp-device-pnp/",
42053+
"redirect_url": "/azure/iot-central/preview/howto-connect-pnp-device/",
4204942054
"redirect_document_id": true
4205042055
},
4205142056
{
@@ -42100,7 +42105,7 @@
4210042105
},
4210142106
{
4210242107
"source_path": "articles/iot-central/howto-create-event-rules-pnp.md",
42103-
"redirect_url": "/azure/iot-central/core/tutorial-create-telemetry-rules-pnp/",
42108+
"redirect_url": "/azure/iot-central/preview/tutorial-create-telemetry-rules/",
4210442109
"redirect_document_id": true
4210542110
},
4210642111
{
@@ -42110,7 +42115,7 @@
4211042115
},
4211142116
{
4211242117
"source_path": "articles/iot-central/howto-create-telemetry-rules-pnp.md",
42113-
"redirect_url": "/azure/iot-central/core/tutorial-create-telemetry-rules-pnp",
42118+
"redirect_url": "/azure/iot-central/preview/tutorial-create-telemetry-rules",
4211442119
"redirect_document_id": true
4211542120
},
4211642121
{
@@ -42125,7 +42130,7 @@
4212542130
},
4212642131
{
4212742132
"source_path": "articles/iot-central/howto-customize-ui-pnp.md",
42128-
"redirect_url": "/azure/iot-central/core/howto-customize-ui-pnp/",
42133+
"redirect_url": "/azure/iot-central/preview/howto-customize-ui/",
4212942134
"redirect_document_id": true
4213042135
},
4213142136
{
@@ -42145,7 +42150,7 @@
4214542150
},
4214642151
{
4214742152
"source_path": "articles/iot-central/howto-manage-devices-pnp.md",
42148-
"redirect_url": "/azure/iot-central/core/howto-manage-devices-pnp/",
42153+
"redirect_url": "/azure/iot-central/preview/howto-manage-devices/",
4214942154
"redirect_document_id": true
4215042155
},
4215142156
{
@@ -42175,7 +42180,7 @@
4217542180
},
4217642181
{
4217742182
"source_path": "articles/iot-central/howto-manage-users-roles-pnp.md",
42178-
"redirect_url": "/azure/iot-central/core/howto-manage-users-roles-pnp/",
42183+
"redirect_url": "/azure/iot-central/preview/howto-manage-users-roles/",
4217942184
"redirect_document_id": true
4218042185
},
4218142186
{
@@ -42200,7 +42205,7 @@
4220042205
},
4220142206
{
4220242207
"source_path": "articles/iot-central/howto-set-up-template-pnp.md",
42203-
"redirect_url": "/azure/iot-central/core/howto-set-up-template-pnp/",
42208+
"redirect_url": "/azure/iot-central/preview/howto-set-up-template/",
4220442209
"redirect_document_id": true
4220542210
},
4220642211
{
@@ -42225,12 +42230,12 @@
4222542230
},
4222642231
{
4222742232
"source_path": "articles/iot-central/howto-use-device-groups-pnp.md",
42228-
"redirect_url": "/azure/iot-central/core/tutorial-use-device-groups-pnp/",
42233+
"redirect_url": "/azure/iot-central/preview/tutorial-use-device-groups/",
4222942234
"redirect_document_id": true
4223042235
},
4223142236
{
4223242237
"source_path": "articles/iot-central/core/howto-use-device-groups-pnp.md",
42233-
"redirect_url": "/azure/iot-central/core/tutorial-use-device-groups-pnp/",
42238+
"redirect_url": "/azure/iot-central/preview/tutorial-use-device-groups/",
4223442239
"redirect_document_id": true
4223542240
},
4223642241
{
@@ -42255,7 +42260,7 @@
4225542260
},
4225642261
{
4225742262
"source_path": "articles/iot-central/howto-version-device-template-pnp.md",
42258-
"redirect_url": "/azure/iot-central/core/howto-version-device-template-pnp/",
42263+
"redirect_url": "/azure/iot-central/preview/howto-version-device-template/",
4225942264
"redirect_document_id": true
4226042265
},
4226142266
{
@@ -42265,7 +42270,7 @@
4226542270
},
4226642271
{
4226742272
"source_path": "articles/iot-central/howto-view-bill-pnp.md",
42268-
"redirect_url": "/azure/iot-central/core/howto-view-bill-pnp/",
42273+
"redirect_url": "/azure/iot-central/preview/howto-view-bill/",
4226942274
"redirect_document_id": true
4227042275
},
4227142276
{
@@ -42285,7 +42290,7 @@
4228542290
},
4228642291
{
4228742292
"source_path": "articles/iot-central/overview-iot-central-pnp.md",
42288-
"redirect_url": "/azure/iot-central/core/overview-iot-central-pnp/",
42293+
"redirect_url": "/azure/iot-central/preview/overview-iot-central/",
4228942294
"redirect_document_id": true
4229042295
},
4229142296
{
@@ -42295,7 +42300,7 @@
4229542300
},
4229642301
{
4229742302
"source_path": "articles/iot-central/overview-iot-central-tour-pnp.md",
42298-
"redirect_url": "/azure/iot-central/core/overview-iot-central-tour-pnp/",
42303+
"redirect_url": "/azure/iot-central/preview/overview-iot-central-tour/",
4229942304
"redirect_document_id": true
4230042305
},
4230142306
{
@@ -42305,7 +42310,7 @@
4230542310
},
4230642311
{
4230742312
"source_path": "articles/iot-central/quick-create-pnp-device-pnp.md",
42308-
"redirect_url": "/azure/iot-central/core/quick-create-pnp-device-pnp/",
42313+
"redirect_url": "/azure/iot-central/preview/quick-create-pnp-device/",
4230942314
"redirect_document_id": true
4231042315
},
4231142316
{
@@ -42315,7 +42320,7 @@
4231542320
},
4231642321
{
4231742322
"source_path": "articles/iot-central/quick-deploy-iot-central-pnp.md",
42318-
"redirect_url": "/azure/iot-central/core/quick-deploy-iot-central-pnp/",
42323+
"redirect_url": "/azure/iot-central/preview/quick-deploy-iot-central/",
4231942324
"redirect_document_id": true
4232042325
},
4232142326
{
@@ -42330,7 +42335,7 @@
4233042335
},
4233142336
{
4233242337
"source_path": "articles/iot-central/tutorial-configure-rules-pnp.md",
42333-
"redirect_url": "/azure/iot-central/core/tutorial-create-telemetry-rules-pnp/",
42338+
"redirect_url": "/azure/iot-central/preview/tutorial-create-telemetry-rules/",
4233442339
"redirect_document_id": true
4233542340
},
4233642341
{
@@ -42350,7 +42355,7 @@
4235042355
},
4235142356
{
4235242357
"source_path": "articles/iot-central/tutorial-monitor-devices-pnp.md",
42353-
"redirect_url": "/azure/iot-central/core/quick-monitor-devices-pnp/",
42358+
"redirect_url": "/azure/iot-central/preview/quick-monitor-devices/",
4235442359
"redirect_document_id": true
4235542360
},
4235642361
{

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ Applications must be represented by an app object in Azure Active Directory so t
4646
> > ![Already configured](media/quickstart-v2-android/green-check.png) Your application is configured with these attributes
4747
>
4848
> ### Step 2: Download the project
49-
> * [Download the code sample](https://github.com/Azure-Samples/ms-identity-android-java)
49+
> * [Download the code sample](https://github.com/Azure-Samples/ms-identity-android-java/archive/master.zip)
5050
>
5151
> ### Step 3: Configure your project
5252
> 1. Extract and open the Project in Android Studio.
53-
> 2. Inside app > src > main > res > raw, open auth_config_multiple_account.json and replace it with the following code:
53+
> 2. Inside **app** > **src** > **main** > **res** > **raw**, open **auth_config_multiple_account.json** and replace it with the following code:
5454
> ```javascript
5555
> {
5656
> "client_id" : "Enter_the_Application_Id_Here",
@@ -71,7 +71,7 @@ Applications must be represented by an app object in Azure Active Directory so t
7171
> ```
7272
7373
> [!div class="sxs-lookup" renderon="portal"]
74-
> 3. Inside app > src > main > res > raw, open auth_config_single_account.json and replace it with the following code:
74+
> 3. Inside **app** > **src** > **main** > **res** > **raw**, open **auth_config_single_account.json** and replace it with the following code:
7575
> ```javascript
7676
> {
7777
> "client_id" : "Enter_the_Application_Id_Here",
@@ -95,22 +95,22 @@ Applications must be represented by an app object in Azure Active Directory so t
9595
> 4. Inside **app** > **src** > **main**, open **AndroidManifest.xml**.
9696
> 5. In the **manifest\application** node, replace the **<activity android:name="com.microsoft.identity.client.BrowserTabActivity">** node with the following:
9797
> ```xml
98-
> <!--Intent filter to catch Microsoft's callback after Sign In-->
99-
> <activity android:name="com.microsoft.identity.client.BrowserTabActivity">
100-
> <intent-filter>
101-
> <action android:name="android.intent.action.VIEW" />
102-
> <category android:name="android.intent.category.DEFAULT" />
103-
> <category android:name="android.intent.category.BROWSABLE" />
104-
> <!--
98+
> &lt;!--Intent filter to catch Microsoft's callback after Sign In--&gt;
99+
> &lt;activity android:name=&quot;com.microsoft.identity.client.BrowserTabActivity&quot;&gt;
100+
> &lt;intent-filter&gt;
101+
> &lt;action android:name=&quot;android.intent.action.VIEW&quot; /&gt;
102+
> &lt;category android:name=&quot;android.intent.category.DEFAULT&quot; /&gt;
103+
> &lt;category android:name=&quot;android.intent.category.BROWSABLE&quot; /&gt;
104+
> &lt;!--
105105
> Add in your scheme/host from registered redirect URI
106-
> note that the leading "/" is required for android:path
107-
> -->
108-
> <data android:scheme="msauth"
109-
> android:host="Enter_the_Package_Name_here"
110-
> android:path="Enter_the_Signature_Hash_here"
111-
> android:scheme = "msauth" />
112-
> </intent-filter>
113-
> </activity>
106+
> note that the leading &quot;/&quot; is required for android:path
107+
> --&gt;
108+
> &lt;data android:scheme=&quot;msauth&quot;
109+
> android:host=&quot;Enter_the_Package_Name_Here&quot;
110+
> android:path=&quot;Enter_the_Signature_Hash_Here&quot;
111+
> android:scheme = &quot;msauth&quot; /&gt;
112+
> &lt;/intent-filter&gt;
113+
> &lt;/activity&gt;
114114
> ```
115115
> 6. Run the app!
116116
> The sample app starts on the **Single Account Mode** screen. A default scope, **user.read**, is provided by default, which is used when reading your own profile data during the Microsoft Graph API call. The URL for the Microsoft Graph API call is provided by default. You can change both of these if you wish.
@@ -133,7 +133,7 @@ Applications must be represented by an app object in Azure Active Directory so t
133133
> [!div renderon="docs"]
134134
> ## Step 1: Get the sample app
135135
>
136-
> [Clone the code](https://github.com/Azure-Samples/ms-identity-android-java.git).
136+
> [Download the code](https://github.com/Azure-Samples/ms-identity-android-java/archive/master.zip).
137137
>
138138
> ## Step 2: Run the sample app
139139
>

articles/active-directory/develop/scenario-protected-web-api-app-configuration.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,10 @@ The validators are described in this table:
156156

157157
The validators are all associated with properties of the `TokenValidationParameters` class, themselves initialized from the ASP.NET/ASP.NET Core configuration. In most cases, you won't have to change the parameters. There's one exception, for apps that aren't single tenants. (That is, web apps that accept users from any organization or from personal Microsoft accounts.) In this case, the issuer must be validated.
158158

159+
## Token validation in Azure Functions
160+
161+
It's also possible to validate incoming access tokens in Azure functions. You can find examples of validating tokens in Azure functions in [Dotnet](https://github.com/Azure-Samples/ms-identity-dotnet-webapi-azurefunctions), [NodeJS](https://github.com/Azure-Samples/ms-identity-nodejs-webapi-azurefunctions), and [Python](https://github.com/Azure-Samples/ms-identity-python-webapi-azurefunctions).
162+
159163
## Next steps
160164

161165
> [!div class="nextstepaction"]

articles/active-directory/develop/tutorial-v2-ios.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,15 @@ Then Add the following code to `ViewController.swift` prior to `viewDidLoad()`:
133133
let kClientID = "Your_Application_Id_Here"
134134

135135
// Additional variables for Auth and Graph API
136-
let kGraphURI = "https://graph.microsoft.com/v1.0/me/"
137-
let kScopes: [String] = ["https://graph.microsoft.com/user.read"]
138-
let kAuthority = "https://login.microsoftonline.com/common"
136+
let kGraphURI = "https://graph.microsoft.com/v1.0/me/" // the Microsoft Graph endpoint
137+
let kScopes: [String] = ["https://graph.microsoft.com/user.read"] // request permission to read the profile of the signed-in user
138+
let kAuthority = "https://login.microsoftonline.com/common" // this authority allows a personal Microsoft account and a work or school account in any organization’s Azure AD tenant to sign in
139139
var accessToken = String()
140140
var applicationContext : MSALPublicClientApplication?
141141
var webViewParamaters : MSALWebviewParameters?
142142
```
143143

144-
Modify the value assigned to `kClientID`to be your Application ID. This value is part of the MSAL Configuration data that you saved during the step at the beginning of this tutorial to register the application in the Azure portal.
144+
The only value you need to modify above is the value assigned to `kClientID`to be your [Application ID](https://docs.microsoft.com/azure/active-directory/develop/developer-glossary#application-id-client-id). This value is part of the MSAL Configuration data that you saved during the step at the beginning of this tutorial to register the application in the Azure portal.
145145

146146
## For iOS only, configure URL schemes
147147

articles/active-directory/devices/azureadjoin-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ When you're using AD FS, you need to enable the following WS-Trust endpoints:
7676
If your identity provider does not support these protocols, Azure AD join does not work natively. Beginning with Windows 10 1809, your users can sign in to an Azure AD joined device with a SAML-based identity provider through [web sign-in on Windows 10](https://docs.microsoft.com/windows/whats-new/whats-new-windows-10-version-1809#web-sign-in-to-windows-10). Currently, web sign-in is a preview feature and is not recommended for production deployments.
7777

7878
>[!NOTE]
79-
> Currently, Azure AD join does not work with [AD FS 2019 configured with external authentication providers as the primary authentication method](https://docs.microsoft.com/en-us/windows-server/identity/ad-fs/operations/additional-authentication-methods-ad-fs#enable-external-authentication-methods-as-primary). Azure AD join defaults to password authentication as the primary method, which results in authentication failures in this scenario
79+
> Currently, Azure AD join does not work with [AD FS 2019 configured with external authentication providers as the primary authentication method](https://docs.microsoft.com/windows-server/identity/ad-fs/operations/additional-authentication-methods-ad-fs#enable-external-authentication-methods-as-primary). Azure AD join defaults to password authentication as the primary method, which results in authentication failures in this scenario
8080
8181

8282
### Smartcards and certificate-based authentication

articles/active-directory/devices/hybrid-azuread-join-federated-domains.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ A federated environment should have an identity provider that supports the follo
4040
`/adfs/services/trust/13/certificatemixed`
4141

4242
> [!WARNING]
43-
> Both **adfs/services/trust/2005/windowstransport** or **adfs/services/trust/13/windowstransport** should be enabled as intranet facing endpoints only and must NOT be exposed as extranet facing endpoints through the Web Application Proxy. To learn more on how to disable WS-Trust Windows endpoints, see [Disable WS-Trust Windows endpoints on the proxy](https://docs.microsoft.com/en-us/windows-server/identity/ad-fs/deployment/best-practices-securing-ad-fs#disable-ws-trust-windows-endpoints-on-the-proxy-ie-from-extranet). You can see what endpoints are enabled through the AD FS management console under **Service** > **Endpoints**.
43+
> Both **adfs/services/trust/2005/windowstransport** or **adfs/services/trust/13/windowstransport** should be enabled as intranet facing endpoints only and must NOT be exposed as extranet facing endpoints through the Web Application Proxy. To learn more on how to disable WS-Trust Windows endpoints, see [Disable WS-Trust Windows endpoints on the proxy](https://docs.microsoft.com/windows-server/identity/ad-fs/deployment/best-practices-securing-ad-fs#disable-ws-trust-windows-endpoints-on-the-proxy-ie-from-extranet). You can see what endpoints are enabled through the AD FS management console under **Service** > **Endpoints**.
4444
4545
In this tutorial, you learn how to configure hybrid Azure AD join for Active Directory domain-joined computers devices in a federated environment by using AD FS.
4646

0 commit comments

Comments
 (0)