Skip to content

Commit 415f3fb

Browse files
authored
Merge pull request #95372 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 17ab483 + 3efee72 commit 415f3fb

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

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/users-groups-roles/groups-dynamic-membership.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,10 @@ The custom property name can be found in the directory by querying a user's prop
354354

355355
## Rules for devices
356356

357-
You can also create a rule that selects device objects for membership in a group. You can't have both users and devices as group members. The **organizationalUnit** attribute is no longer listed and should not be used. This string is set by Intune in specific cases but is not recognized by Azure AD, so no devices are added to groups based on this attribute.
357+
You can also create a rule that selects device objects for membership in a group. You can't have both users and devices as group members.
358+
359+
> [!NOTE]
360+
> The **organizationalUnit** attribute is no longer listed and should not be used. This string is set by Intune in specific cases but is not recognized by Azure AD, so no devices are added to groups based on this attribute.
358361
359362
> [!NOTE]
360363
> systemlabels is a read-only attribute that cannot be set with Intune.
@@ -376,9 +379,8 @@ The following device attributes can be used.
376379
enrollmentProfileName | Apple Device Enrollment Profile, Device enrollment - Corporate device identifiers (Android - Kiosk), or Windows Autopilot profile name | (device.enrollmentProfileName -eq "DEP iPhones")
377380
isRooted | true false | (device.isRooted -eq true)
378381
managementType | MDM (for mobile devices)<br>PC (for computers managed by the Intune PC agent) | (device.managementType -eq "MDM")
379-
organizationalUnit | a valid on-premises organizational unit (OU) | (device.organizationalUnit -contains "laptop")
380382
deviceId | a valid Azure AD device ID | (device.deviceId -eq "d4fe7726-5966-431c-b3b8-cddc8fdb717d")
381-
objectId | a valid Azure AD object ID | (device.objectId -eq 76ad43c9-32c5-45e8-a272-7b58b58f596d")
383+
objectId | a valid Azure AD object ID | (device.objectId -eq "76ad43c9-32c5-45e8-a272-7b58b58f596d")
382384
devicePhysicalIds | any string value used by Autopilot, such as all Autopilot devices, OrderID, or PurchaseOrderID | (device.devicePhysicalIDs -any _ -contains "[ZTDId]") (device.devicePhysicalIds -any _ -eq "[OrderID]:179887111881") (device.devicePhysicalIds -any _ -eq "[PurchaseOrderId]:76222342342")
383385
systemLabels | any string matching the Intune device property for tagging Modern Workplace devices | (device.systemLabels -contains "M365Managed")
384386

articles/search/search-howto-complex-data-types.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.date: 11/04/2019
1414

1515
# How to model complex data types in Azure Cognitive Search
1616

17-
External datasets used to populate an Azure Cognitive Search index can come in many shapes. Sometimes they include hierarchical or nested substructures. Examples might include multiple addresses for a single customer, multiple colors and sizes for a single SKU, multiple authors of a single book, and so on. In modeling terms, you might see these structures referred to as *complex*, *compound*, *composite*, or *aggregate* data types. The term Azure Cognitive Search uses for this concept is **complex type**. In Azure Cognitive Cognitive Search, complex types are modeled using **complex fields**. A complex field is a field that contains children (sub-fields) which can be of any data type, including other complex types. This works in a similar way as structured data types in a programming language.
17+
External datasets used to populate an Azure Cognitive Search index can come in many shapes. Sometimes they include hierarchical or nested substructures. Examples might include multiple addresses for a single customer, multiple colors and sizes for a single SKU, multiple authors of a single book, and so on. In modeling terms, you might see these structures referred to as *complex*, *compound*, *composite*, or *aggregate* data types. The term Azure Cognitive Search uses for this concept is **complex type**. In Azure Cognitive Search, complex types are modeled using **complex fields**. A complex field is a field that contains children (sub-fields) which can be of any data type, including other complex types. This works in a similar way as structured data types in a programming language.
1818

1919
Complex fields represent either a single object in the document, or an array of objects, depending on the data type. Fields of type `Edm.ComplexType` represent single objects, while fields of type `Collection(Edm.ComplexType)` represent arrays of objects.
2020

@@ -160,4 +160,4 @@ Try the [Hotels data set](https://github.com/Azure-Samples/azure-search-sample-d
160160
With that information in hand, your first step in the wizard is to create a new Azure Cosmos DB data source. Further on in the wizard, when you get to the target index page, you'll see an index with complex types. Create and load this index, and then execute queries to understand the new structure.
161161

162162
> [!div class="nextstepaction"]
163-
> [Quickstart: portal wizard for import, indexing, and queries](search-get-started-portal.md)
163+
> [Quickstart: portal wizard for import, indexing, and queries](search-get-started-portal.md)

articles/sql-database/sql-database-spark-connector.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ val config = Config(Map(
124124
"queryCustom" -> query
125125
))
126126

127-
sqlContext.SqlDBQuery(config)
127+
sqlContext.sqlDBQuery(config)
128128
```
129129

130130
## Connect Spark to Azure SQL Database using AAD authentication

0 commit comments

Comments
 (0)