Skip to content

Commit d3ea9f1

Browse files
committed
Merge branch 'main' into release-aio-m3
2 parents 2390835 + ce54a44 commit d3ea9f1

File tree

60 files changed

+228
-494
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+228
-494
lines changed

.openpublishing.redirection.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/devtest-labs/devtest-lab-integrate-ci-cd.md",
5+
"redirect_url": "/previous-versions/azure/devtest-labs/devtest-lab-integrate-ci-cd",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/devtest-labs/integrate-environments-devops-pipeline.md",
10+
"redirect_url": "/previous-versions/azure/devtest-labs/integrate-environments-devops-pipeline",
11+
"redirect_document_id": false
12+
},
313
{
414
"source_path": "articles/confidential-computing/virtual-machine-solutions.md",
515
"redirect_url": "/azure/virtual-machines/",
@@ -3701,4 +3711,4 @@
37013711
"redirect_document_id": false
37023712
}
37033713
]
3704-
}
3714+
}

articles/active-directory-b2c/identity-provider-ping-one.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ zone_pivot_groups: b2c-policy-type
2525

2626
## Create a PingOne application
2727

28-
To enable sign-in for users with a PingOne (Ping Identity) account in Azure Active Directory B2C (Azure AD B2C), you need to create an application in the Ping Identity Administrator Console. For more information, see [Adding or updating an OIDC application](https://docs.pingidentity.com/access/sources/dita/topic?resourceid=p14e_add_update_oidc_application) in the Ping Identity documentation. If you don't already have a PingOne account, you can sign up at [`https://admin.pingone.com/web-portal/register`](https://admin.pingone.com/web-portal/register).
28+
To enable sign-in for users with a PingOne (Ping Identity) account in Azure Active Directory B2C (Azure AD B2C), you need to create an application in the Ping Identity Administrator Console. If you don't already have a PingOne account, you can sign up at [`https://admin.pingone.com/web-portal/register`](https://admin.pingone.com/web-portal/register).
2929

3030
1. Sign in to the Ping Identity Administrator Console with your PingOne account credentials.
3131
1. In the left menu of the page, select **Connections**, then next to **Applications**, select **+**.

articles/active-directory-b2c/partner-ping-identity.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,16 +107,14 @@ Use the instructions in the following sections to configure PingAccess and PingF
107107

108108
To configure PingFederate as the token provider for PingAccess, ensure connectivity from PingFederate to PingAccess. Confirm connectivity from PingAccess to PingFederate.
109109

110-
For more information, see [Configure PingFederate as the token provider for PingAccess](https://docs.pingidentity.com/access/sources/dita/topic?category=pingaccess&Releasestatus_ce=Current&resourceid=pa_configure_pf_as_the_token_provider_for_pa) in the Ping Identity documentation.
111-
112110
### Configure a PingAccess application for header-based authentication
113111

114112
Use the following instructions to create a PingAccess application for the target web application, for header-based authentication.
115113

116114
#### Create a virtual host
117115

118116
>[!IMPORTANT]
119-
>Create a virtual host for every application. For more information, see [What can I configure with PingAccess?](https://docs.pingidentity.com/access/sources/dita/topic?category=pingaccess&Releasestatus_ce=Current&resourceid=pa_what_can_I_configure_with_pa) in the Ping Identity documentation.
117+
>Create a virtual host for every application.
120118
121119
To create a virtual host:
122120

articles/automation/disable-local-authentication.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ title: Disable local authentication in Azure Automation
33
description: This article describes disabling local authentication in Azure Automation.
44
services: automation
55
ms.subservice: process-automation
6-
ms.date: 11/20/2023
7-
ms.custom: engagement-fy23
6+
ms.date: 06/06/2024
7+
ms.custom: engagement-fy24
88
ms.topic: how-to
99
#Customer intent: As an administrator, I want disable local authentication so that I can enhance security.
1010
ms.service: azure-automation
@@ -40,7 +40,7 @@ The following table describes the behaviors or features that are prevented from
4040
|Starting a runbook using a webhook. | Start a runbook job using Azure Resource Manager template, which uses Microsoft Entra authentication. |
4141
|Using Automation Desired State Configuration.| Use [Azure Policy Guest configuration](../governance/machine-configuration/overview.md).  |
4242
|Using agent-based Hybrid Runbook Workers.| Use [extension-based Hybrid Runbook Workers](./extension-based-hybrid-runbook-worker-install.md).|
43-
|Using Azure Update Manager |Use [Azure Update Manager](../update-manager/overview.md)|
43+
|Using Automation Update Management |Use [Azure Update Manager](../update-manager/overview.md)|
4444

4545

4646
## Next steps

articles/azure-app-configuration/enable-dynamic-configuration-aspnet-core.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ A *sentinel key* is a key that you update after you complete the change of all o
8181

8282
1. Call the `UseAzureAppConfiguration` method. It enables your app to use the App Configuration middleware to update the configuration for you automatically.
8383

84-
Update *Program.cs* withe the following code.
84+
Update *Program.cs* with the following code.
8585

8686
```csharp
8787
// Existing code in Program.cs

articles/azure-app-configuration/feature-management-dotnet-reference.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ In the above example, `FeatureW` specifies a `RequirementType` of `All`, meaning
165165

166166
#### Microsoft Feature Management Schema
167167

168-
The feature management library also supports the usage of the [`Microsoft Feature Management schema`](https://github.com/Azure/AppConfiguration/blob/main/docs/FeatureManagement/FeatureManagement.v1.0.0.schema.json) to declare feature flags. This schema is language agnostic in origin and is supported by all Microsoft feature management libraries.
168+
The feature management library also supports the usage of the [`Microsoft Feature Management schema`](https://github.com/microsoft/FeatureManagement/blob/main/Schema/FeatureManagement.v1.0.0.schema.json) to declare feature flags. This schema is language agnostic in origin and is supported by all Microsoft feature management libraries.
169169

170170
``` JavaScript
171171
{
@@ -198,7 +198,7 @@ The feature management library also supports the usage of the [`Microsoft Featur
198198

199199
:::zone target="docs" pivot="preview-version"
200200

201-
The feature management library supports appsettings.json as a feature flag source since it's a provider for .NET Core's `IConfiguration` system. Feature flags are declared using the [`Microsoft Feature Management schema`](https://github.com/Azure/AppConfiguration/blob/main/docs/FeatureManagement/FeatureManagement.v2.0.0.schema.json). This schema is language agnostic in origin and is supported by all Microsoft feature management libraries.
201+
The feature management library supports appsettings.json as a feature flag source since it's a provider for .NET Core's `IConfiguration` system. Feature flags are declared using the [`Microsoft Feature Management schema`](https://github.com/microsoft/FeatureManagement/blob/main/Schema/FeatureManagement.v2.0.0.schema.json). This schema is language agnostic in origin and is supported by all Microsoft feature management libraries.
202202

203203
Below we have an example of declaring feature flags in a json file.
204204

@@ -1407,11 +1407,13 @@ To enable persistance of targeting context in the current activity, you can use
14071407
app.UseMiddleware<TargetingHttpContextMiddleware>();
14081408
```
14091409

1410-
An example of its usage can be found in the [EvaluationDataToApplicationInsights](https://github.com/microsoft/FeatureManagement-Dotnet/tree/preview/examples/EvaluationDataToApplicationInsights) example.
1410+
An example of its usage can be found in the [VariantAndTelemetryDemo](https://github.com/microsoft/FeatureManagement-Dotnet/tree/preview/examples/VariantAndTelemetryDemo) example.
14111411

14121412
#### Prerequisite
14131413

1414-
This telemetry publisher depends on Application Insights already being [setup](/azure/azure-monitor/app/asp-net-core#enable-application-insights-server-side-telemetry-no-visual-studio) and registered as an application service. For example, that is done [here](https://github.com/microsoft/FeatureManagement-Dotnet/blob/preview/examples/EvaluationDataToApplicationInsights/Program.cs#L20C1-L20C54) in the example application.
1414+
This telemetry publisher depends on Application Insights already being setup registered as an application service. For example, that is done [here](https://github.com/microsoft/FeatureManagement-Dotnet/blob/preview/examples/VariantAndTelemetryDemo/Program.cs#L22-L32) in the example application.
1415+
1416+
This telemetry publisher depends on Application Insights already being [setup](/azure/azure-monitor/app/asp-net-core#enable-application-insights-server-side-telemetry-no-visual-studio) and registered as an application service.
14151417

14161418
:::zone-end
14171419

articles/azure-government/documentation-government-csp-list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ The following tables contain lists of all the authorized Cloud Solution Provider
215215
|I10 Inc|
216216
|[I2, Inc. (IBM)](https://www.ibm.com/security/intelligence-analysis/i2)|
217217
|[i3 Business Solutions, LLC](https://www.i3businesssolutions.com/)|
218-
|[i3 LLC](http://i3llc.net/)|
218+
|[i3 LLC](https://i3llc.us/)|
219219
|[IBM Corporation](https://www.ibm.com/industries/federal)|
220220
|[Illuminative Strategies Inc](https://illum-strat.com)|
221221
|[ImageSource](https://imagesourceinc.com/)|

articles/azure-maps/rest-sdk-developer-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ For more information, see the [Java SDK Developers Guide].
117117

118118
[js render readme]: https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/maps/maps-render-rest/README.md
119119
[js render package]: https://www.npmjs.com/package/@azure-rest/maps-render
120-
[js render sample]: https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/maps/maps-render-rest/samples/v1-beta
120+
[js render sample]: https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/maps/maps-render-rest/samples/v2-beta
121121

122122
[js Geolocation readme]: https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/maps/maps-geolocation-rest/README.md
123123
[js Geolocation package]: https://www.npmjs.com/package/@azure-rest/maps-geolocation

articles/azure-resource-manager/bicep/bicep-cli.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Bicep CLI commands and overview
33
description: Describes the commands that you can use in the Bicep CLI. These commands include building Azure Resource Manager templates from Bicep.
44
ms.topic: reference
55
ms.custom: devx-track-azurecli, devx-track-bicep, devx-track-arm-template
6-
ms.date: 07/11/2024
6+
ms.date: 10/23/2024
77
---
88

99
# Bicep CLI commands
@@ -16,6 +16,13 @@ This article shows how to run the commands in Azure CLI. When running through Az
1616

1717
The `build` command converts a Bicep file to an Azure Resource Manager template (ARM template). Typically, you don't need to run this command because it runs automatically when you deploy a Bicep file. Run it manually when you want to see the ARM template JSON that is created from your Bicep file.
1818

19+
Using any of following Bicep features automatically enables language version 2.0 code generation:
20+
21+
* [user-defined types](../bicep/user-defined-data-types.md)
22+
* [user-defined functions](../bicep/user-defined-functions.md)
23+
* [compile-time imports](../bicep/bicep-import.md)
24+
* [experimental features](../bicep/bicep-config.md#enable-experimental-features)
25+
1926
The following example converts a Bicep file named _main.bicep_ to an ARM template named _main.json_. The new file is created in the same directory as the Bicep file.
2027

2128
```azurecli

articles/azure-resource-manager/bicep/bicep-config.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Bicep config file
33
description: Describes the configuration file for your Bicep deployments
44
ms.topic: conceptual
55
ms.custom: devx-track-bicep
6-
ms.date: 06/27/2024
6+
ms.date: 10/23/2024
77
---
88

99
# Configure your Bicep environment
@@ -133,7 +133,7 @@ The [Bicep linter](linter.md) checks Bicep files for syntax errors and best prac
133133

134134
## Enable experimental features
135135

136-
You can enable experimental features by adding the following section to your `bicepconfig.json` file.
136+
You can enable experimental features by adding the following section to your `bicepconfig.json` file. Using experimental features automatically enables [language version 2.0](../templates/syntax.md#languageversion-20) code generation.
137137

138138
Here's an example of enabling features 'assertions' and 'testFramework`.
139139

0 commit comments

Comments
 (0)