Skip to content

Commit 0850686

Browse files
authored
Merge pull request #204567 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 b7bc248 + e6d35f2 commit 0850686

12 files changed

+49
-14
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@ services.Configure<MsalDistributedTokenCacheAdapterOptions>(options =>
102102
options.DisableL1Cache = false;
103103

104104
// Or limit the memory (by default, this is 500 MB)
105-
options.L1CacheOptions.SizeLimit = 1024 * 1024 * 1024, // 1 GB
105+
options.L1CacheOptions.SizeLimit = 1024 * 1024 * 1024; // 1 GB
106106
107107
// You can choose if you encrypt or not encrypt the cache
108108
options.Encrypt = false;
109109

110110
// And you can set eviction policies for the distributed
111111
// cache.
112112
options.SlidingExpiration = TimeSpan.FromHours(1);
113-
}
113+
});
114114

115115
// Then, choose your implementation of distributed cache
116116
// -----------------------------------------------------
@@ -708,4 +708,4 @@ The following samples illustrate token cache serialization.
708708
| ------ | -------- | ----------- |
709709
|[active-directory-dotnet-desktop-msgraph-v2](https://github.com/azure-samples/active-directory-dotnet-desktop-msgraph-v2) | Desktop (WPF) | Windows Desktop .NET (WPF) application that calls the Microsoft Graph API. ![Diagram that shows a topology with a desktop app client flowing to Azure Active Directory by acquiring a token interactively and to Microsoft Graph.](media/msal-net-token-cache-serialization/topology.png)|
710710
|[active-directory-dotnet-v1-to-v2](https://github.com/Azure-Samples/active-directory-dotnet-v1-to-v2) | Desktop (console) | Set of Visual Studio solutions that illustrate the migration of Azure AD v1.0 applications (using ADAL.NET) to Microsoft identity platform applications (using MSAL.NET). In particular, see [Token cache migration](https://github.com/Azure-Samples/active-directory-dotnet-v1-to-v2/blob/master/TokenCacheMigration/README.md) and [Confidential client token cache](https://github.com/Azure-Samples/active-directory-dotnet-v1-to-v2/tree/master/ConfidentialClientTokenCache). |
711-
[ms-identity-aspnet-webapp-openidconnect](https://github.com/Azure-Samples/ms-identity-aspnet-webapp-openidconnect) | ASP.NET (net472) | Example of token cache serialization in an ASP.NET MVC application (using MSAL.NET). In particular, see [MsalAppBuilder](https://github.com/Azure-Samples/ms-identity-aspnet-webapp-openidconnect/blob/master/WebApp/Utils/MsalAppBuilder.cs).
711+
[ms-identity-aspnet-webapp-openidconnect](https://github.com/Azure-Samples/ms-identity-aspnet-webapp-openidconnect) | ASP.NET (net472) | Example of token cache serialization in an ASP.NET MVC application (using MSAL.NET). In particular, see [MsalAppBuilder](https://github.com/Azure-Samples/ms-identity-aspnet-webapp-openidconnect/blob/master/WebApp/Utils/MsalAppBuilder.cs).

articles/azure-functions/functions-identity-based-connections-tutorial-2.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,15 @@ You've granted your function app access to the service bus namespace using manag
9797

9898
1. After you create the two settings, select **Save** > **Confirm**.
9999

100+
> [!NOTE]
101+
> When using [Azure App Configuration](../../articles/azure-app-configuration/quickstart-azure-functions-csharp.md) or [Key Vault](../articles/key-vault/general/overview.md) to provide settings for Managed Identity connections, setting names should use a valid key separator such as `:` or `/` in place of the `__` to ensure names are resolved correctly.
102+
>
103+
> For example, `ServiceBusConnection:fullyQualifiedNamespace`.
104+
100105
Now that you've prepared the function app to connect to the service bus namespace using a managed identity, you can add a new function that uses a Service Bus trigger to your local project.
101106

107+
108+
102109
## Add a Service Bus triggered function
103110

104111
1. Run the `func init` command, as follows, to create a functions project in a folder named LocalFunctionProj with the specified runtime:
@@ -148,6 +155,11 @@ Now that you've prepared the function app to connect to the service bus namespac
148155
> [!NOTE]
149156
> If you try to run your functions now using `func start` you'll receive an error. This is because you don't have an identity-based connection defined locally. If you want to run your function locally, set the app setting `ServiceBusConnection__fullyQualifiedNamespace` in `local.settings.json` as you did in [the previous section](#connect-to-service-bus-in-your-function-app). In addition, you'll need to assign the role to your developer identity. For more details, please refer to the [local development with identity-based connections documentation](./functions-reference.md#local-development-with-identity-based-connections).
150157

158+
> [!NOTE]
159+
> When using [Azure App Configuration](../../articles/azure-app-configuration/quickstart-azure-functions-csharp.md) or [Key Vault](../articles/key-vault/general/overview.md) to provide settings for Managed Identity connections, setting names should use a valid key separator such as `:` or `/` in place of the `__` to ensure names are resolved correctly.
160+
>
161+
> For example, `ServiceBusConnection:fullyQualifiedNamespace`.
162+
151163
## Publish the updated project
152164

153165
1. Run the following command to locally generate the files needed for the deployment package:

articles/azure-functions/functions-reference.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,11 @@ However, a connection name can also refer to a collection of multiple configurat
102102

103103
For example, the `connection` property for an Azure Blob trigger definition might be "Storage1". As long as there is no single string value configured by an environment variable named "Storage1", an environment variable named `Storage1__blobServiceUri` could be used to inform the `blobServiceUri` property of the connection. The connection properties are different for each service. Refer to the documentation for the component that uses the connection.
104104

105+
> [!NOTE]
106+
> When using [Azure App Configuration](../azure-app-configuration/quickstart-azure-functions-csharp.md) or [Key Vault](../articles/key-vault/general/overview.md) to provide settings for Managed Identity connections, setting names should use a valid key separator such as `:` or `/` in place of the `__` to ensure names are resolved correctly.
107+
>
108+
> For example, `Storage1:blobServiceUri`.
109+
105110
### Configure an identity-based connection
106111

107112
Some connections in Azure Functions can be configured to use an identity instead of a secret. Support depends on the extension using the connection. In some cases, a connection string may still be required in Functions even though the service to which you are connecting supports identity-based connections. For a tutorial on configuring your function apps with managed identities, see the [creating a function app with identity-based connections tutorial](./functions-identity-based-connections-tutorial.md).

articles/azure-monitor/app/create-new-resource.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,13 @@ az monitor app-insights component create --app
120120
#### Example
121121

122122
```azurecli
123-
az monitor app-insights component create --app demoApp --location westus2 --kind web -g demoRg --application-type web
123+
az monitor app-insights component create --app demoApp --location westus2 --kind web --resource-group demoRg --application-type web
124124
```
125125

126126
#### Results
127127

128128
```azurecli
129-
az monitor app-insights component create --app demoApp --location eastus --kind web -g demoApp --application-type web
129+
az monitor app-insights component create --app demoApp --location eastus --kind web --resource-group demoApp --application-type web
130130
{
131131
"appId": "87ba512c-e8c9-48d7-b6eb-118d4aee2697",
132132
"applicationId": "demoApp",

articles/azure-vmware/azure-vmware-solution-platform-updates.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@ ms.date: 07/07/2022
1111

1212
Azure VMware Solution will apply important updates starting in March 2021. You'll receive a notification through Azure Service Health that includes the timeline of the maintenance. For more information, see [Host maintenance and lifecycle management](concepts-private-clouds-clusters.md#host-maintenance-and-lifecycle-management).
1313

14+
## July 8, 2022
15+
16+
HCX cloud manager in Azure VMware solutions can now be accessible over a public IP address. You can pair HCX sites and create a service mesh from on-premises to Azure VMware Solutions private cloud using Public IP.
17+
18+
HCX with public IP is especially useful in cases where On-premises sites are not connected to Azure via Express Route or VPN. HCX service mesh appliances can be configured with public IPs to avoid lower tunnel MTUs due to double encapsulation if a VPN is used for on-premises to cloud connections.
19+
20+
For more information, please see [Enable HCX over the internet](/azure/azure-vmware/enable-hcx-access-over-internet)
21+
22+
1423
## July 7, 2022
1524

1625
All new Azure VMware Solution private clouds are now deployed with VMware vCenter Server version 7.0 Update 3c and ESXi version 7.0 Update 3c.

articles/azure-vmware/includes/vmware-software-versions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ The VMware solution software versions used in new deployments of Azure VMware So
1919
| ESXi | 7.0 U3c |
2020
| vSAN | 7.0 U3c |
2121
| vSAN on-disk format | 10 |
22-
| HCX | 4.2.2 |
22+
| HCX | 4.3.3 |
2323
| NSX-T Data Center <br />**NOTE:** NSX-T Data Center is the only supported version of NSX Data Center. | [[!INCLUDE [nsxt-version](nsxt-version.md)]](https://docs.vmware.com/en/VMware-NSX-T-Data-Center/3.1/rn/VMware-NSX-T-Data-Center-312-Release-Notes.html) |
2424

2525

26-
The currently running software version is applied to new clusters added to an existing private cloud. For more information, see the [VMware software version requirements](https://docs.vmware.com/en/VMware-HCX/4.1/hcx-user-guide/GUID-54E5293B-8707-4D29-BFE8-EE63539CC49B.html) and [Understanding vSAN on-disk format versions and compatibility](https://kb.vmware.com/s/article/2148493).
26+
The currently running software version is applied to new clusters added to an existing private cloud. For more information, see the [VMware software version requirements for HCX](https://docs.vmware.com/en/VMware-HCX/4.3/hcx-user-guide/GUID-54E5293B-8707-4D29-BFE8-EE63539CC49B.html) and [Understanding vSAN on-disk format versions and compatibility](https://kb.vmware.com/s/article/2148493).
2727

articles/blockchain/workbench/includes/retire.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ ms.author: sunir
77
---
88

99
> [!IMPORTANT]
10-
> On October 31, 2022, Azure Blockchain Workbench will be retired. Please migrate workloads to ConsenSys [Quorum Blockchain Service](https://azuremarketplace.microsoft.com/marketplace/apps/consensys.qbs-contact-me) prior to the retirement date. Select the **Contact me** button on the [Quorum Blockchain Service Azure Marketplace page](https://azuremarketplace.microsoft.com/marketplace/apps/consensys.qbs-contact-me) to contact ConsenSys to learn about their offerings for your requirements.
10+
> On October 31, 2022, Azure Blockchain Workbench will be retired. Please migrate workloads to ConsenSys [Quorum Blockchain Service](https://azuremarketplace.microsoft.com/marketplace/apps/consensys.quorum-blockchain-service?tab=Overview) prior to the retirement date.

articles/data-factory/deploy-linked-arm-templates-with-vsts.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ The scenario we walk through here is to deploy VNet with a Network Security Gro
7070

7171
- Linked ARM template:
7272
- For Template, point to ArmTemplate_master.json instead of ArmTemplateForFactory.json
73-
- For Template Parameters, point to 'ArmTemplateParamter_master.json' instead of 'ArmTemplateParametersForFactory.json'
73+
- For Template Parameters, point to 'ArmTemplateParameters_master.json' instead of 'ArmTemplateParametersForFactory.json'
7474
- Under override Template parameters update two additional parameters
7575
- **containerUri** – Paste the URL of container created above.
7676
- **containerSasToken** - If the secret's name is 'StorageSASToken', enter '$(StorageSASToken)' for this value.
7777

7878
1. Save the release pipeline and trigger a release.
7979

8080
## Next steps
81-
- [Automate continuous integration using Azure Pipelines releases](continuous-integration-delivery-automate-azure-pipelines.md)
81+
- [Automate continuous integration using Azure Pipelines releases](continuous-integration-delivery-automate-azure-pipelines.md)

articles/machine-learning/how-to-use-sweep-in-pipeline.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Assume you already have a command component defined in `train.yaml`. A two-step
3939

4040
:::code language="yaml" source="~/azureml-examples-main/cli/jobs/pipelines-with-components/pipeline_with_hyperparameter_sweep/pipeline.yml" highlight="7-48":::
4141

42-
The `sweep_step` is the step for hyperparameter tuning. Its type needs to be `sweep`. And `trial` refers to the command component defined in `train.yaml`. From the `search sapce` field we can see three hyparmeters (`c_value`, `kernel`, and `coef`) are added to the search space. After you submit this pipeline job, Azure Machine Learning will run the trial component multiple times to sweep over hyperparameters based on the search space and terminate policy you defined in `sweep_step`. Check [sweep job YAML schema](reference-yaml-job-sweep.md) for full schema of sweep job.
42+
The `sweep_step` is the step for hyperparameter tuning. Its type needs to be `sweep`. And `trial` refers to the command component defined in `train.yaml`. From the `search space` field we can see three hyparmeters (`c_value`, `kernel`, and `coef`) are added to the search space. After you submit this pipeline job, Azure Machine Learning will run the trial component multiple times to sweep over hyperparameters based on the search space and terminate policy you defined in `sweep_step`. Check [sweep job YAML schema](reference-yaml-job-sweep.md) for full schema of sweep job.
4343

4444
Below is the trial component definition (train.yml file).
4545

articles/search/index-similarity-and-scoring.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Both BM25 and Classic are TF-IDF-like retrieval functions that use the term freq
4646
BM25 offers advanced customization options, such as allowing the user to decide how the relevance score scales with the term frequency of matched terms. For more information, see [Configure the scoring algorithm](index-ranking-similarity.md).
4747

4848
> [!NOTE]
49-
> If you're using a search service that was created before July 2020, the scoring algorithm is most likely the previous default, `ClassicSimilarity`, which you an upgrade on a per-index basis. See [Enable BM25 scoring on older services](index-ranking-similarity.md#enable-bm25-scoring-on-older-services) for details.
49+
> If you're using a search service that was created before July 2020, the scoring algorithm is most likely the previous default, `ClassicSimilarity`, which you can upgrade on a per-index basis. See [Enable BM25 scoring on older services](index-ranking-similarity.md#enable-bm25-scoring-on-older-services) for details.
5050
5151
The following video segment fast-forwards to an explanation of the generally available ranking algorithms used in Azure Cognitive Search. You can watch the full video for more background.
5252

@@ -127,4 +127,4 @@ You can consume these data points in [custom scoring solutions](https://github.c
127127
+ [Scoring Profiles](index-add-scoring-profiles.md)
128128
+ [REST API Reference](/rest/api/searchservice/)
129129
+ [Search Documents API](/rest/api/searchservice/search-documents)
130-
+ [Azure Cognitive Search .NET SDK](/dotnet/api/overview/azure/search)
130+
+ [Azure Cognitive Search .NET SDK](/dotnet/api/overview/azure/search)

0 commit comments

Comments
 (0)