Skip to content

Commit e8b12f8

Browse files
authored
Merge pull request #249316 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 ab1a682 + 00638b5 commit e8b12f8

File tree

8 files changed

+18
-20
lines changed

8 files changed

+18
-20
lines changed

articles/active-directory/develop/msal-net-user-gets-consent-for-multiple-resources.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.custom: devx-track-csharp, aaddev, devx-track-dotnet
1717
---
1818

1919
# User gets consent for several resources using MSAL.NET
20-
The Microsoft identity platform does not allow you to get a token for several resources at once. When using the Microsoft Authentication Library for .NET (MSAL.NET), the scopes parameter in the acquire token method should only contain scopes for a single resource. However, you can pre-consent to several resources upfront by specifying additional scopes using the `.WithExtraScopeToConsent` builder method.
20+
The Microsoft identity platform does not allow you to get a token for several resources at once. When using the Microsoft Authentication Library for .NET (MSAL.NET), the *scopes* parameter in the acquire token method should only contain scopes for a single resource. However, you can pre-consent to several resources upfront by specifying additional scopes using the `.WithExtraScopesToConsent` builder method.
2121

2222
> [!NOTE]
2323
> Getting consent for several resources works for Microsoft identity platform, but not for Azure AD B2C. Azure AD B2C supports only admin consent, not user consent.
@@ -27,7 +27,7 @@ For example, if you have two resources that have 2 scopes each:
2727
- https:\//mytenant.onmicrosoft.com/customerapi (with 2 scopes `customer.read` and `customer.write`)
2828
- https:\//mytenant.onmicrosoft.com/vendorapi (with 2 scopes `vendor.read` and `vendor.write`)
2929

30-
You should use the `.WithExtraScopeToConsent` modifier which has the *extraScopesToConsent* parameter as shown in the following example:
30+
You should use the `.WithExtraScopesToConsent` method which has the *extraScopesToConsent* parameter as shown in the following example:
3131

3232
```csharp
3333
string[] scopesForCustomerApi = new string[]
@@ -44,12 +44,12 @@ string[] scopesForVendorApi = new string[]
4444
var accounts = await app.GetAccountsAsync();
4545
var result = await app.AcquireTokenInteractive(scopesForCustomerApi)
4646
.WithAccount(accounts.FirstOrDefault())
47-
.WithExtraScopeToConsent(scopesForVendorApi)
47+
.WithExtraScopesToConsent(scopesForVendorApi)
4848
.ExecuteAsync();
4949
```
5050

51-
This will get you an access token for the first web API. Then, to access the second web API you can silently acquire the token from the token cache:
51+
`AcquireTokenInteractive` will return an access token for the first web API. Along with that access token, a refresh token will also be retrieved from Azure AD and cached. Then, to access the second web API, you can silently acquire the token using `AcquireTokenSilent`. MSAL will use the cached refresh token to retrieve from Azure AD the access token for the second web API.
5252

5353
```csharp
54-
AcquireTokenSilent(scopesForVendorApi, accounts.FirstOrDefault()).ExecuteAsync();
54+
var result = await AcquireTokenSilent(scopesForVendorApi, accounts.FirstOrDefault()).ExecuteAsync();
5555
```

articles/active-directory/verifiable-credentials/admin-api.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -924,6 +924,7 @@ If the property `customStatusEndpoint` property isn't specified, then the `anony
924924
| -------- | -------- | -------- |
925925
| `url` | string (url)| the url of the custom status endpoint |
926926
| `type` | string | the type of the endpoint |
927+
927928
example:
928929

929930
```

articles/active-directory/verifiable-credentials/how-use-vcnetwork.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ To use the Entra Verified ID Network, you need to have completed the following.
2626

2727
## What is the Entra Verified ID Network?
2828

29-
In our scenario, Proseware is a verifier. Woodgrove is the issuer. The verifier needs to know Woodgrove's issuer DID and the verifiable credential (VC) type that represents Woodgrove employees before it can create a presentation request for a verified credential for Woodgrove employees. The necessary information may come from some kind of manual exchange between the companies, but this approach would be both a manual and a complex. The Entra Verified ID Network makes this process much easier. Woodgrove, as an issuer, can publish credential types to the Entra Verified ID Network and Proseware, as the verifier, can search for published credential types and schemas in the Entra Verified ID Network. Using this information, Woodgrove can create a [presentation request](presentation-request-api.md#presentation-request-payload) and easily invoke the Request Service API.
29+
In our scenario, Proseware is a verifier. Woodgrove is the issuer. The verifier needs to know Woodgrove's issuer DID and the verifiable credential (VC) type that represents Woodgrove employees before it can create a presentation request for a verified credential for Woodgrove employees. The necessary information may come from some kind of manual exchange between the companies, but this approach would be both manual and complex. The Entra Verified ID Network makes this process much easier. Woodgrove, as an issuer, can publish credential types to the Entra Verified ID Network and Proseware, as the verifier, can search for published credential types and schemas in the Entra Verified ID Network. Using this information, Woodgrove can create a [presentation request](presentation-request-api.md#presentation-request-payload) and easily invoke the Request Service API.
3030

3131
:::image type="content" source="media/decentralized-identifier-overview/did-overview.png" alt-text="Diagram of Microsoft DID implementation overview.":::
3232

articles/azure-vmware/ecosystem-external-storage-solutions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ For more information, see the following resources:
2727

2828
- [Azure VMware Solution + CBS Implementation Guide](https://support.purestorage.com/Pure_Cloud_Block_Store/Azure_VMware_Solution_and_Cloud_Block_Store_Implementation_Guide)
2929
- [CBS Deployment Guide](https://support.purestorage.com/Pure_Cloud_Block_Store/Pure_Cloud_Block_Store_on_Azure_Implementation_Guide)
30-
- [Troubleshooting Guide](https://support.purestorage.com/Pure_Cloud_Block_Store/Pure_Cloud_Block_Store_on_Azure_Implementation_Guide)
31-
- [Videos](https://support.purestorage.com/Pure_Cloud_Block_Store/Azure_VMware_Solution_and_Cloud_Block_Store_Video_Demos)
30+
- [Troubleshooting CBS Deployment](https://support.purestorage.com/Pure_Cloud_Block_Store/Pure_Cloud_Block_Store_on_Azure_-_Troubleshooting_Guide)
31+
- [Videos](https://support.purestorage.com/Pure_Cloud_Block_Store/Azure_VMware_Solution_and_Cloud_Block_Store_Video_Demos)

articles/static-web-apps/application-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ In a terminal or command line, execute the following command to delete a setting
115115
## Next steps
116116

117117
> [!div class="nextstepaction"]
118-
> [Define configuration for Azure Static Web Apps in the _staticwebapp.config.json_ file](configuration.md)
118+
> [Define configuration for Azure Static Web Apps in the _staticwebapp.config.json_ file](configuration.md)
119119
120120
## Related articles
121121

articles/virtual-machines/enable-nvme-faqs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ sections:
243243
- question: |
244244
How can I identify NVMe disks on windows VM?
245245
answer: |
246-
Launch PowerShell and use the following command: `wmic disk drive get model,scsilogicalunit`
246+
Launch PowerShell and use the following command: `wmic diskdrive get model,scsilogicalunit`
247247
248248
:::image type="content" source="./media/enable-nvme/nvme-faq-7.png" alt-text="Screenshot of an example of Powershell command example to launch NVMe on Windows.":::
249249

articles/virtual-machines/extensions/key-vault-linux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ The following JSON shows the schema for the Key Vault VM extension. The extensio
124124
| pollingIntervalInS | 3600 | string |
125125
| certificateStoreName | It is ignored on Linux | string |
126126
| linkOnRenewal | false | boolean |
127-
| certificateStoreLocation | /var/lib/waagent/Microsoft.Azure.KeyVault | string |
127+
| certificateStoreLocation | /var/lib/waagent/Microsoft.Azure.KeyVault.Store | string |
128128
| requireInitialSync | true | boolean |
129129
| observedCertificates | ["https://myvault.vault.azure.net/secrets/mycertificate", "https://myvault.vault.azure.net/secrets/mycertificate2"] | string array
130130
| msiEndpoint | http://169.254.169.254/metadata/identity | string |

articles/virtual-machines/image-version.md

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -365,22 +365,19 @@ $targetSubID = "<subscription ID for the target>"
365365
$sourceTenantID = "<tenant ID where for the source image>"
366366
$sourceImageID = "<resource ID of the source image>"
367367
368-
# Login to the subscription where the new image will be created
369-
Connect-AzAccount -UseDeviceAuthentication -Subscription $targetSubID
370-
371368
# Login to the tenant where the source image is published
372369
Connect-AzAccount -Tenant $sourceTenantID -UseDeviceAuthentication 
373370
374-
# Login to the subscription again where the new image will be created and set the context
371+
# Login to the subscription where the new image will be created and set the context
375372
Connect-AzAccount -UseDeviceAuthentication -Subscription $targetSubID
376373
Set-AzContext -Subscription $targetSubID 
377374
378375
# Create the image version from another image version in a different tenant
379-
New-AzGalleryImageVersion \
380-
-ResourceGroupName myResourceGroup -GalleryName myGallery \
381-
-GalleryImageDefinitionName myImageDef \
382-
-Location "West US 2" \
383-
-Name 1.0.0 \
376+
New-AzGalleryImageVersion `
377+
-ResourceGroupName myResourceGroup -GalleryName myGallery `
378+
-GalleryImageDefinitionName myImageDef `
379+
-Location "West US 2" `
380+
-Name 1.0.0 `
384381
-SourceImageId $sourceImageID
385382
```
386383

0 commit comments

Comments
 (0)