Skip to content

Commit 9df28e1

Browse files
authored
Merge pull request #83741 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 602e6ad + a69f90b commit 9df28e1

File tree

10 files changed

+52
-18
lines changed

10 files changed

+52
-18
lines changed

articles/active-directory/develop/msal-net-migration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ It's also possible in MSAL.NET to access v1.0 resources. See details in [Scopes
5353

5454
- ADAL.NET uses [AuthenticationContext](https://github.com/AzureAD/azure-activedirectory-library-for-dotnet/wiki/AuthenticationContext:-the-connection-to-Azure-AD) as the representation of your connection to the Security Token Service (STS) or authorization server, through an Authority. On the contrary, MSAL.NET is designed around [client applications](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki/Client-Applications). It provides two separate classes: `PublicClientApplication` and `ConfidentialClientApplication`
5555

56-
- Acquiring Tokens: ADAL.NET and MSAL.NET have the same authentication calls (`AcquireTokenAsync` and `AcquireTokenSilentAsync` for ADAL.NET, and `AqquireTokenInteractive` and `AcquireTokenSilent` in MSAL.NET) but with different parameters required. One difference is the fact that, in MSAL.NET, you no longer have to pass in the `ClientID` of your application in every AcquireTokenXX call. Indeed, the `ClientID` is set only once when building the (`IPublicClientApplication` or `IConfidentialClientApplication`).
56+
- Acquiring Tokens: ADAL.NET and MSAL.NET have the same authentication calls (`AcquireTokenAsync` and `AcquireTokenSilentAsync` for ADAL.NET, and `AcquireTokenInteractive` and `AcquireTokenSilent` in MSAL.NET) but with different parameters required. One difference is the fact that, in MSAL.NET, you no longer have to pass in the `ClientID` of your application in every AcquireTokenXX call. Indeed, the `ClientID` is set only once when building the (`IPublicClientApplication` or `IConfidentialClientApplication`).
5757

5858
### IAccount not IUser
5959

@@ -260,4 +260,4 @@ You can also use this method for various integration scenarios where you have a
260260

261261
## Next steps
262262

263-
You can find more information about the scopes in [Scopes, permissions, and consent in the Microsoft identity platform endpoint](v2-permissions-and-consent.md)
263+
You can find more information about the scopes in [Scopes, permissions, and consent in the Microsoft identity platform endpoint](v2-permissions-and-consent.md)

articles/azure-monitor/app/correlation.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,14 @@ It's disabled by default. To enable it, change `ApplicationInsights.config`:
7979

8080
- Under `RequestTrackingTelemetryModule`, add the `EnableW3CHeadersExtraction` element with value set to `true`.
8181
- Under `DependencyTrackingTelemetryModule`, add the `EnableW3CHeadersInjection` element with value set to `true`.
82+
- Add `W3COperationCorrelationTelemetryInitializer` under the `TelemetryInitializers` similar to
83+
84+
```xml
85+
<TelemetryInitializers>
86+
<Add Type="Microsoft.ApplicationInsights.Extensibility.W3C.W3COperationCorrelationTelemetryInitializer, Microsoft.ApplicationInsights"/>
87+
...
88+
</TelemetryInitializers>
89+
```
8290

8391
#### Enable W3C distributed tracing support for ASP.NET Core apps
8492

articles/backup/backup-azure-arm-vms-prepare.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,9 @@ If an NSG manages the VM access, allow outbound access for the backup storage to
222222
4. In **Source port ranges**, enter an asterisk (*) to allow outbound access from any port.
223223
5. In **Destination**, select **Service Tag**. From the list, select **Storage.region**. The region is where the vault, and the VMs that you want to back up, are located.
224224
6. In **Destination port ranges**, select the port.
225-
- Unmanaged VM with unencrypted storage account: 80
226-
- Unmanaged VM with encrypted storage account: 443 (default setting)
227-
- Managed VM: 8443.
225+
- VM using unmanaged disks with unencrypted storage account: 80
226+
- VM using unmanaged disks with encrypted storage account: 443 (default setting)
227+
- VM using managed disks: 8443.
228228
7. In **Protocol**, select **TCP**.
229229
8. In **Priority**, specify a priority value less than any higher deny rules.
230230

articles/cognitive-services/Speech-Service/how-to-custom-speech-test-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ This table lists accepted data types, when each data type should be used, and th
2424
|-----------|-----------------|----------|-------------------|----------|
2525
| [Audio](#audio-data-for-testing) | Yes<br>Used for visual inspection | 5+ audio files | No | N/a |
2626
| [Audio + Human-labeled transcripts](#audio--human-labeled-transcript-data-for-testingtraining) | Yes<br>Used to evaluate accuracy | 0.5 - 5 hours of audio | Yes | 1 - 1,000 hours of audio |
27-
| [Related text](##related-text-data-for-training) | No | N/a | Yes | 1-200 MB of related text |
27+
| [Related text](#related-text-data-for-training) | No | N/a | Yes | 1-200 MB of related text |
2828

2929
Files should be grouped by type into a dataset and uploaded as a zip file. Each dataset can only contain a single data type.
3030

articles/cosmos-db/sql-api-sdk-dotnet-standard.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,25 @@ ms.author: dech
3737
|**Current supported framework**|[Microsoft .NET Standard 2.0](/dotnet/standard/net-standard)|
3838

3939
## Release notes
40+
### <a name="3.1.0"/>3.1.0
41+
#### Added
42+
- [#541](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/541) Added consistency level to client and query options
43+
- [#544](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/544) Added continuation token support for LINQ
44+
- [#557](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/557) Added trigger options to item request options
45+
- [#571](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/571) Added a default JSON.net serializer with optional settings
46+
- [#572](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/572) Added partition key validation on CreateContainerIfNotExistsAsync
47+
- [#581](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/581) Adding LINQ to QueryDefinition API
48+
- [#592](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/592) Added CreateIfNotExistsAsync to container builder
49+
- [#597](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/597) Added continuation token property to ResponseMessage
50+
- [#604](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/604) Added LINQ ToStreamIterator extension method
51+
52+
#### Fixed
53+
- [#548](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/548) Fixed mis-typed message in CosmosException.ToString();
54+
- [#558](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/558) LocationCache ConcurrentDict lock contention fix
55+
- [#561](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/561) GetItemLinqQueryable now works with null query
56+
- [#567](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/567) Query correctly handles different language cultures
57+
- [#574](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/574) Fixed empty error message if query parsing fails from unexpected exception
58+
- [#576](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/576) Query correctly serializes the input into a stream
4059

4160
### <a name="3.0.0"/>3.0.0
4261
* General availability of [Version 3.0.0](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/) of the .NET SDK
@@ -63,8 +82,10 @@ Any requests to Azure Cosmos DB using a retired SDK are rejected by the service.
6382

6483
| Version | Release Date | Retirement Date |
6584
| --- | --- | --- |
85+
| [3.1.0](#3.1.0) |July 29, 2019 |--- |
6686
| [3.0.0](#3.0.0) |July 15, 2019 |--- |
6787

88+
6889
## FAQ
6990
[!INCLUDE [cosmos-db-sdk-faq](../../includes/cosmos-db-sdk-faq.md)]
7091

articles/migrate/migrate-appliance.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Hyper-V VM | Hyper-V VM assessment with the Azure Migrate Assessment tool. | Dow
2828

2929
## Appliance access
3030

31-
After you have configured the appliance, you can remotely access the appliance VM through TCP port 3389. You can also remotely access the web management app for the appliance, on port 44368 with URL: ``` https://<appliance-ip-or-name>:44368 ```.
31+
After you have configured the appliance, you can remotely access the appliance VM through TCP port 3389. You can also remotely access the web management app for the appliance, on port 44368 with URL: `https://<appliance-ip-or-name>:44368`.
3232

3333
## Appliance license
3434
The appliance comes with a Windows Server 2016 evaluation license, which is valid for 180 days. If the evaluation period is close to expiry, we recommend that you download and deploy a new appliance, or that you activate the operating system license of the appliance VM.
@@ -148,7 +148,7 @@ VM version | Msvm_ProcessorSettingData | VirtualQuantity
148148
Memory (bytes) | Msvm_MemorySettingData | VirtualQuantity
149149
Maximum memory that can be consumed by VM | Msvm_MemorySettingData | Limit
150150
Dynamic memory enabled | Msvm_MemorySettingData | DynamicMemoryEnabled
151-
Operating system name/version/FQDN | Msvm_KvpExchangeComponent | GuestIntrinsciExchangeItems Name Data
151+
Operating system name/version/FQDN | Msvm_KvpExchangeComponent | GuestIntrinsicExchangeItems Name Data
152152
VM power status | Msvm_ComputerSystem | EnabledState
153153
**Per disk details** |
154154
Disk identifier | Msvm_VirtualHardDiskSettingData | VirtualDiskId

articles/migrate/tutorial-assess-hyper-v.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,17 @@ Download the zipped VHD template for the appliance.
105105
Check that the zipped file is secure, before you deploy it.
106106

107107
1. On the machine to which you downloaded the file, open an administrator command window.
108-
2. Run the following command to generate the hash for the VHD
109-
- `C:\>CertUtil -HashFile <file_location> [Hashing Algorithm]`
110-
- Example usage: `C:\>CertUtil -HashFile C:\AzureMigrate\AzureMigrate.ova SHA256`
108+
109+
2. Run the following PowerShell command to generate the hash for the ZIP file
110+
- ```C:\>Get-FileHash -Path <file_location> -Algorithm [Hashing Algorithm]```
111+
- Example usage: ```C:\>Get-FileHash -Path ./AzureMigrateAppliance_v1.19.06.27.zip -Algorithm SHA256```
112+
111113
3. For appliance version 1.19.06.27, the generated hash should match these settings.
112114

113115
**Algorithm** | **Hash value**
114116
--- | ---
115-
MD5 | 3681f745fa2b0a0a6910707d85161ec5
116-
SHA256 | e6ca109afab9657bdcfb291c343b3e3abced9a273d25273059171f9954d25832
117+
MD5 | 3681F745FA2B0A0A6910707D85161EC5
118+
SHA256 | E6CA109AFAB9657BDCFB291C343B3E3ABCED9A273D25273059171F9954D25832
117119

118120

119121

articles/site-recovery/migrate-tutorial-aws-azure.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,10 @@ When Azure VMs are created after the migration (failover), they're joined to thi
9393
6. For **Resource group**, select **Use existing**, and then select **migrationRG**.
9494
7. For **Location**, select **West Europe**.
9595
8. Under **Subnet**, leave the default values for **Name** and **IP range**.
96-
9. Leave the **Service Endpoints** option disabled.
97-
10. When you're done, select **Create**.
96+
9. Add instructions for DDoS protection settings.
97+
10. Leave the **Service Endpoints** option disabled.
98+
11. Add instructions for Firewall settings.
99+
12. When you're done, select **Create**.
98100

99101
## Prepare the infrastructure
100102

@@ -154,7 +156,7 @@ In this section, you enter information about the resources that you created in [
154156

155157
Before you can enable replication, you must create a replication policy.
156158

157-
1. Select **Replicate and Associate**.
159+
1. Select **Create and Associate**.
158160
2. In **Name**, enter **myReplicationPolicy**.
159161
3. Leave the rest of the default settings, and then select **OK** to create the policy. The new policy is automatically associated with the configuration server.
160162

articles/storage/files/storage-files-planning.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Currently, you cannot directly convert between a standard file share and a premi
9393
> [!IMPORTANT]
9494
> Premium file shares are only available with LRS and are available in most regions that offer storage accounts. To find out if premium file shares are currently available in your region, see the [products available by region](https://azure.microsoft.com/global-infrastructure/services/?products=storage) page for Azure.
9595
96-
### Provisioned shares
96+
#### Provisioned shares
9797
9898
Premium file shares are provisioned based on a fixed GiB/IOPS/throughput ratio. For each GiB provisioned, the share will be issued one IOPS and 0.1 MiB/s throughput up to the max limits per share. The minimum allowed provisioning is 100 GiB with min IOPS/throughput.
9999
@@ -130,7 +130,7 @@ The following table illustrates a few examples of these formulae for the provisi
130130
> [!NOTE]
131131
> File shares performance is subject to machine network limits, available network bandwidth, IO sizes, parallelism, among many other factors. To achieve maximum performance scale, spread the load across multiple VMs. Please refer [troubleshooting guide](storage-troubleshooting-files-performance.md) for some common performance issues and workarounds.
132132
133-
### Bursting
133+
#### Bursting
134134
135135
Premium file shares can burst their IOPS up to a factor of three. Bursting is automated and operates based on a credit system. Bursting works on a best effort basis and the burst limit is not a guarantee, file shares can burst *up to* the limit.
136136

includes/virtual-machines-image-builder-overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ AIB will support Azure Marketplace base OS images:
4343
- Ubuntu 16.04
4444
- RHEL 7.6
4545
- CentOS 7.6
46+
- Windows 10 RS5 Enterprize/Professional/Enterprise for Virtual Desktop (EVD)
4647
- Windows 2016
4748
- Windows 2019
4849

0 commit comments

Comments
 (0)