Skip to content

Commit e5772e5

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into release-synapse-current
2 parents 42faea2 + 3e54f81 commit e5772e5

File tree

175 files changed

+4789
-1790
lines changed

Some content is hidden

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

175 files changed

+4789
-1790
lines changed

.openpublishing.redirection.json

Lines changed: 65 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,6 +781,11 @@
781781
"redirect_url": "/azure/cognitive-services/Content-Moderator/client-libraries?pivots=programming-language-python",
782782
"redirect_document_id": false
783783
},
784+
{
785+
"source_path": "articles/cognitive-services/LUIS/luis-tutorial-list-entity.md",
786+
"redirect_url": "/azure/cognitive-services/luis/reference-entity-list",
787+
"redirect_document_id": false
788+
},
784789
{
785790
"source_path": "articles/cognitive-services/QnAMaker/Tutorials/integrate-qnamaker-luis.md",
786791
"redirect_url": "/azure/cognitive-services/luis/choose-natural-language-processing-service",
@@ -52329,6 +52334,56 @@
5232952334
"redirect_url": "/azure/storage",
5233052335
"redirect_document_id": false
5233152336
},
52337+
{
52338+
"source_path": "articles/virtual-desktop/create-host-pools-arm-template.md",
52339+
"redirect_url": "/azure/virtual-desktop/virtual-desktop-fall-2019/create-host-pools-arm-template",
52340+
"redirect_document_id": false
52341+
},
52342+
{
52343+
"source_path": "articles/virtual-desktop/create-service-principal-role-powershell.md",
52344+
"redirect_url": "/azure/virtual-desktop/virtual-desktop-fall-2019/create-service-principal-role-powershell",
52345+
"redirect_document_id": false
52346+
},
52347+
{
52348+
"source_path": "articles/virtual-desktop/deploy-diagnostics.md",
52349+
"redirect_url": "/azure/virtual-desktop/virtual-desktop-fall-2019/deploy-diagnostics",
52350+
"redirect_document_id": false
52351+
},
52352+
{
52353+
"source_path": "articles/virtual-desktop/deploy-windows-7-virtual-machine.md",
52354+
"redirect_url": "/azure/virtual-desktop/virtual-desktop-fall-2019/deploy-windows-7-virtual-machine",
52355+
"redirect_document_id": false
52356+
},
52357+
{
52358+
"source_path": "articles/virtual-desktop/manage-resources-using-ui-powershell.md",
52359+
"redirect_url": "/azure/virtual-desktop/virtual-desktop-fall-2019/manage-resources-using-ui-powershell",
52360+
"redirect_document_id": false
52361+
},
52362+
{
52363+
"source_path": "articles/virtual-desktop/manage-resources-using-ui.md",
52364+
"redirect_url": "/azure/virtual-desktop/virtual-desktop-fall-2019/manage-resources-using-ui",
52365+
"redirect_document_id": false
52366+
},
52367+
{
52368+
"source_path": "articles/virtual-desktop/set-up-scaling-script.md",
52369+
"redirect_url": "/azure/virtual-desktop/virtual-desktop-fall-2019/set-up-scaling-script",
52370+
"redirect_document_id": false
52371+
},
52372+
{
52373+
"source_path": "articles/virtual-desktop/tenant-setup-azure-active-directory.md",
52374+
"redirect_url": "/azure/virtual-desktop/virtual-desktop-fall-2019/tenant-setup-azure-active-directory",
52375+
"redirect_document_id": false
52376+
},
52377+
{
52378+
"source_path": "articles/virtual-desktop/troubleshoot-management-tool.md",
52379+
"redirect_url": "/azure/virtual-desktop/virtual-desktop-fall-2019/troubleshoot-management-tool",
52380+
"redirect_document_id": false
52381+
},
52382+
{
52383+
"source_path": "articles/virtual-desktop/troubleshoot-windows-7-vm.md",
52384+
"redirect_url": "/azure/virtual-desktop/virtual-desktop-fall-2019/troubleshoot-windows-7-vm",
52385+
"redirect_document_id": false
52386+
},
5233252387
{
5233352388
"source_path": "articles/sql-database-edge/index.yml",
5233452389
"redirect_url": "/azure/azure-sql-edge/",
@@ -52433,7 +52488,16 @@
5243352488
"source_path": "articles/cdn/endpoint-multiorigin.md",
5243452489
"redirect_url": "/azure/cdn/cdn-overview",
5243552490
"redirect_document_id": false
52491+
},
52492+
{
52493+
"source_path": "articles/batch/batch-api-basics.md",
52494+
"redirect_url": "/azure/batch/batch-service-workflow-features",
52495+
"redirect_document_id": false
52496+
},
52497+
{
52498+
"source_path": "articles/batch/batch-retry-after-errors.md",
52499+
"redirect_url": "/azure/batch/error-handling",
52500+
"redirect_document_id": false
5243652501
}
52437-
5243852502
]
5243952503
}

articles/active-directory/app-provisioning/workday-attribute-reference.md

Lines changed: 43 additions & 33 deletions
Large diffs are not rendered by default.

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

Lines changed: 52 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -178,25 +178,69 @@ The installer creates a scheduled task on the system that runs in the user conte
178178

179179
## Verify the registration
180180

181-
To verify the device registration state in your Azure tenant, you can use the **[Get-MsolDevice](/powershell/msonline/v1/get-msoldevice)** cmdlet in the [Azure Active Directory PowerShell module](/powershell/azure/install-msonlinev1?view=azureadps-2.0).
181+
Here are 3 ways to locate and verify the device state:
182+
183+
### Locally on the device
184+
185+
1. Open Windows PowerShell.
186+
2. Enter `dsregcmd /status`.
187+
3. Verify that both **AzureAdJoined** and **DomainJoined** are set to **YES**.
188+
4. You can use the **DeviceId** and compare the status on the service using either the Azure portal or PowerShell.
189+
190+
### Using the Azure portal
191+
192+
1. Go to the devices page using a [direct link](https://portal.azure.com/#blade/Microsoft_AAD_IAM/DevicesMenuBlade/Devices).
193+
2. Information on how to locate a device can be found in [How to manage device identities using the Azure portal](https://docs.microsoft.com/azure/active-directory/devices/device-management-azure-portal#locate-devices).
194+
3. If the **Registered** column says **Pending**, then Hybrid Azure AD Join has not completed. In federated environments, this can happen only if it failed to register and AAD connect is configured to sync the devices.
195+
4. If the **Registered** column contains a **date/time**, then Hybrid Azure AD Join has completed.
196+
197+
### Using PowerShell
198+
199+
Verify the device registration state in your Azure tenant by using **[Get-MsolDevice](/powershell/msonline/v1/get-msoldevice)**. This cmdlet is in the [Azure Active Directory PowerShell module](/powershell/azure/install-msonlinev1?view=azureadps-2.0).
182200

183201
When you use the **Get-MSolDevice** cmdlet to check the service details:
184202

185203
- An object with the **device ID** that matches the ID on the Windows client must exist.
186-
- The value for **DeviceTrustType** must be **Domain Joined**. This setting is equivalent to the **Hybrid Azure AD joined** state under **Devices** in the Azure AD portal.
187-
- For devices that are used in Conditional Access, the value for **Enabled** must be **True** and **DeviceTrustLevel** must be **Managed**.
188-
189-
**To check the service details**:
204+
- The value for **DeviceTrustType** is **Domain Joined**. This setting is equivalent to the **Hybrid Azure AD joined** state on the **Devices** page in the Azure AD portal.
205+
- For devices that are used in Conditional Access, the value for **Enabled** is **True** and **DeviceTrustLevel** is **Managed**.
190206

191207
1. Open Windows PowerShell as an administrator.
192-
1. Enter `Connect-MsolService` to connect to your Azure tenant.
193-
1. Enter `get-msoldevice -deviceId <deviceId>`.
194-
1. Verify that **Enabled** is set to **True**.
208+
2. Enter `Connect-MsolService` to connect to your Azure tenant.
209+
210+
#### Count all Hybrid Azure AD joined devices (excluding **Pending** state)
211+
212+
```azurepowershell
213+
(Get-MsolDevice -All -IncludeSystemManagedDevices | where {($_.DeviceTrustType -eq 'Domain Joined') -and (([string]($_.AlternativeSecurityIds)).StartsWith("X509:"))}).count
214+
```
215+
216+
#### Count all Hybrid Azure AD joined devices with **Pending** state
217+
218+
```azurepowershell
219+
(Get-MsolDevice -All -IncludeSystemManagedDevices | where {($_.DeviceTrustType -eq 'Domain Joined') -and (-not([string]($_.AlternativeSecurityIds)).StartsWith("X509:"))}).count
220+
```
221+
222+
#### List all Hybrid Azure AD joined devices
223+
224+
```azurepowershell
225+
Get-MsolDevice -All -IncludeSystemManagedDevices | where {($_.DeviceTrustType -eq 'Domain Joined') -and (([string]($_.AlternativeSecurityIds)).StartsWith("X509:"))}
226+
```
227+
228+
#### List all Hybrid Azure AD joined devices with **Pending** state
229+
230+
```azurepowershell
231+
Get-MsolDevice -All -IncludeSystemManagedDevices | where {($_.DeviceTrustType -eq 'Domain Joined') -and (-not([string]($_.AlternativeSecurityIds)).StartsWith("X509:"))}
232+
```
233+
234+
#### List details of a single device:
235+
236+
1. Enter `get-msoldevice -deviceId <deviceId>` (This is the **DeviceId** obtained locally on the device).
237+
2. Verify that **Enabled** is set to **True**.
195238

196239
## Troubleshoot your implementation
197240

198241
If you experience issues with completing hybrid Azure AD join for domain-joined Windows devices, see:
199242

243+
- [Troubleshooting devices using dsregcmd command](https://docs.microsoft.com/azure/active-directory/devices/troubleshoot-device-dsregcmd)
200244
- [Troubleshoot hybrid Azure AD join for Windows current devices](troubleshoot-hybrid-join-windows-current.md)
201245
- [Troubleshoot hybrid Azure AD join for Windows downlevel devices](troubleshoot-hybrid-join-windows-legacy.md)
202246

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

Lines changed: 49 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,24 @@ The installer creates a scheduled task on the system that runs in the user conte
158158

159159
## Verify the registration
160160

161+
Here are 3 ways to locate and verify the device state:
162+
163+
### Locally on the device
164+
165+
1. Open Windows PowerShell.
166+
2. Enter `dsregcmd /status`.
167+
3. Verify that both **AzureAdJoined** and **DomainJoined** are set to **YES**.
168+
4. You can use the **DeviceId** and compare the status on the service using either the Azure portal or PowerShell.
169+
170+
### Using the Azure portal
171+
172+
1. Go to the devices page using a [direct link](https://portal.azure.com/#blade/Microsoft_AAD_IAM/DevicesMenuBlade/Devices).
173+
2. Information on how to locate a device can be found in [How to manage device identities using the Azure portal](https://docs.microsoft.com/azure/active-directory/devices/device-management-azure-portal#locate-devices).
174+
3. If the **Registered** column says **Pending**, then Hybrid Azure AD Join has not completed.
175+
4. If the **Registered** column contains a **date/time**, then Hybrid Azure AD Join has completed.
176+
177+
### Using PowerShell
178+
161179
Verify the device registration state in your Azure tenant by using **[Get-MsolDevice](/powershell/msonline/v1/get-msoldevice)**. This cmdlet is in the [Azure Active Directory PowerShell module](/powershell/azure/install-msonlinev1?view=azureadps-2.0).
162180

163181
When you use the **Get-MSolDevice** cmdlet to check the service details:
@@ -166,17 +184,43 @@ When you use the **Get-MSolDevice** cmdlet to check the service details:
166184
- The value for **DeviceTrustType** is **Domain Joined**. This setting is equivalent to the **Hybrid Azure AD joined** state on the **Devices** page in the Azure AD portal.
167185
- For devices that are used in Conditional Access, the value for **Enabled** is **True** and **DeviceTrustLevel** is **Managed**.
168186

169-
To check the service details:
170-
171187
1. Open Windows PowerShell as an administrator.
172-
1. Enter `Connect-MsolService` to connect to your Azure tenant.
173-
1. Enter `get-msoldevice -deviceId <deviceId>`.
174-
1. Verify that **Enabled** is set to **True**.
188+
2. Enter `Connect-MsolService` to connect to your Azure tenant.
189+
190+
#### Count all Hybrid Azure AD joined devices (excluding **Pending** state)
191+
192+
```azurepowershell
193+
(Get-MsolDevice -All -IncludeSystemManagedDevices | where {($_.DeviceTrustType -eq 'Domain Joined') -and (([string]($_.AlternativeSecurityIds)).StartsWith("X509:"))}).count
194+
```
195+
196+
#### Count all Hybrid Azure AD joined devices with **Pending** state
197+
198+
```azurepowershell
199+
(Get-MsolDevice -All -IncludeSystemManagedDevices | where {($_.DeviceTrustType -eq 'Domain Joined') -and (-not([string]($_.AlternativeSecurityIds)).StartsWith("X509:"))}).count
200+
```
201+
202+
#### List all Hybrid Azure AD joined devices
203+
204+
```azurepowershell
205+
Get-MsolDevice -All -IncludeSystemManagedDevices | where {($_.DeviceTrustType -eq 'Domain Joined') -and (([string]($_.AlternativeSecurityIds)).StartsWith("X509:"))}
206+
```
207+
208+
#### List all Hybrid Azure AD joined devices with **Pending** state
209+
210+
```azurepowershell
211+
Get-MsolDevice -All -IncludeSystemManagedDevices | where {($_.DeviceTrustType -eq 'Domain Joined') -and (-not([string]($_.AlternativeSecurityIds)).StartsWith("X509:"))}
212+
```
213+
214+
#### List details of a single device:
215+
216+
1. Enter `get-msoldevice -deviceId <deviceId>` (This is the **DeviceId** obtained locally on the device).
217+
2. Verify that **Enabled** is set to **True**.
175218

176219
## Troubleshoot your implementation
177220

178221
If you experience issues completing hybrid Azure AD join for domain-joined Windows devices, see:
179222

223+
- [Troubleshooting devices using dsregcmd command](https://docs.microsoft.com/azure/active-directory/devices/troubleshoot-device-dsregcmd)
180224
- [Troubleshooting hybrid Azure Active Directory joined devices](troubleshoot-hybrid-join-windows-current.md)
181225
- [Troubleshooting hybrid Azure Active Directory joined down-level devices](troubleshoot-hybrid-join-windows-legacy.md)
182226

articles/active-directory/devices/hybrid-azuread-join-manual.md

Lines changed: 60 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -548,16 +548,71 @@ To register Windows down-level devices, you need to download and install a Windo
548548

549549
## Verify joined devices
550550

551-
You can check for successfully joined devices in your organization by using the [Get-MsolDevice](/powershell/msonline/v1/get-msoldevice) cmdlet in the [Azure Active Directory PowerShell module](/powershell/azure/install-msonlinev1?view=azureadps-2.0).
551+
Here are 3 ways to locate and verify the device state:
552552

553-
The output of this cmdlet shows devices that are registered and joined with Azure AD. To get all devices, use the **-All** parameter, and then filter them by using the **deviceTrustType** property. Domain-joined devices have a value of **Domain Joined**.
553+
### Locally on the device
554+
555+
1. Open Windows PowerShell.
556+
2. Enter `dsregcmd /status`.
557+
3. Verify that both **AzureAdJoined** and **DomainJoined** are set to **YES**.
558+
4. You can use the **DeviceId** and compare the status on the service using either the Azure portal or PowerShell.
559+
560+
### Using the Azure portal
561+
562+
1. Go to the devices page using a [direct link](https://portal.azure.com/#blade/Microsoft_AAD_IAM/DevicesMenuBlade/Devices).
563+
2. Information on how to locate a device can be found in [How to manage device identities using the Azure portal](https://docs.microsoft.com/azure/active-directory/devices/device-management-azure-portal#locate-devices).
564+
3. If the **Registered** column says **Pending**, then Hybrid Azure AD Join has not completed. In federated environments, this can happen only if it failed to register and AAD connect is configured to sync the devices.
565+
4. If the **Registered** column contains a **date/time**, then Hybrid Azure AD Join has completed.
566+
567+
### Using PowerShell
568+
569+
Verify the device registration state in your Azure tenant by using **[Get-MsolDevice](/powershell/msonline/v1/get-msoldevice)**. This cmdlet is in the [Azure Active Directory PowerShell module](/powershell/azure/install-msonlinev1?view=azureadps-2.0).
570+
571+
When you use the **Get-MSolDevice** cmdlet to check the service details:
572+
573+
- An object with the **device ID** that matches the ID on the Windows client must exist.
574+
- The value for **DeviceTrustType** is **Domain Joined**. This setting is equivalent to the **Hybrid Azure AD joined** state on the **Devices** page in the Azure AD portal.
575+
- For devices that are used in Conditional Access, the value for **Enabled** is **True** and **DeviceTrustLevel** is **Managed**.
576+
577+
1. Open Windows PowerShell as an administrator.
578+
2. Enter `Connect-MsolService` to connect to your Azure tenant.
579+
580+
#### Count all Hybrid Azure AD joined devices (excluding **Pending** state)
581+
582+
```azurepowershell
583+
(Get-MsolDevice -All -IncludeSystemManagedDevices | where {($_.DeviceTrustType -eq 'Domain Joined') -and (([string]($_.AlternativeSecurityIds)).StartsWith("X509:"))}).count
584+
```
585+
586+
#### Count all Hybrid Azure AD joined devices with **Pending** state
587+
588+
```azurepowershell
589+
(Get-MsolDevice -All -IncludeSystemManagedDevices | where {($_.DeviceTrustType -eq 'Domain Joined') -and (-not([string]($_.AlternativeSecurityIds)).StartsWith("X509:"))}).count
590+
```
591+
592+
#### List all Hybrid Azure AD joined devices
593+
594+
```azurepowershell
595+
Get-MsolDevice -All -IncludeSystemManagedDevices | where {($_.DeviceTrustType -eq 'Domain Joined') -and (([string]($_.AlternativeSecurityIds)).StartsWith("X509:"))}
596+
```
597+
598+
#### List all Hybrid Azure AD joined devices with **Pending** state
599+
600+
```azurepowershell
601+
Get-MsolDevice -All -IncludeSystemManagedDevices | where {($_.DeviceTrustType -eq 'Domain Joined') -and (-not([string]($_.AlternativeSecurityIds)).StartsWith("X509:"))}
602+
```
603+
604+
#### List details of a single device:
605+
606+
1. Enter `get-msoldevice -deviceId <deviceId>` (This is the **DeviceId** obtained locally on the device).
607+
2. Verify that **Enabled** is set to **True**.
554608

555609
## Troubleshoot your implementation
556610

557-
If you're experiencing issues with completing hybrid Azure AD join for domain-joined Windows devices, see:
611+
If you experience issues completing hybrid Azure AD join for domain-joined Windows devices, see:
558612

559-
* [Troubleshooting Hybrid Azure AD join for Windows current devices](troubleshoot-hybrid-join-windows-current.md)
560-
* [Troubleshooting Hybrid Azure AD join for Windows down-level devices](troubleshoot-hybrid-join-windows-legacy.md)
613+
- [Troubleshooting devices using dsregcmd command](https://docs.microsoft.com/azure/active-directory/devices/troubleshoot-device-dsregcmd)
614+
- [Troubleshooting hybrid Azure Active Directory joined devices](troubleshoot-hybrid-join-windows-current.md)
615+
- [Troubleshooting hybrid Azure Active Directory joined down-level devices](troubleshoot-hybrid-join-windows-legacy.md)
561616

562617
## Next steps
563618

0 commit comments

Comments
 (0)