Skip to content

Commit a7729cc

Browse files
authored
Merge pull request #180231 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 20f627a + 80c1f4f commit a7729cc

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

articles/active-directory/develop/msal-net-token-cache-serialization.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ The recommendation is:
3232
- Otherwise, if you want to use an in-memory cache
3333
- If you're only using `AcquireTokenForClient`:
3434
- Either reuse the confidential client application instance and don’t add a serializer,
35-
- Or new-up a new confidential client application and enable the [shared cache option](msal-net-token-cache-serialization.md?tabs=aspnet#no-token-cache-serialization) . This cache is faster as it's not serialized, however, the memory will grow as tokens are cached. The number of tokens is equal to the number of tenants times the number of downstream APIs. An app token is about 2KB in size. It's great for development, or if you have few users. If you need eviction, see next bullet point.
35+
- Or new-up a new confidential client application and enable the [shared cache option](msal-net-token-cache-serialization.md?tabs=aspnet#no-token-cache-serialization). This cache is faster as it's not serialized, however, the memory will grow as tokens are cached. The number of tokens is equal to the number of tenants times the number of downstream APIs. An app token is about 2KB in size. It's great for development, or if you have few users. If you need eviction, see next bullet point.
3636
- If you want to use an in-memory token cache and control its size and eviction policies, use the [Microsoft.Identity.Web in memory cache option](msal-net-token-cache-serialization.md?tabs=aspnet#in-memory-token-cache-1)
3737
- If you build an SDK and want to write your own token cache serializer for confidential client applications, inherit from [Microsoft.Identity.Web.MsalAsbtractTokenCacheProvider](https://github.com/AzureAD/microsoft-identity-web/blob/master/src/Microsoft.Identity.Web.TokenCache/MsalAbstractTokenCacheProvider.cs) and override the `WriteCacheBytesAsync` and `ReadCacheBytesAsync` methods.
3838

@@ -230,9 +230,10 @@ public static async Task<AuthenticationResult> GetTokenAsync(string clientId, X5
230230

231231
Instead of `app.AddInMemoryTokenCache();` you can use different caching serialization technologies, including no serialization, in memory, and distributed token cache storage provided by .NET.
232232

233-
#### No token cache serialization
233+
<a id="no-token-cache-serialization"></a>
234+
#### Token cache without serialization
234235

235-
You can specify that you don't want to have any token cache serialization (using the MSAL.NET internal cache), if you:
236+
You can specify that you don't want to have any token cache serialization and instead rely on the MSAL.NET internal cache:
236237
- Use `.WithCacheOptions(CacheOptions.EnableSharedCacheOptions)` when you build the application.
237238
- Don't add any serializer.
238239

@@ -247,6 +248,8 @@ You can specify that you don't want to have any token cache serialization (using
247248
.Build();
248249
```
249250

251+
`WithCacheOptions(CacheOptions.EnableSharedCacheOptions)` makes the internal MSAL token cache shared between different MSAL client application instances. Sharing a token cache is faster than using any token cache serialization, but the internal in-memory token cache doesn't have eviction policies. Existing tokens will be refreshed in place, but fetching tokens for different users, tenants, and resources makes the cache grow accordingly. If you use this approach and have a large number of users or tenants, make sure you monitor the memory footprint. If the memory footprint becomes an issue, consider enabling token cache serialization, which might reduce the internal cache size. Also be aware that currently, you can't use shared cache and cache serialization together.
252+
250253
#### In memory token cache
251254

252255
In memory token cache serialization is great in samples. It's also good in production applications if you only request app tokens (`AcquireTokenForClient`), provided you don't mind if the token cache is lost when the web app is restarted. It's not recommended in production if you request user tokens (`AcquireTokenByAuthorizationCode`, `AcquireTokenSilent`, `AcquireTokenOnBehalfOf`)

articles/active-directory/hybrid/plan-hybrid-identity-design-considerations-identity-adoption-strategy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ The following table helps in determining the advantages and disadvantages of eac
5555
### Client experience
5656
The strategy that you use will dictate the user sign-in experience. The following tables provide you with information on what the users should expect their sign-in experience to be. Not all federated identity providers support SSO in all scenarios.
5757

58-
**Doman-joined and private network applications**:
58+
**Domain-joined and private network applications**:
5959

6060
| Application | Synchronized Identity | Federated Identity |
6161
| --- | --- | --- |

articles/cognitive-services/QnAMaker/Concepts/confidence-score.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ When choosing your threshold, keep in mind the balance between Accuracy and Cove
5252
5353
## Set threshold
5454

55-
Set the threshold score as a property of the [GenerateAnswer API JSON body](../how-to/metadata-generateanswer-usage.md#generateanswer-request-configuration). This means you set it for each call to GenerateAnswer.
55+
Set the threshold score as a property of the [GenerateAnswer API JSON body](../How-To/metadata-generateanswer-usage.md#generateanswer-request-configuration). This means you set it for each call to GenerateAnswer.
5656

57-
From the bot framework, set the score as part of the options object with [C#](../how-to/metadata-generateanswer-usage.md?#use-qna-maker-with-a-bot-in-c) or [Node.js](../how-to/metadata-generateanswer-usage.md?#use-qna-maker-with-a-bot-in-nodejs).
57+
From the bot framework, set the score as part of the options object with [C#](../How-To/metadata-generateanswer-usage.md?#use-qna-maker-with-a-bot-in-c) or [Node.js](../How-To/metadata-generateanswer-usage.md?#use-qna-maker-with-a-bot-in-nodejs).
5858

5959
## Improve confidence scores
6060
To improve the confidence score of a particular response to a user query, you can add the user query to the knowledge base as an alternate question on that response. You can also use case-insensitive [word alterations](/rest/api/cognitiveservices/qnamaker/alterations/replace) to add synonyms to keywords in your KB.
@@ -71,7 +71,7 @@ The test index holds all the QnA pairs of your knowledge bases. When querying th
7171
* organize your knowledge base using one of the following:
7272
* 1 resource restricted to 1 KB: restrict your single QnA resource (and the resulting Azure Cognitive Search test index) to a single knowledge base.
7373
* 2 resources - 1 for test, 1 for production: have two QnA Maker resources, using one for testing (with its own test and production indexes) and one for product (also having its own test and production indexes)
74-
* and, always use the same parameters, such as **[top](../how-to/improve-knowledge-base.md#use-the-top-property-in-the-generateanswer-request-to-get-several-matching-answers)** when querying both your test and production knowledge base
74+
* and, always use the same parameters, such as **[top](../How-To/improve-knowledge-base.md#use-the-top-property-in-the-generateanswer-request-to-get-several-matching-answers)** when querying both your test and production knowledge base
7575

7676
When you publish a knowledge base, the question and answer contents of your knowledge base moves from the test index to a production index in Azure search. See how the [publish](../Quickstarts/create-publish-knowledge-base.md#publish-the-knowledge-base) operation works.
7777

articles/virtual-desktop/screen-capture-protection.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ Suppose the user attempts to use an unsupported client to connect to the protect
2727

2828
1. To configure screen capture protection, you need to install administrative templates that add rules and settings for Azure Virtual Desktop.
2929
2. Download the [Azure Virtual Desktop policy templates file](https://aka.ms/avdgpo) (AVDGPTemplate.cab) and extract the contents of the cab file and zip archive.
30-
3. Copy the *terminalserver-avd.admx* file to *%windir%\PolicyDefinitions* folder
31-
4. Copy the *en-us\terminalserver-avd.adml* file to *%windir%\PolicyDefinitions\en-us* folder
30+
3. Copy the **terminalserver-avd.admx** file to **%windir%\PolicyDefinitions** folder.
31+
4. Copy the **en-us\terminalserver-avd.adml** file to **%windir%\PolicyDefinitions\en-us** folder.
3232
5. To confirm the files copied correctly, open the Group Policy Editor and navigate to **Computer Configuration** -> **Administrative Templates** -> **Windows Components** -> **Remote Desktop Services** -> **Remote Desktop Session Host** -> **Azure Virtual Desktop**
3333
6. You should see one or more Azure Virtual Desktop policies, as shown below.
3434

0 commit comments

Comments
 (0)