Skip to content

Commit d40cf58

Browse files
authored
Merge pull request #7009 from MicrosoftDocs/main
pushing to live
2 parents a11fd47 + 554268d commit d40cf58

File tree

7 files changed

+35
-27
lines changed

7 files changed

+35
-27
lines changed

powerapps-docs/maker/canvas-apps/controls/control-new-barcode-scanner.md

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ contributors:
1919
---
2020
# Barcode scanner control in Power Apps
2121

22-
Scans barcodes, QR codes, and data-matrix codes on an Android or iOS device.
22+
Scans barcodes, QR codes, and data-matrix codes on an Android, iOS, and Windows device.
2323

2424
## Description
2525

26-
The control opens a native scanner on an Android or iOS device. The scanner automatically detects a barcode, a QR code, or a data-matrix code when in view. The control doesn't support scanning in a web browser.
26+
The control opens a native scanner on an Android, iOS, and Windows device. The scanner automatically detects a barcode, a QR code, or a data-matrix code when in view. The control doesn't support scanning in a web browser.
2727

2828
> [!NOTE]
29-
> The barcode scanner control is only supported on Android and iOS devices. All other platforms will show a warning that some features of the app won't work.
29+
> The barcode scanner control is supported on an Android, iOS, and Windows device. All other platforms will show a warning that some features of the app won't work.
3030
3131
## Key properties
3232

@@ -80,24 +80,28 @@ The same guidelines for the **[Button](control-button.md)** control apply to the
8080

8181
## Barcode Availability by Device
8282

83-
| Barcode Type | Android | iOS |
84-
|--------------|:-------:|:---:|
85-
|QR_CODE|||
86-
|DATA_MATRIX|||
87-
|UPC_A|||
88-
|UPC_E|||
89-
|EAN_8|||
90-
|EAN_13|||
91-
|CODE_39|||
92-
|CODE_93|||
93-
|CODE_128|||
94-
|CODABAR|||
95-
|ITF|||
96-
|RSS14|||
97-
|PDF_417|||
98-
|RSS_EXPANDED|||
99-
|MSI|||
100-
|AZTEC|||
83+
| Barcode Type | Android | iOS | Windows |
84+
|--------------|:-------:|:---:|:---:|
85+
|QR_CODE||||
86+
|DATA_MATRIX||||
87+
|UPC_A||||
88+
|UPC_E||||
89+
|EAN_8||||
90+
|EAN_13||||
91+
|CODE_39||||
92+
|CODE_93||||
93+
|CODE_128||||
94+
|CODABAR||||
95+
|Databar Omnidirectional||||
96+
|Databar Stacked||||
97+
|GS1-DWCode||||
98+
|ITF||||
99+
|Interleaved 2 of 5||||
100+
|RSS14||||
101+
|PDF_417||||
102+
|RSS_EXPANDED||||
103+
|MSI||||
104+
|AZTEC||||
101105

102106
> [!NOTE]
103107
> PDF_417 and AZTEC aren't supported in Auto mode.

powerapps-docs/maker/common/virtual-agent.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ In [Power Apps studio](../canvas-apps/power-apps-studio.md), select **Ask virtua
6767
> [!div class="mx-imgBorder"]
6868
> ![Still need help.](media/bot/virtual-agent-3.png)
6969
70-
If you still need more help, select **No** to the question, **Did this solve your problem?** The virtual agent will search for answers in the community and blogs to enhance your search.
70+
If you still need help, select **No** to: **Did this solve your problem?** The virtual agent will search for answers in the community and blogs to enhance your search.
7171

7272
## Restart or close a session
7373

powerapps-docs/maker/common/wrap/how-to.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -258,13 +258,17 @@ Takes you to the app settings. Also available using the shake gesture. Can't be
258258
259259
Follow these steps to configure KeyVault URI:
260260
261-
1. Sign in to your tenent as an admin and [create an Azure service principal](/powershell/azure/create-azure-service-principal-azureps?#create-a-service-principal) for 1P AAD application: 4e1f8dc5-5a42-45ce-a096-700fa485ba20 (WrapKeyVaultAccessApp)
261+
1. Sign in to your tenent as an admin and create an Azure service principal for 1P AAD application: 4e1f8dc5-5a42-45ce-a096-700fa485ba20 (WrapKeyVaultAccessApp) by running the following script: <br>
262+
`Connect-AzureAD -TenantId <your tenant ID> New-AzureADServicePrincipal -AppId 4e1f8dc5-5a42-45ce-a096-700fa485ba20 -DisplayName "Wrap KeyVault Access App"`
262263
263-
2. Add a role to the service principal listed above in the subscription where the Key Vault is going to exist. For more information, see [Steps to assign an Azure role](/azure/key-vault/general/quick-create-portal).
264+
2. Add a role to the service principal listed above in the subscription where the Key Vault is going to exist. For detailed steps, see [Assign a user as an administrator of an Azure subscription](/azure/role-based-access-control/role-assignments-portal-subscription-admin). Note: In step 3, you may choose Contributor, as only a minimal role is required to access the Key vault.
264265
265-
3. Create or access existing keyvault: [Create a key vault using the Azure portal](/azure/key-vault/general/quick-create-portal)
266+
3. Create or access existing key vault: [Create a key vault using the Azure portal](/azure/key-vault/general/quick-create-portal)
267+
4. Add access policies for the key vault.
266268
267-
4. Depending on your device, do one of following:
269+
:::image type="content" source="media/wrap-canvas-app/wrap-keyvault.gif" alt-text="Add access policies for the key vault.":::
270+
271+
5. Depending on your device, do one of following:
268272
- For Android, create the .pfx file upload it to the keyvault certificate section. More information: [Generate keys](code-sign-android.md#generate-keys)
269273
270274
:::image type="content" source="media/wrap-canvas-app/wrap-1.png" alt-text="Create a cert for Android.":::
@@ -283,7 +287,7 @@ Follow these steps to configure KeyVault URI:
283287
284288
:::image type="content" source="media/wrap-canvas-app/wrap-2.png" alt-text="Create a cert for iOS.":::
285289
286-
5. Once iOS or Android certificates are created and uploaded, add three tags with the name as the bundle id, and the value corresponding to the name of the uploaded certificate(s).
290+
6. Once iOS or Android certificates are created and uploaded, add three tags with the name as the bundle id, and the value corresponding to the name of the uploaded certificate(s).
287291
288292
:::image type="content" source="media/wrap-canvas-app/wrap-3.png" alt-text="Add tags.":::
289293
-24.7 KB
Binary file not shown.
-23.9 KB
Binary file not shown.
-44.2 KB
Binary file not shown.
Loading

0 commit comments

Comments
 (0)