Skip to content

Commit a5fa590

Browse files
authored
Merge pull request #205010 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents 6458026 + 4d9b457 commit a5fa590

File tree

40 files changed

+312
-132
lines changed

40 files changed

+312
-132
lines changed

articles/active-directory/saas-apps/aws-single-sign-on-tutorial.md

Lines changed: 49 additions & 49 deletions
Large diffs are not rendered by default.
-1.58 KB
Loading
28.7 KB
Loading
5.17 KB
Loading
-44 KB
Loading

articles/active-directory/saas-apps/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
href: awarego-tutorial.md
238238
- name: AWS ClientVPN
239239
href: aws-clientvpn-tutorial.md
240-
- name: AWS Single Sign-On
240+
- name: AWS IAM Identity Center
241241
href: aws-single-sign-on-tutorial.md
242242
- name: Axiad Cloud
243243
href: axiad-cloud-tutorial.md

articles/aks/azure-disk-volume.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ following command:
132132
metadata:
133133
name: mypod
134134
spec:
135+
nodeSelector:
136+
kubernetes.io/os: linux
135137
containers:
136138
- image: mcr.microsoft.com/oss/nginx/nginx:1.15.5-alpine
137139
name: mypod

articles/aks/azure-files-volume.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ kind: Pod
7878
metadata:
7979
name: mypod
8080
spec:
81+
nodeSelector:
82+
kubernetes.io/os: linux
8183
containers:
8284
- image: mcr.microsoft.com/oss/nginx/nginx:1.15.5-alpine
8385
name: mypod
@@ -95,6 +97,7 @@ spec:
9597
- name: azure
9698
csi:
9799
driver: file.csi.azure.com
100+
readOnly: false
98101
volumeAttributes:
99102
secretName: azure-secret # required
100103
shareName: aksshare # required

articles/azure-functions/create-first-function-cli-csharp.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,10 @@ In Azure Functions, a function project is a container for one or more individual
8080
# [Isolated process](#tab/isolated-process)
8181

8282
```console
83-
func init LocalFunctionProj --worker-runtime dotnet-isolated
83+
func init LocalFunctionProj --worker-runtime dotnet-isolated --target-framework net6.0
8484
```
8585
---
86+
8687

8788
1. Navigate into the project folder:
8889

articles/azure-functions/dotnet-isolated-process-guide.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ description: Learn how to use a .NET isolated process to run your C# functions i
44

55
ms.service: azure-functions
66
ms.topic: conceptual
7-
ms.date: 05/24/2022
7+
ms.date: 07/06/2022
88
ms.custom: template-concept
99
recommendations: false
1010
#Customer intent: As a developer, I need to know how to create functions that run in an isolated process so that I can run my function code on current (not LTS) releases of .NET.
1111
---
1212

1313
# Guide for running C# Azure Functions in an isolated process
1414

15-
This article is an introduction to using C# to develop .NET isolated process functions, which run out-of-process in Azure Functions. Running out-of-process lets you decouple your function code from the Azure Functions runtime. Isolated process C# functions run on .NET 5.0, .NET 6.0, and .NET Framework 4.8 (preview support). [In-process C# class library functions](functions-dotnet-class-library.md) aren't supported on .NET 5.0.
15+
This article is an introduction to using C# to develop .NET isolated process functions, which run out-of-process in Azure Functions. Running out-of-process lets you decouple your function code from the Azure Functions runtime. Isolated process C# functions run on .NET 6.0, .NET 7.0, and .NET Framework 4.8 (preview support). [In-process C# class library functions](functions-dotnet-class-library.md) aren't supported on .NET 7.0.
1616

1717
| Getting started | Concepts| Samples |
1818
|--|--|--|
1919
| <ul><li>[Using Visual Studio Code](create-first-function-vs-code-csharp.md?tabs=isolated-process)</li><li>[Using command line tools](create-first-function-cli-csharp.md?tabs=isolated-process)</li><li>[Using Visual Studio](functions-create-your-first-function-visual-studio.md?tabs=isolated-process)</li></ul> | <ul><li>[Hosting options](functions-scale.md)</li><li>[Monitoring](functions-monitoring.md)</li> | <ul><li>[Reference samples](https://github.com/Azure/azure-functions-dotnet-worker/tree/main/samples)</li></ul> |
2020

2121
## Why .NET isolated process?
2222

23-
Previously Azure Functions has only supported a tightly integrated mode for .NET functions, which run [as a class library](functions-dotnet-class-library.md) in the same process as the host. This mode provides deep integration between the host process and the functions. For example, .NET class library functions can share binding APIs and types. However, this integration also requires a tighter coupling between the host process and the .NET function. For example, .NET functions running in-process are required to run on the same version of .NET as the Functions runtime. To enable you to run outside these constraints, you can now choose to run in an isolated process. This process isolation also lets you develop functions that use current .NET releases (such as .NET 5.0), not natively supported by the Functions runtime. Both isolated process and in-process C# class library functions run on .NET 6.0. To learn more, see [Supported versions](#supported-versions).
23+
Previously Azure Functions has only supported a tightly integrated mode for .NET functions, which run [as a class library](functions-dotnet-class-library.md) in the same process as the host. This mode provides deep integration between the host process and the functions. For example, .NET class library functions can share binding APIs and types. However, this integration also requires a tighter coupling between the host process and the .NET function. For example, .NET functions running in-process are required to run on the same version of .NET as the Functions runtime. To enable you to run outside these constraints, you can now choose to run in an isolated process. This process isolation also lets you develop functions that use current .NET releases (such as .NET 7.0), not natively supported by the Functions runtime. Both isolated process and in-process C# class library functions run on .NET 6.0. To learn more, see [Supported versions](#supported-versions).
2424

2525
Because these functions run in a separate process, there are some [feature and functionality differences](#differences-with-net-class-library-functions) between .NET isolated function apps and .NET class library function apps.
2626

@@ -47,7 +47,7 @@ A .NET isolated function project is basically a .NET console app project that ta
4747
For complete examples, see the [.NET 6 isolated sample project](https://github.com/Azure/azure-functions-dotnet-worker/tree/main/samples/FunctionApp) and the [.NET Framework 4.8 isolated sample project](https://github.com/Azure/azure-functions-dotnet-worker/tree/main/samples/NetFxWorker).
4848

4949
> [!NOTE]
50-
> To be able to publish your isolated function project to either a Windows or a Linux function app in Azure, you must set a value of `dotnet-isolated` in the remote [FUNCTIONS_WORKER_RUNTIME](functions-app-settings.md#functions_worker_runtime) application setting. To support [zip deployment](deployment-zip-push.md) and [running from the deployment package](run-functions-from-deployment-package.md) on Linux, you also need to update the `linuxFxVersion` site config setting to `DOTNET-ISOLATED|6.0`. To learn more, see [Manual version updates on Linux](set-runtime-version.md#manual-version-updates-on-linux).
50+
> To be able to publish your isolated function project to either a Windows or a Linux function app in Azure, you must set a value of `dotnet-isolated` in the remote [FUNCTIONS_WORKER_RUNTIME](functions-app-settings.md#functions_worker_runtime) application setting. To support [zip deployment](deployment-zip-push.md) and [running from the deployment package](run-functions-from-deployment-package.md) on Linux, you also need to update the `linuxFxVersion` site config setting to `DOTNET-ISOLATED|7.0`. To learn more, see [Manual version updates on Linux](set-runtime-version.md#manual-version-updates-on-linux).
5151
5252
## Package references
5353

@@ -251,7 +251,7 @@ This section describes the current state of the functional and behavioral differ
251251

252252
| Feature/behavior | In-process | Out-of-process |
253253
| ---- | ---- | ---- |
254-
| .NET versions | .NET Core 3.1<br/>.NET 6.0 | .NET 5.0<br/>.NET 6.0<br/>.NET Framework 4.8 (Preview) |
254+
| .NET versions | .NET Core 3.1<br/>.NET 6.0 | .NET 6.0<br/>.NET 7.0 (Preview)<br/>.NET Framework 4.8 (Preview) |
255255
| Core packages | [Microsoft.NET.Sdk.Functions](https://www.nuget.org/packages/Microsoft.NET.Sdk.Functions/) | [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) |
256256
| Binding extension packages | [Microsoft.Azure.WebJobs.Extensions.*](https://www.nuget.org/packages?q=Microsoft.Azure.WebJobs.Extensions) | Under [Microsoft.Azure.Functions.Worker.Extensions.*](https://www.nuget.org/packages?q=Microsoft.Azure.Functions.Worker.Extensions) |
257257
| Logging | [ILogger] passed to the function | [ILogger] obtained from [FunctionContext] |

0 commit comments

Comments
 (0)