Skip to content

Commit e0d2304

Browse files
authored
Merge pull request #186846 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 232bbe2 + 9eb7d99 commit e0d2304

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ services.Configure<MsalDistributedTokenCacheAdapterOptions>(options =>
116116
// Then, choose your implementation of distributed cache
117117
// -----------------------------------------------------
118118
119-
// For instance, the distributed in-memory cache (not cleared when you stop the app)
119+
// good for prototyping and testing, but this is NOT persisted and it is NOT distributed - do not use in production
120120
services.AddDistributedMemoryCache();
121121

122122
// Or a Redis cache
@@ -163,10 +163,10 @@ services.AddCosmosCache((CosmosCacheOptions cacheOptions) =>
163163
```
164164

165165
For more information, see:
166-
- [Difference between in-memory and distributed in memory caches](https://github.com/AzureAD/microsoft-identity-web/wiki/token-cache-serialization#inmemory-vs-distributedmemory-cache-options)
167166
- [Distributed cache advanced options](https://github.com/AzureAD/microsoft-identity-web/wiki/L1-Cache-in-Distributed-(L2)-Token-Cache)
168167
- [Handle L2 cache eviction](https://github.com/AzureAD/microsoft-identity-web/wiki/Handle-L2-cache-eviction)
169168
- [Set up a Redis cache in Docker](https://github.com/AzureAD/microsoft-identity-web/wiki/Set-up-a-Redis-cache-in-Docker)
169+
- [Troubleshooting](https://github.com/AzureAD/microsoft-identity-web/wiki/Token-Cache-Troubleshooting)
170170
171171
The usage of distributed cache is featured in the [ASP.NET Core web app tutorial](/aspnet/core/tutorials/first-mvc-app/) in the [phase 2-2 token cache](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/tree/master/2-WebApp-graph-user/2-2-TokenCache).
172172
@@ -276,7 +276,6 @@ You can also specify options to limit the size of the in-memory token cache:
276276
);
277277
```
278278

279-
280279
#### Distributed caches
281280

282281
If you use `app.AddDistributedTokenCache`, the token cache is an adapter against the .NET `IDistributedCache` implementation. So you can choose between a distributed memory cache, a SQL Server cache, a Redis cache, or an Azure Cosmos DB cache. For details about the `IDistributedCache` implementations, see [Distributed memory cache](/aspnet/core/performance/caching/distributed).
@@ -386,10 +385,10 @@ Here's the code for an Azure Cosmos DB cache:
386385

387386
For more information about distributed caches, see:
388387

389-
- [Difference between in-memory and distributed in-memory caches](https://github.com/AzureAD/microsoft-identity-web/wiki/token-cache-serialization#inmemory-vs-distributedmemory-cache-options)
390388
- [Distributed cache advanced options](https://github.com/AzureAD/microsoft-identity-web/wiki/L1-Cache-in-Distributed-(L2)-Token-Cache)
391389
- [Handle L2 cache eviction](https://github.com/AzureAD/microsoft-identity-web/wiki/Handle-L2-cache-eviction)
392390
- [Set up a Redis cache in Docker](https://github.com/AzureAD/microsoft-identity-web/wiki/Set-up-a-Redis-cache-in-Docker)
391+
- [Troubleshooting](https://github.com/AzureAD/microsoft-identity-web/wiki/Token-Cache-Troubleshooting)
393392
394393
### Disabling a legacy token cache
395394

articles/active-directory/develop/scenario-daemon-app-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Daemon applications use application permissions rather than delegated permission
3131

3232
The authority specified in the application configuration should be tenanted (specifying a tenant ID or a domain name associated with your organization).
3333

34-
Even if want to provide a multitenant tool, you should use a tenant ID or domain name, and **not** `common` or `organizations` with this flow, because the service cannot reliably infer which tenant should be used.
34+
Even if you want to provide a multitenant tool, you should use a tenant ID or domain name, and **not** `common` or `organizations` with this flow, because the service cannot reliably infer which tenant should be used.
3535

3636
## Configure and instantiate the application
3737

articles/active-directory/develop/tutorial-v2-nodejs-desktop.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ Create a folder to host your application, for example *ElectronDesktopApp*.
153153
width: 800,
154154
height: 600,
155155
webPreferences: {
156-
nodeIntegration: true
156+
nodeIntegration: true,
157+
contextIsolation: false
157158
}
158159
});
159160

articles/azure-resource-manager/management/resources-without-resource-group-limit.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Some resources have a limit on the number instances per region. This limit is di
4343
* snapshots
4444
* virtualMachineScaleSets - By default, limited to 800 instances. That limit can be increased by contacting support.
4545
* virtualMachines
46+
* virtualMachines/extensions - Supports an unlimited number of VM extension instances.
4647

4748
## Microsoft.ContainerInstance
4849

@@ -108,8 +109,8 @@ Some resources have a limit on the number instances per region. This limit is di
108109

109110
## Microsoft.HybridCompute
110111

111-
* machines - supports up to 5,000 instances
112-
* machines/extensions - supports an unlimited number of VM extension instances
112+
* machines - Supports up to 5,000 instances.
113+
* machines/extensions - Supports an unlimited number of VM extension instances.
113114

114115
## microsoft.insights
115116

articles/migrate/hyper-v-migration-architecture.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ You can limit the amount of bandwidth used to upload data to Azure on each Hyper
7070
2. Run **C:\Program Files\Microsoft Azure Recovery Services Agent\bin\wabadmin.msc**, to open the Windows Azure Backup MMC snap-in.
7171
3. In the snap-in, select **Change Properties**.
7272
4. In **Throttling**, select **Enable internet bandwidth usage throttling for backup operations**. Set the limits for work and non-work hours. Valid ranges are from 512 Kbps to 1,023 Mbps.
73-
I
7473

7574
### Influence upload efficiency
7675

0 commit comments

Comments
 (0)