Skip to content

Commit 6947682

Browse files
authored
Merge pull request #193638 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents e5e079c + 832d570 commit 6947682

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

articles/azure-resource-manager/bicep/key-vault-parameter.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,9 @@ The following procedure shows how to create a role with the minimum permission,
131131
```azurecli-interactive
132132
az role definition create --role-definition "<path-to-role-file>"
133133
az role assignment create \
134-
--role "Key Vault resource manager template deployment operator" \
134+
--role "Key Vault Bicep deployment operator" \
135135
--scope /subscriptions/<Subscription-id>/resourceGroups/<resource-group-name> \
136-
--assignee <user-principal-name> \
137-
--resource-group ExampleGroup
136+
--assignee <user-principal-name>
138137
```
139138

140139
# [PowerShell](#tab/azure-powershell)

articles/load-testing/how-to-parameterize-load-tests.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ To specify an environment variable to the load test by using the Azure portal, d
265265

266266
If you run your load test in a CI/CD workflow, you can define environment variables in the YAML test configuration file. For more information about the syntax, see the [Test configuration YAML reference](./reference-test-config-yaml.md).
267267

268-
Alternatively, you can directly specify environment variables in the CI/CD workflow definition. You use input parameters for the GitHub Action or Azure Pipelines task to pass environment variables to the Apache JMeter script.
268+
Alternatively, you can directly specify environment variables in the CI/CD workflow definition. You use input parameters for the Azure Load Testing action or Azure Pipelines task to pass environment variables to the Apache JMeter script.
269269

270270
The following YAML snippet shows a GitHub Actions example:
271271

@@ -311,7 +311,7 @@ No. The Azure Load Testing service doesn't store the values of secrets. When you
311311

312312
### What happens if I have parameters in both my YAML configuration file and the CI/CD workflow?
313313

314-
If a parameter exists in both the YAML configuration file and the Azure Pipelines task or GitHub Action, the Azure Pipelines task or GitHub Action value will be used for the test run.
314+
If a parameter exists in both the YAML configuration file and the Azure Load Testing action or Azure Pipelines task, the value from the CI/CD workflow will be used for the test run.
315315

316316
### I created and ran a test from my CI/CD workflow by passing parameters using the Azure Load Testing task or action. Can I run this test from the Azure portal with the same parameters?
317317

articles/virtual-desktop/user-documentation/connect-microsoft-store.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ To subscribe to a workspace:
3333
- If you're using a Workspace URL, use the URL your admin gave you.
3434
- If you're connecting from Azure Virtual Desktop, use one of the following URLs depending on which version of the service you're using:
3535
- Azure Virtual Desktop (classic): `https://rdweb.wvd.microsoft.com/api/feeddiscovery/webfeeddiscovery.aspx`.
36-
- Azure Virtual Desktop: `https://rdweb.wvd.microsoft.com/api/arm/feeddiscovery`.
36+
- Azure Virtual Desktop: `https://rdweb.wvd.microsoft.com/arm/webclient/index.html`.
3737

3838
3. Tap **Subscribe**.
3939
4. Provide your credentials when prompted.
@@ -43,4 +43,4 @@ Workspaces may be added, changed, or removed based on changes made by your admin
4343

4444
## Next steps
4545

46-
To learn more about how to use the Microsoft Store client, check out [Get started with the Microsoft Store client](/windows-server/remote/remote-desktop-services/clients/windows/).
46+
To learn more about how to use the Microsoft Store client, check out [Get started with the Microsoft Store client](/windows-server/remote/remote-desktop-services/clients/windows/).

0 commit comments

Comments
 (0)