Skip to content

Commit ef723a4

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into us401764-cli-posh-nat-firewall
2 parents 2f2fb1d + e2a46db commit ef723a4

20 files changed

+35
-33
lines changed

articles/azure-functions/flex-consumption-plan.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,15 @@ This table shows the language stack versions that are currently supported for Fl
105105

106106
| Language stack | Required version |
107107
| --- | :-----: |
108-
| C# (isolated process mode)<sup>1</sup> | .NET 8<sup>2</sup> |
109-
| Java | Java 11, Java 17 |
110-
| Node.js | Node 20 |
108+
| C# (isolated process mode)<sup>1</sup> | .NET 8<sup>2</sup>, .NET 9<sup>3</sup> |
109+
| Java | Java 11, Java 17, Java 21 |
110+
| Node.js | Node.js 20, Node.js 22 |
111111
| PowerShell | PowerShell 7.4 |
112112
| Python | Python 3.10, Python 3.11, Python 3.12 |
113113

114-
<sup>1</sup>[C# in-process mode](./functions-dotnet-class-library.md) isn't supported. You instead need to [migrate your .NET code project to run in the isolated worker model](migrate-dotnet-to-isolated-model.md).
115-
<sup>2</sup>Requires version `1.20.0` or later of [Microsoft.Azure.Functions.Worker](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker) and version `1.16.2` or later of [Microsoft.Azure.Functions.Worker.Sdk](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.Sdk).
114+
1. [C# in-process mode](./functions-dotnet-class-library.md) isn't supported. You instead need to [migrate your .NET code project to run in the isolated worker model](migrate-dotnet-to-isolated-model.md).
115+
2. Requires version `1.20.0` or later of [Microsoft.Azure.Functions.Worker](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker) and version `1.16.2` or later of [Microsoft.Azure.Functions.Worker.Sdk](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.Sdk).
116+
3. Requires version `2.0.0` or later of both [Microsoft.Azure.Functions.Worker](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker) and [Microsoft.Azure.Functions.Worker.Sdk](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.Sdk).
116117

117118
## Regional subscription memory quotas
118119

articles/batch/error-handling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Error handling and detection in Azure Batch
33
description: Learn about error handling in Batch service workflows from a development standpoint.
4-
ms.topic: article
4+
ms.topic: concept-article
55
ms.date: 04/13/2023
66
---
77

articles/cost-management-billing/manage/billing-subscription-transfer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.reviewer: macyso
88
ms.service: cost-management-billing
99
ms.subservice: billing
1010
ms.topic: how-to
11-
ms.date: 01/22/2025
11+
ms.date: 05/21/2025
1212
ms.author: macyso
1313
---
1414

articles/cost-management-billing/manage/check-free-service-usage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
title: Monitor and track Azure free service usage
33
description: Learn how to check free service usage in the Azure portal. There's no charge for services included in a free account unless you go over the service limits.
4-
author: KennyDay
4+
author: bandersmsft
55
ms.reviewer: macyso
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: conceptual
9-
ms.date: 01/22/2025
9+
ms.date: 05/21/2025
1010
ms.author: macyso
1111
---
1212

articles/cost-management-billing/manage/classic-administrator-retire.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.reviewer: macyso
77
ms.service: cost-management-billing
88
ms.subservice: billing
99
ms.topic: conceptual
10-
ms.date: 01/22/2025
10+
ms.date: 05/21/2025
1111
ms.author: macyso
1212
---
1313

@@ -35,4 +35,4 @@ If you have questions, you can ask community experts in [Microsoft Q & A](/answe
3535

3636
- [Azure classic subscription administrators](../../role-based-access-control/classic-administrators.md)
3737
- [Cloud Services (classic) deployment model retirement](https://azure.microsoft.com/updates/cloud-services-retirement-announcement/)
38-
- [Azure built-in roles](../../role-based-access-control/built-in-roles.md)
38+
- [Azure built-in roles](../../role-based-access-control/built-in-roles.md)

articles/cost-management-billing/manage/create-subscription.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
title: Create a Microsoft Customer Agreement subscription
33
titleSuffix: Azure Cost Management + Billing
44
description: Learn how to add a new Microsoft Customer Agreement subscription in the Azure portal. See information about billing account forms and view other available resources.
5-
author: KennyDay
5+
author: bandersmsft
66
ms.reviewer: macyso
77
ms.service: cost-management-billing
88
ms.subservice: billing
99
ms.topic: conceptual
10-
ms.date: 01/22/2025
10+
ms.date: 05/21/2025
1111
ms.author: macyso
1212
---
1313

articles/cost-management-billing/manage/link-partner-id-power-apps-accounts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.reviewer: macyso
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: conceptual
9-
ms.date: 01/22/2025
9+
ms.date: 05/21/2025
1010
ms.author: macyso
1111
ms.custom: devx-track-azurepowershell, devx-track-azurecli
1212
ms.devlang: azurecli

articles/cost-management-billing/manage/link-partner-id.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Track engagements with Azure customers by linking a partner ID to t
44
author: kendayMS
55
ms.reviewer: macyso
66
ms.author: macyso
7-
ms.date: 01/22/2025
7+
ms.date: 05/21/2025
88
ms.service: cost-management-billing
99
ms.subservice: billing
1010
ms.topic: how-to

articles/cost-management-billing/manage/manage-consumption-commitment.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
---
22
title: Manage a Microsoft Azure Consumption Commitment resource
33
description: Learn how to manage your Microsoft Azure Consumption Commitment (MACC) resource, including moving it across resource groups or subscriptions.
4-
author: KennyDay
4+
author: bandersmsft
55
ms.reviewer: macyso
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: how-to
9-
ms.date: 01/22/2025
9+
ms.date: 05/21/2025
1010
ms.author: macyso
11+
#customer intent: As a Microsoft Customer Agreement billing owner, I want learn about managing a MACC so that I move it when needed.
1112
---
1213

1314
# Manage a Microsoft Azure Consumption Commitment resource under a subscription

articles/cost-management-billing/manage/mca-request-billing-ownership.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Transfer Azure product billing ownership to a Microsoft Customer Agreement
33
description: Learn how to transfer billing ownership of Azure subscriptions, reservations, and savings plans.
44
ms.topic: how-to
5-
ms.date: 01/22/2025
5+
ms.date: 05/21/2025
66
author: kendayMS
77
ms.author: macyso
88
ms.reviewer: macyso

0 commit comments

Comments
 (0)