Skip to content

Commit 1b307d9

Browse files
kaysieyukaysieyu
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ky-06172024
2 parents cb2988a + 56f964e commit 1b307d9

File tree

66 files changed

+496
-274
lines changed

Some content is hidden

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

66 files changed

+496
-274
lines changed

‎articles/ai-services/openai/concepts/use-your-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ Each user message can translate to multiple search queries, all of which get sen
592592

593593
## Regional availability and model support
594594

595-
| Region | `gpt-35-turbo-16k (0613)` | `gpt-35-turbo (1106)` | `gpt-4-32k (0613)` | `gpt-4 (1106-preview)` | `gpt-4 (0125-preview)` | `gpt-4 (0613)` | `gpt-4o`\*\* | `gpt-turbo (0409)` |
595+
| Region | `gpt-35-turbo-16k (0613)` | `gpt-35-turbo (1106)` | `gpt-4-32k (0613)` | `gpt-4 (1106-preview)` | `gpt-4 (0125-preview)` | `gpt-4 (0613)` | `gpt-4o`\*\* | `gpt-4 (turbo-2024-04-09)` |
596596
|------|---|---|---|---|---|----|----|----|
597597
| Australia East | ✅ | ✅ | ✅ |✅ | | ✅ | | |
598598
| Canada East | ✅ | ✅ | ✅ |✅ | | ✅ | | |

‎articles/azure-arc/data/includes/azure-arc-data-preview-release.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ ms.service: azure-arc
55
ms.custom:
66
- ignite-2023
77
ms.topic: include
8-
ms.date: 04/30/2024
8+
ms.date: 06/11/2024
99
---
1010

11-
<!---
1211
At this time, a test or preview build is not available for the next release.
13-
-->
1412

13+
<!---
1514
June, 2024 preview release is now available.
1615
1716
|Component|Value|
@@ -46,3 +45,4 @@ Release Notes:
4645
- Arc SQL Server | High Availability | Availability Group Management - Manual Failover | GA
4746
- Arc SQL Server | Arc enabled SQL Server FCI - View SQL Server FCI metadata in Azure portal | GA
4847
- Arc SQL Server | Billing | Support an option to bill back ESU 2012 to Y1
48+
-->

‎articles/azure-arc/data/release-notes.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ ms.custom: references_regions, ignite-2023
1717

1818
This article highlights capabilities, features, and enhancements recently released or improved for Azure Arc-enabled data services.
1919

20+
## June 11, 2024
21+
22+
**Image tag**: `v1.30.0_2024-06-11`
23+
24+
For complete release version information, review [Version log](version-log.md#june-11-2024).
25+
2026
## April 9, 2024
2127

2228
**Image tag**:`v1.29.0_2024-04-09`

‎articles/azure-arc/data/version-log.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,32 @@ ms.topic: conceptual
1818

1919
This article identifies the component versions with each release of Azure Arc-enabled data services.
2020

21+
## June 11, 2024
22+
23+
|Component|Value|
24+
|-----------|-----------|
25+
|Container images tag |`v1.30.0_2024-06-11`|
26+
|**CRD names and version:**| |
27+
|`activedirectoryconnectors.arcdata.microsoft.com`| v1beta1, v1beta2, v1, v2|
28+
|`datacontrollers.arcdata.microsoft.com`| v1beta1, v1 through v5|
29+
|`exporttasks.tasks.arcdata.microsoft.com`| v1beta1, v1, v2|
30+
|`failovergroups.sql.arcdata.microsoft.com`| v1beta1, v1beta2, v1, v2|
31+
|`kafkas.arcdata.microsoft.com`| v1beta1 through v1beta4|
32+
|`monitors.arcdata.microsoft.com`| v1beta1, v1, v3|
33+
|`postgresqls.arcdata.microsoft.com`| v1beta1 through v1beta6|
34+
|`postgresqlrestoretasks.tasks.postgresql.arcdata.microsoft.com`| v1beta1|
35+
|`sqlmanagedinstances.sql.arcdata.microsoft.com`| v1beta1, v1 through v13|
36+
|`sqlmanagedinstancemonitoringprofiles.arcdata.microsoft.com`| v1beta1, v1beta2|
37+
|`sqlmanagedinstancereprovisionreplicatasks.tasks.sql.arcdata.microsoft.com`| v1beta1|
38+
|`sqlmanagedinstancerestoretasks.tasks.sql.arcdata.microsoft.com`| v1beta1, v1|
39+
|`telemetrycollectors.arcdata.microsoft.com`| v1beta1 through v1beta5|
40+
|`telemetryrouters.arcdata.microsoft.com`| v1beta1 through v1beta5|
41+
|Azure Resource Manager (ARM) API version|2023-11-01-preview|
42+
|`arcdata` Azure CLI extension version|1.5.15 ([Download](https://aka.ms/az-cli-arcdata-ext))|
43+
|Arc-enabled Kubernetes helm chart extension version|1.30.0|
44+
|Azure Arc Extension for Azure Data Studio<br/>`arc`<br/>`azcli`|<br/>1.8.0 ([Download](https://aka.ms/ads-arcdata-ext))</br>1.8.0 ([Download](https://aka.ms/ads-azcli-ext))|
45+
|SQL Database version | 970 |
46+
2147
## April 9, 2024
2248

2349
|Component|Value|

‎articles/azure-functions/dotnet-isolated-in-process-differences.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Use the following table to compare feature and functional differences between th
2727

2828
| Feature/behavior | Isolated worker model | In-process model<sup>3</sup> |
2929
| ---- | ---- | ---- |
30-
| [Supported .NET versions](#supported-versions) | Long Term Support (LTS) versions,<br/>Standard Term Support (STS) versions,<br/>.NET Framework | Long Term Support (LTS) versions<sup>6</sup> |
30+
| [Supported .NET versions](#supported-versions) | Long Term Support (LTS) versions,<br/>Standard Term Support (STS) versions,<br/>.NET Framework | Long Term Support (LTS) versions, ending with .NET 8 |
3131
| Core packages | [Microsoft.Azure.Functions.Worker](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker/)<br/>[Microsoft.Azure.Functions.Worker.Sdk](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.Sdk) | [Microsoft.NET.Sdk.Functions](https://www.nuget.org/packages/Microsoft.NET.Sdk.Functions/) |
3232
| Binding extension packages | [Microsoft.Azure.Functions.Worker.Extensions.*](https://www.nuget.org/packages?q=Microsoft.Azure.Functions.Worker.Extensions) | [Microsoft.Azure.WebJobs.Extensions.*](https://www.nuget.org/packages?q=Microsoft.Azure.WebJobs.Extensions) |
3333
| Durable Functions | [Supported](durable/durable-functions-dotnet-isolated-overview.md)| [Supported](durable/durable-functions-overview.md) |
@@ -42,6 +42,7 @@ Use the following table to compare feature and functional differences between th
4242
| Cancellation tokens | [Supported](dotnet-isolated-process-guide.md#cancellation-tokens) | [Supported](functions-dotnet-class-library.md#cancellation-tokens) |
4343
| Cold start times<sup>2</sup> | [Configurable optimizations](./dotnet-isolated-process-guide.md#performance-optimizations) | Optimized |
4444
| ReadyToRun | [Supported](dotnet-isolated-process-guide.md#readytorun) | [Supported](functions-dotnet-class-library.md#readytorun) |
45+
| [Flex Consumption] | [Supported](./flex-consumption-plan.md#supported-language-stack-versions) | Not supported |
4546

4647
<sup>1</sup> When you need to interact with a service using parameters determined at runtime, using the corresponding service SDKs directly is recommended over using imperative bindings. The SDKs are less verbose, cover more scenarios, and have advantages for error handling and debugging purposes. This recommendation applies to both models.
4748

@@ -53,8 +54,6 @@ Use the following table to compare feature and functional differences between th
5354

5455
<sup>5</sup> ASP.NET Core types are not supported for .NET Framework.
5556

56-
<sup>6</sup> .NET 8 is not yet supported on the in-process model, though it is available on the isolated worker model. For information about .NET 8 plans, including future options for the in-process model, see the [Azure Functions Roadmap Update post](https://aka.ms/azure-functions-dotnet-roadmap).
57-
5857
[HttpRequest]: /dotnet/api/microsoft.aspnetcore.http.httprequest
5958
[IActionResult]: /dotnet/api/microsoft.aspnetcore.mvc.iactionresult
6059
[HttpRequestData]: /dotnet/api/microsoft.azure.functions.worker.http.httprequestdata?view=azure-dotnet&preserve-view=true

‎articles/azure-functions/functions-app-settings.md

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,16 @@ The following major runtime version values are supported:
390390
| `~2` | 2.x | No longer supported |
391391
| `~1` | 1.x | Support ends September 14, 2026 |
392392

393+
## FUNCTIONS\_INPROC\_NET8\_ENABLED
394+
395+
Indicates whether to an app can use .NET 8 on the in-process model. To use .NET 8 on the in-process model, this value must be set to `1`. See [Updating to target .NET 8](./functions-dotnet-class-library.md#updating-to-target-net-8) for complete instructions, including other required configuration values.
396+
397+
|Key|Sample value|
398+
|---|------------|
399+
|FUNCTIONS_INPROC_NET8_ENABLED|`1`|
400+
401+
Set to `0` to disable support for .NET 8 on the in-process model.
402+
393403
## FUNCTIONS\_NODE\_BLOCK\_ON\_ENTRY\_POINT\_ERROR
394404

395405
This app setting is a temporary way for Node.js apps to enable a breaking change that makes entry point errors easier to troubleshoot on Node.js v18 or lower. It's highly recommended to use `true`, especially for programming model v4 apps, which always use entry point files. The behavior without the breaking change (`false`) ignores entry point errors and doesn't log them in Application Insights.
@@ -405,11 +415,6 @@ For Node.js v18 or lower, the app setting can be used and the default behavior d
405415
|FUNCTIONS\_NODE\_BLOCK\_ON\_ENTRY\_POINT\_ERROR|`true`|Block on entry point errors and log them in Application Insights.|
406416
|FUNCTIONS\_NODE\_BLOCK\_ON\_ENTRY\_POINT\_ERROR|`false`|Ignore entry point errors and don't log them in Application Insights.|
407417

408-
## FUNCTIONS\_V2\_COMPATIBILITY\_MODE
409-
410-
>[!IMPORTANT]
411-
> This setting is no longer supported. It was originally provided to enable a short-term workaround for apps that targeted the v2.x runtime to be able to instead run on the v3.x runtime while it was still supported. Except for legacy apps that run on version 1.x, all function apps must run on version 4.x of the Functions runtime: `FUNCTIONS_EXTENSION_VERSION=~4`. For more information, see [Azure Functions runtime versions overview](functions-versions.md).
412-
413418
## FUNCTIONS\_REQUEST\_BODY\_SIZE\_LIMIT
414419

415420
Overrides the default limit on the body size of requests sent to HTTP endpoints. The value is given in bytes, with a default maximum request size of 104857600 bytes.
@@ -418,6 +423,11 @@ Overrides the default limit on the body size of requests sent to HTTP endpoints.
418423
|---|------------|
419424
|FUNCTIONS\_REQUEST\_BODY\_SIZE\_LIMIT |`250000000`|
420425

426+
## FUNCTIONS\_V2\_COMPATIBILITY\_MODE
427+
428+
>[!IMPORTANT]
429+
> This setting is no longer supported. It was originally provided to enable a short-term workaround for apps that targeted the v2.x runtime to be able to instead run on the v3.x runtime while it was still supported. Except for legacy apps that run on version 1.x, all function apps must run on version 4.x of the Functions runtime: `FUNCTIONS_EXTENSION_VERSION=~4`. For more information, see [Azure Functions runtime versions overview](functions-versions.md).
430+
421431
## FUNCTIONS\_WORKER\_PROCESS\_COUNT
422432

423433
Specifies the maximum number of language worker processes, with a default value of `1`. The maximum value allowed is `10`. Function invocations are evenly distributed among language worker processes. Language worker processes are spawned every 10 seconds until the count set by `FUNCTIONS_WORKER_PROCESS_COUNT` is reached. Using multiple language worker processes isn't the same as [scaling](functions-scale.md). Consider using this setting when your workload has a mix of CPU-bound and I/O-bound invocations. This setting applies to all language runtimes, except for .NET running in process (`FUNCTIONS_WORKER_RUNTIME=dotnet`).

‎articles/azure-functions/functions-dotnet-class-library.md

Lines changed: 59 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,62 @@ Azure Functions supports C# and C# script programming languages. If you're looki
2929

3030
[!INCLUDE [functions-dotnet-supported-versions](../../includes/functions-dotnet-supported-versions.md)]
3131

32+
### Updating to target .NET 8
33+
34+
> [!NOTE]
35+
> Targeting .NET 8 with the in-process model is not yet enabled for Linux, for apps hosted in App Service Environments, or for apps in sovereign clouds. Updates will be communicated on [this tracking thread on GitHub](https://github.com/Azure/azure-functions-host/issues/9951).
36+
37+
Apps using the in-process model can target .NET 8 by following the steps outlined in this section. However, if you choose to exercise this option, you should still begin planning your [migration to the isolated worker model](./migrate-dotnet-to-isolated-model.md) in advance of [support ending for the in-process model on November 10, 2026](https://aka.ms/azure-functions-retirements/in-process-model).
38+
39+
Many apps can change the configuration of the function app in Azure without updates to code or redeployment. To run .NET 8 with the in-process model, three configurations are required:
40+
41+
- The [application setting](./functions-how-to-use-azure-function-app-settings.md) `FUNCTIONS_WORKER_RUNTIME` must be set with the value "dotnet".
42+
- The application setting `FUNCTIONS_EXTENSION_VERSION` must be set with the value "~4".
43+
- The application setting `FUNCTIONS_INPROC_NET8_ENABLED` must be set with the value "1".
44+
- You must [update the stack configuration](./update-language-versions.md#update-the-stack-configuration) to reference .NET 8.
45+
46+
Support for .NET 8 still uses version 4.x of the Functions runtime, and no change to the configured runtime version is required.
47+
48+
To update your local project, first make sure you are using the latest versions of local tools. Then ensure that the project references [version 4.4.0 or later of Microsoft.NET.Sdk.Functions](https://www.nuget.org/packages/Microsoft.NET.Sdk.Functions/4.4.0). You can then change your `TargetFramework` to "net8.0". You must also update `local.settings.json` to include both `FUNCTIONS_WORKER_RUNTIME` set to "dotnet" and `FUNCTIONS_INPROC_NET8_ENABLED` set to "1".
49+
50+
The following is an example of a minimal `local.settings.json` file with these changes:
51+
52+
```xml
53+
<Project Sdk="Microsoft.NET.Sdk">
54+
<PropertyGroup>
55+
<TargetFramework>net8.0</TargetFramework>
56+
<AzureFunctionsVersion>V4</AzureFunctionsVersion>
57+
</PropertyGroup>
58+
<ItemGroup>
59+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.4.0" />
60+
</ItemGroup>
61+
<ItemGroup>
62+
<None Update="host.json">
63+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
64+
</None>
65+
<None Update="local.settings.json">
66+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
67+
<CopyToPublishDirectory>Never</CopyToPublishDirectory>
68+
</None>
69+
</ItemGroup>
70+
</Project>
71+
```
72+
73+
The following is an example of a minimal `local.settings.json` file with these changes:
74+
75+
```json
76+
{
77+
"IsEncrypted": false,
78+
"Values": {
79+
"AzureWebJobsStorage": "UseDevelopmentStorage=true",
80+
"FUNCTIONS_INPROC_NET8_ENABLED": "1",
81+
"FUNCTIONS_WORKER_RUNTIME": "dotnet"
82+
}
83+
}
84+
```
85+
86+
You might need to make other changes to your app based on the version support of its dependencies.
87+
3288
## Functions class library project
3389

3490
In Visual Studio, the **Azure Functions** project template creates a C# class library project that contains the following files:
@@ -165,11 +221,11 @@ The following example shows the relevant parts of the `.csproj` files that have
165221

166222
```xml
167223
<PropertyGroup>
168-
<TargetFramework>net6.0</TargetFramework>
224+
<TargetFramework>net8.0</TargetFramework>
169225
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
170226
</PropertyGroup>
171227
<ItemGroup>
172-
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.1" />
228+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.4.0" />
173229
</ItemGroup>
174230
```
175231

@@ -212,7 +268,7 @@ To compile your project as ReadyToRun, update your project file by adding the `<
212268

213269
```xml
214270
<PropertyGroup>
215-
<TargetFramework>net6.0</TargetFramework>
271+
<TargetFramework>net8.0</TargetFramework>
216272
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
217273
<PublishReadyToRun>true</PublishReadyToRun>
218274
<RuntimeIdentifier>win-x86</RuntimeIdentifier>

‎articles/azure-functions/functions-versions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ zone_pivot_groups: programming-languages-set-functions
1414
| Version | Support level | Description |
1515
| --- | --- | --- |
1616
| 4.x | GA | **_Recommended runtime version for functions in all languages._** Check out [Supported language versions](#languages). |
17-
| 1.x | GA ([support ends September 14, 2026](https://aka.ms/azure-functions-retirements/hostv1)) | Supported only for C# apps that must use .NET Framework. This version is in maintenance mode, with enhancements provided only in later versions. **Support will end for version 1.x on September 14, 2026.** We highly recommend you [migrate your apps to version 4.x](migrate-version-1-version-4.md?pivots=programming-language-csharp), which supports .NET Framework 4.8, .NET 6, .NET 7, and .NET 8.|
17+
| 1.x | GA ([support ends September 14, 2026](https://aka.ms/azure-functions-retirements/hostv1)) | Supported only for C# apps that must use .NET Framework. This version is in maintenance mode, with enhancements provided only in later versions. **Support will end for version 1.x on September 14, 2026.** We highly recommend you [migrate your apps to version 4.x](migrate-version-1-version-4.md?pivots=programming-language-csharp), which supports .NET Framework 4.8, .NET 6, and .NET 8.|
1818

1919
> [!IMPORTANT]
2020
> As of December 13, 2022, function apps running on versions 2.x and 3.x of the Azure Functions runtime have reached the end of extended support. For more information, see [Retired versions](#retired-versions).
@@ -131,7 +131,7 @@ In Visual Studio, you select the runtime version when you create a project. Azur
131131
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
132132
```
133133

134-
You can choose `net8.0`, `net6.0`, or `net48` as the target framework if you are using the [isolated worker model](dotnet-isolated-process-guide.md). If you are using the [in-process model](./functions-dotnet-class-library.md), you can only choose `net6.0`, and you must include the `Microsoft.NET.Sdk.Functions` extension set to at least `4.0.0`.
134+
You can choose `net8.0`, `net6.0`, or `net48` as the target framework if you are using the [isolated worker model](dotnet-isolated-process-guide.md). If you are using the [in-process model](./functions-dotnet-class-library.md), you can choose `net8.0` or `net6.0`, and you must include the `Microsoft.NET.Sdk.Functions` extension set to at least `4.4.0`.
135135

136136
.NET 7 was previously supported on the isolated worker model but reached the end of official support on [May 14, 2024][dotnet-policy].
137137

0 commit comments

Comments
 (0)