Skip to content

Commit 786a038

Browse files
committed
Merge branch 'main' into release-defender-flip
2 parents 4b545c0 + 70cb2bd commit 786a038

File tree

113 files changed

+900
-341
lines changed

Some content is hidden

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

113 files changed

+900
-341
lines changed

articles/api-management/api-management-region-availability.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: dlepow
66

77
ms.service: azure-api-management
88
ms.topic: concept-article
9-
ms.date: 11/20/2024
9+
ms.date: 04/29/2025
1010
ms.author: danlep
1111
ms.custom: references_regions
1212
---
@@ -47,10 +47,11 @@ Information in the following table is updated regularly. Capacity availability i
4747
| Switzerland North ||| | |
4848
| UK South |||||
4949
| UK West ||| | |
50-
| West Europe ||| | |
50+
| West Europe ||| | ✅<sup>1</sup> |
5151
| West US ||| ||
5252
| West US 2 ||| | |
5353

54+
<sup>1</sup> Request access to this region by emailing `[email protected]`
5455

5556
## Related content
5657

articles/app-service/configure-language-java-deploy-run.md

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -401,25 +401,9 @@ To configure the app setting from the Maven plugin, add setting/value tags in th
401401
402402
::: zone-end
403403

404-
Developers running a single application with one deployment slot in their App Service plan can use the following options:
405-
406-
- B1 and S1 instances: `-Xms1024m -Xmx1024m`
407-
- B2 and S2 instances: `-Xms3072m -Xmx3072m`
408-
- B3 and S3 instances: `-Xms6144m -Xmx6144m`
409-
- P1v2 instances: `-Xms3072m -Xmx3072m`
410-
- P2v2 instances: `-Xms6144m -Xmx6144m`
411-
- P3v2 instances: `-Xms12800m -Xmx12800m`
412-
- P1v3 instances: `-Xms6656m -Xmx6656m`
413-
- P2v3 instances: `-Xms14848m -Xmx14848m`
414-
- P3v3 instances: `-Xms30720m -Xmx30720m`
415-
- I1 instances: `-Xms3072m -Xmx3072m`
416-
- I2 instances: `-Xms6144m -Xmx6144m`
417-
- I3 instances: `-Xms12800m -Xmx12800m`
418-
- I1v2 instances: `-Xms6656m -Xmx6656m`
419-
- I2v2 instances: `-Xms14848m -Xmx14848m`
420-
- I3v2 instances: `-Xms30720m -Xmx30720m`
421-
422-
When tuning application heap settings, review your App Service plan details. Consider the needs of multiple applications and deployment slots to find the optimal allocation of memory.
404+
By default, App Service sets the JVM Max Heap size to 70% of the total memory available for the App Service Plan. To disable the default setting, you can use app setting WEBSITE_DISABLE_JAVA_HEAP_CONFIGURATION=”true".
405+
406+
Enhancing your application's performance on the platform may involve adjusting the heap size to better suit your specific needs. When tuning application heap settings, please review your App Service plan details and consider the requirements of multiple applications and deployment slots to find the optimal memory allocation.
423407

424408
### Turn on web sockets
425409

articles/automation/automation-runbook-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,5 +364,5 @@ You can create and edit graphical and graphical PowerShell Workflow runbooks usi
364364

365365
* To learn about PowerShell runbooks, see [Tutorial: Create a PowerShell runbook](./learn/powershell-runbook-managed-identity.md).
366366
* To learn about PowerShell Workflow runbooks, see [Tutorial: Create a PowerShell Workflow runbook](learn/automation-tutorial-runbook-textual.md).
367-
* To learn about graphical runbooks, see [Tutorial: Create a graphical runbook](./learn/powershell-runbook-managed-identity.md).
367+
* To learn about graphical runbooks, see [Tutorial: Create a graphical runbook](automation-graphical-authoring-intro.md).
368368
* To learn about Python runbooks, see [Tutorial: Create a Python runbook](./learn/automation-tutorial-runbook-textual-python-3.md).
-15.6 KB
Loading

articles/azure-app-configuration/quickstart-azure-app-configuration-create.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: azure-app-configuration
77
ms.devlang: csharp
88
ms.custom: devx-track-csharp, mode-other
99
ms.topic: quickstart
10-
ms.date: 03/25/2024
10+
ms.date: 04/16/2025
1111

1212
#Customer intent: As an Azure developer, I want to create an app configuration store to manage all my app settings in one place using Azure App Configuration.
1313
---
@@ -44,9 +44,6 @@ An Azure account with an active subscription. [Create one for free](https://azur
4444
:::image type="content" source="media/azure-app-configuration-create/azure-portal-basic-tab.png" alt-text="Screenshot of the Azure portal that shows the basic tab of the creation for with the free tier selected.":::
4545

4646
1. Select **Review + create** to validate your settings.
47-
48-
:::image type="content" source="media/azure-app-configuration-create/azure-portal-review.png" alt-text="Screenshot of the Azure portal that shows the configuration settings in the Review + create tab.":::
49-
5047
1. Select **Create**. The deployment might take a few minutes.
5148
1. After the deployment finishes, go to the App Configuration resource. Select **Settings** > **Access keys**. Make a note of the primary read-only key connection string. You'll use this connection string later to configure your application to communicate with the App Configuration store that you created.
5249

@@ -125,8 +122,9 @@ az group delete --name <name>
125122

126123
---
127124

128-
## Next steps
125+
## Next step
129126

130127
Advance to the next article to learn how to create an ASP.NET Core app with Azure App Configuration to centralize storage and management of its application settings.
128+
131129
> [!div class="nextstepaction"]
132130
> [Quickstart ASP.NET Core](quickstart-aspnet-core-app.md)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Linter settings for Bicep config
33
description: Describes how to customize configuration values for the Bicep linter
44
ms.topic: conceptual
55
ms.custom: devx-track-bicep
6-
ms.date: 09/19/2024
6+
ms.date: 04/28/2025
77
---
88

99
# Add linter settings in the Bicep config file

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Module setting for Bicep config
33
description: Describes how to customize configuration values for modules in Bicep deployments.
44
ms.topic: conceptual
55
ms.custom: devx-track-bicep
6-
ms.date: 06/28/2024
6+
ms.date: 04/28/2025
77
---
88

99
# Add module settings in the Bicep config file
@@ -169,7 +169,6 @@ Bicep uses the [Azure.Identity SDK](/dotnet/api/azure.identity) to do authentica
169169
- [Environment](/dotnet/api/azure.identity.environmentcredential)
170170
- [ManagedIdentity](/dotnet/api/azure.identity.managedidentitycredential)
171171
- [VisualStudio](/dotnet/api/azure.identity.visualstudiocredential)
172-
- [VisualStudioCode](/dotnet/api/azure.identity.visualstudiocodecredential)
173172

174173
[!INCLUDE [vscode authentication](../../../includes/resource-manager-vscode-authentication.md)]
175174

articles/azure-resource-manager/bicep/bicep-kubernetes-extension.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Bicep Kubernetes extension
33
description: Learn how to Bicep Kubernetes extension to deploy .NET applications to Azure Kubernetes Service clusters.
44
ms.topic: conceptual
55
ms.custom: devx-track-bicep, devx-track-dotnet
6-
ms.date: 08/07/2024
6+
ms.date: 04/28/2025
77
---
88

99
# Bicep Kubernetes extension (Preview)
@@ -12,9 +12,9 @@ The Kubernetes extension allows you to create Kubernetes resources directly with
1212

1313
> [!NOTE]
1414
> The Kubernetes extension is not currently supported for private clusters:
15-
>
15+
>
1616
> ```bicep
17-
> resource AKS 'Microsoft.ContainerService/managedClusters@2024-02-01' = {
17+
> resource AKS 'Microsoft.ContainerService/managedClusters@2024-10-01' = {
1818
> ...
1919
> properties: {
2020
> apiServerAccessProfile: {
@@ -60,7 +60,7 @@ extension kubernetes with {
6060
The following sample shows how to pass `kubeConfig` value from a parent Bicep file:
6161

6262
```bicep
63-
resource aks 'Microsoft.ContainerService/managedClusters@2024-08-01' existing = {
63+
resource aks 'Microsoft.ContainerService/managedClusters@2024-10-01' existing = {
6464
name: 'demoAKSCluster'
6565
}
6666

articles/azure-resource-manager/bicep/child-resource-name-type.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Child resources in Bicep
33
description: Describes how to set the name and type for child resources in Bicep.
44
ms.topic: conceptual
55
ms.custom: devx-track-bicep
6-
ms.date: 09/26/2024
6+
ms.date: 04/28/2025
77
---
88

99
# Set name and type for child resources in Bicep
@@ -67,7 +67,7 @@ A nested resource declaration must appear at the top level of syntax of the pare
6767
When defined within the parent resource type, you format the type and name values as a single segment without slashes. The following example shows a storage account with a child resource for the file service, and the file service has a child resource for the file share. The file service's name is set to `default` and its type is set to `fileServices`. The file share's name is set `exampleshare` and its type is set to `shares`.
6868

6969
```bicep
70-
resource storage 'Microsoft.Storage/storageAccounts@2023-04-01' = {
70+
resource storage 'Microsoft.Storage/storageAccounts@2024-01-01' = {
7171
name: 'examplestorage'
7272
location: resourceGroup().location
7373
kind: 'StorageV2'
@@ -119,7 +119,7 @@ When defined outside of the parent resource, you format the type and with slashe
119119
The following example shows a storage account, file service, and file share that are all defined at the root level.
120120

121121
```bicep
122-
resource storage 'Microsoft.Storage/storageAccounts@2023-04-01' = {
122+
resource storage 'Microsoft.Storage/storageAccounts@2024-01-01' = {
123123
name: 'examplestorage'
124124
location: resourceGroup().location
125125
kind: 'StorageV2'
@@ -128,12 +128,12 @@ resource storage 'Microsoft.Storage/storageAccounts@2023-04-01' = {
128128
}
129129
}
130130
131-
resource service 'Microsoft.Storage/storageAccounts/fileServices@2023-04-01' = {
131+
resource service 'Microsoft.Storage/storageAccounts/fileServices@2024-01-01' = {
132132
name: 'default'
133133
parent: storage
134134
}
135135
136-
resource share 'Microsoft.Storage/storageAccounts/fileServices/shares@2023-04-01' = {
136+
resource share 'Microsoft.Storage/storageAccounts/fileServices/shares@2024-01-01' = {
137137
name: 'exampleshare'
138138
parent: service
139139
}
@@ -146,7 +146,7 @@ Referencing the child resource symbolic name works the same as referencing the p
146146
You can also use the full resource name and type when declaring the child resource outside the parent. You don't set the parent property on the child resource. Because the dependency can't be inferred, you must set it explicitly.
147147

148148
```bicep
149-
resource storage 'Microsoft.Storage/storageAccounts@2023-04-01' = {
149+
resource storage 'Microsoft.Storage/storageAccounts@2024-01-01' = {
150150
name: 'examplestorage'
151151
location: resourceGroup().location
152152
kind: 'StorageV2'
@@ -155,14 +155,14 @@ resource storage 'Microsoft.Storage/storageAccounts@2023-04-01' = {
155155
}
156156
}
157157
158-
resource service 'Microsoft.Storage/storageAccounts/fileServices@2023-04-01' = {
158+
resource service 'Microsoft.Storage/storageAccounts/fileServices@2024-01-01' = {
159159
name: 'examplestorage/default'
160160
dependsOn: [
161161
storage
162162
]
163163
}
164164
165-
resource share 'Microsoft.Storage/storageAccounts/fileServices/shares@2023-04-01' = {
165+
resource share 'Microsoft.Storage/storageAccounts/fileServices/shares@2024-01-01' = {
166166
name: 'examplestorage/default/exampleshare'
167167
dependsOn: [
168168
service

0 commit comments

Comments
 (0)