Merge branch 'durable-v4-model' of github.com:hossam-nasr/azure-docs-pr into durable-v4-model

hossam-nasr · hossam-nasr · commit ac960dea68cd · 2023-03-23T10:13:20.000-07:00
diff --git a/articles/azure-functions/durable/durable-functions-cloud-backup.md b/articles/azure-functions/durable/durable-functions-cloud-backup.md
@@ -130,7 +130,7 @@ The function uses the `readdirp` module (version 2.x) to recursively read the di
 
 Here is the implementation of the `getFileList` activity function:
 
-:::code language="javascript" source="~/azure-functions-durable-js-v3/samples-js/functions/backupSiteContent.js" range="1,7,36-48":::
+:::code language="javascript" source="~/azure-functions-durable-js-v3/samples-js/functions/backupSiteContent.js" range="1,3,7,36-48":::
 
 The function uses the `readdirp` module (version `3.x`) to recursively read the directory structure.
 
diff --git a/articles/azure-functions/durable/durable-functions-orchestrations.md b/articles/azure-functions/durable/durable-functions-orchestrations.md
@@ -20,11 +20,6 @@ Durable Functions is an extension of [Azure Functions](../functions-overview.md)
 
 This article gives you an overview of orchestrator functions and how they can help you solve various app development challenges. If you are not already familiar with the types of functions available in a Durable Functions app, read the [Durable Function types](durable-functions-types-features-overview.md) article first.
 
-> [!NOTE]
-> The new programming model for authoring Functions in Node.js (V4) is currently in preview. Compared to the current model, the new experience is designed to be more idiomatic and intuitive for JavaScript and TypeScript developers. To learn more, see the Azure Functions Node.js [developer guide](../functions-reference-node.md?pivots=nodejs-model-v4).
->
-> In the following code snippets, JavaScript (PM4) denotes programming model V4, the new experience.
-
 ## Orchestration identity
 
 Each *instance* of an orchestration has an instance identifier (also known as an *instance ID*). By default, each instance ID is an autogenerated GUID. However, instance IDs can also be any user-generated string value. Each orchestration instance ID must be unique within a [task hub](durable-functions-task-hubs.md).
@@ -59,6 +54,11 @@ When an orchestration function is given more work to do (for example, a response
 
 The event-sourcing behavior of the Durable Task Framework is closely coupled with the orchestrator function code you write. Suppose you have an activity-chaining orchestrator function, like the following orchestrator function:
 
+> [!NOTE]
+> The new programming model for authoring Functions in Node.js (V4) is currently in preview. Compared to the current model, the new experience is designed to be more idiomatic and intuitive for JavaScript and TypeScript developers. To learn more, see the Azure Functions Node.js [developer guide](../functions-reference-node.md?pivots=nodejs-model-v4).
+>
+> In the following code snippets, JavaScript (PM4) denotes programming model V4, the new experience.
+
 # [C# (InProc)](#tab/csharp-inproc)
 
 ```csharp
diff --git a/articles/azure-functions/durable/durable-functions-sequence.md b/articles/azure-functions/durable/durable-functions-sequence.md
@@ -68,7 +68,7 @@ The `context` object contains a `df` durable orchestration context object that l
 
 :::code language="javascript" source="~/azure-functions-durable-js-v3/samples-js/functions/sayHello.js" range="1-14":::
 
-All JavaScript orchestration functions must include the [`durable-functions` module](https://www.npmjs.com/package/durable-functions). This module enables you to write Durable Functions in JavaScript. To use the V4 node programming model, you need to install the preview `v3.x` of `durable-functions`. 
+All JavaScript orchestration functions must include the [`durable-functions` module](https://www.npmjs.com/package/durable-functions). This module enables you to write Durable Functions in JavaScript. To use the V4 node programming model, you need to install the preview `v3.x` version of `durable-functions`. 
 
 There are two significant differences between an orchestrator function and other JavaScript functions:
 
diff --git a/articles/azure-functions/durable/quickstart-js-vscode.md b/articles/azure-functions/durable/quickstart-js-vscode.md
@@ -30,7 +30,12 @@ To complete this tutorial:
 
 * Install [Visual Studio Code](https://code.visualstudio.com/download).
 
+::: zone pivot="nodejs-model-v3"
 * Install the [Azure Functions](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azurefunctions) VS Code extension
+::: zone-end
+::: zone pivot="nodejs-model-v4"
+* Install the [Azure Functions](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azurefunctions) VS Code extension version `1.10.4` or above.
+::: zone-end
 
 ::: zone pivot="nodejs-model-v3"
 * Make sure you have the latest version of the [Azure Functions Core Tools](../functions-run-local.md).
@@ -87,7 +92,7 @@ In this section, you use Visual Studio Code to create a local Azure Functions pr
 
 Visual Studio Code installs the Azure Functions Core Tools, if needed. It also creates a function app project in a folder. This project contains the [host.json](../functions-host-json.md) and [local.settings.json](../functions-develop-local.md#local-settings-file) configuration files.
 
-A package.json file is also created in the root folder.
+A `package.json` file is also created in the root folder.
 
 ## Install the Durable Functions npm package
 
@@ -96,7 +101,7 @@ To work with Durable Functions in a Node.js function app, you use a library call
 To use the V4 programming model, you need to install the preview `v3.x` version of `durable-functions`.
 ::: zone-end
 
-1. Use the *View* menu or <kbd>Ctrl+Shift+`</kbd> to open a new terminal in VS Code.
+1. Use the *View* menu or <kbd>Ctrl + Shift + `</kbd> to open a new terminal in VS Code.
 
 ::: zone pivot="nodejs-model-v3"
 2. Install the `durable-functions` npm package by running `npm install durable-functions` in the root directory of the function app.
@@ -195,7 +200,7 @@ You now have a Durable Functions app that can be run locally and deployed to Azu
 ::: zone pivot="nodejs-model-v4"
 
 > [!NOTE]
-> To run the V4 programming model, your app needs to have the `EnableWorkerIndexing` feature flag set. When running locally, this should have already been set in your `local.settings.json` file when creating your project.  To verify, check the following line exists in your `local.settings.json` file. If it doesn't, add it to your file.
+> To run the V4 programming model, your app needs to have the `EnableWorkerIndexing` feature flag set. When running locally, you need to set `AzureWebJobsFeaturesFlags` to value of `EnableWorkerIndexing` in your `local.settings.json` file. This should already be set when creating your project.  To verify, check the following line exists in your `local.settings.json` file, and add it if it doesn't.
 >
 > ```json
 > "AzureWebJobsFeatureFlags": "EnableWorkerIndexing"
@@ -298,7 +303,7 @@ After you've verified that the function runs correctly on your local computer, i
 To enable your V4 programming model app to run in Azure, you need to add the `EnableWorkerIndexing` flag under the `AzureWebJobsFeatureFlags` app setting.
 
 1. In Visual Studio Code, press <kbd>F1</kbd> to open the command palette. In the command palette, search for and select `Azure Functions: Add New Setting...`.
-2. Choose your new function app, type `AzureWebJobsFeatureFlags` for the new app setting name, and press <kbd>Enter</kbd>.
+2. Choose your new function app, then type `AzureWebJobsFeatureFlags` for the new app setting name, and press <kbd>Enter</kbd>.
 3. For the value, type `EnableWorkerIndexing` and press <kbd>Enter</kbd>.
 
 ::: zone-end
diff --git a/articles/azure-functions/durable/quickstart-ts-vscode.md b/articles/azure-functions/durable/quickstart-ts-vscode.md
@@ -30,7 +30,12 @@ To complete this tutorial:
 
 * Install [Visual Studio Code](https://code.visualstudio.com/download).
 
+::: zone pivot="nodejs-model-v3"
 * Install the [Azure Functions](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azurefunctions) VS Code extension
+::: zone-end
+::: zone pivot="nodejs-model-v4"
+* Install the [Azure Functions](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azurefunctions) VS Code extension version `1.10.4` or above.
+::: zone-end
 
 ::: zone pivot="nodejs-model-v3"
 * Make sure you have the latest version of the [Azure Functions Core Tools](../functions-run-local.md).
@@ -55,7 +60,7 @@ To complete this tutorial:
 
 In this section, you use Visual Studio Code to create a local Azure Functions project. 
 
-1. In Visual Studio Code, press <kbd>F1</kbd> (or <kbd>Ctrl/Cmd+Shift+P</kbd>) to open the command palette. In the command palette, search for and select `Azure Functions: Create New Project...`.
+1. In Visual Studio Code, press <kbd>F1</kbd> (or <kbd>Ctrl/Cmd + Shift + P</kbd>) to open the command palette. In the command palette, search for and select `Azure Functions: Create New Project...`.
 
     ![Screenshot of the Visual Studio Code command palette. The command titled "Azure Functions: Create New Project..." is highlighted.](media/quickstart-js-vscode/functions-create-project.png)
 
@@ -88,7 +93,7 @@ In this section, you use Visual Studio Code to create a local Azure Functions pr
 
 Visual Studio Code installs the Azure Functions Core Tools, if needed. It also creates a function app project in a folder. This project contains the [host.json](../functions-host-json.md) and [local.settings.json](../functions-develop-local.md#local-settings-file) configuration files.
 
-A `package.json` and a `tsconfig.json` file are also created in the root folder.
+A `package.json` file and a `tsconfig.json` file are also created in the root folder.
 
 ## Install the Durable Functions npm package
 
@@ -97,7 +102,7 @@ To work with Durable Functions in a Node.js function app, you use a library call
 To use the V4 programming model, you need to install the preview `v3.x` version of `durable-functions`.
 ::: zone-end
 
-1. Use the *View* menu or <kbd>Ctrl+Shift+`</kbd> to open a new terminal in VS Code.
+1. Use the *View* menu or <kbd>Ctrl + Shift + `</kbd> to open a new terminal in VS Code.
 
 ::: zone pivot="nodejs-model-v3"
 2. Install the `durable-functions` npm package by running `npm install durable-functions` in the root directory of the function app.
@@ -198,7 +203,7 @@ Azure Functions Core Tools lets you run an Azure Functions project on your local
 ::: zone pivot="nodejs-model-v4"
 
 > [!NOTE]
-> To run the V4 programming model, your app needs to have the `EnableWorkerIndexing` feature flag set. When running locally, this should have already been set in your `local.settings.json` file when creating your project.  To verify, check the following line exists in your `local.settings.json` file. If it doesn't, add it to your file.
+> To run the V4 programming model, your app needs to have the `EnableWorkerIndexing` feature flag set. When running locally, you need to set `AzureWebJobsFeaturesFlags` to value of `EnableWorkerIndexing` in your `local.settings.json` file. This should already be set when creating your project.  To verify, check the following line exists in your `local.settings.json` file, and add it if it doesn't.
 >
 > ```json
 > "AzureWebJobsFeatureFlags": "EnableWorkerIndexing"
@@ -300,7 +305,7 @@ After you've verified that the function runs correctly on your local computer, i
 To enable your V4 programming model app to run in Azure, you need to add the `EnableWorkerIndexing` flag under the `AzureWebJobsFeatureFlags` app setting.
 
 1. In Visual Studio Code, press <kbd>F1</kbd> to open the command palette. In the command palette, search for and select `Azure Functions: Add New Setting...`.
-2. Choose your new function app, type `AzureWebJobsFeatureFlags` for the new app setting name, and press <kbd>Enter</kbd>.
+2. Choose your new function app, then type `AzureWebJobsFeatureFlags` for the new app setting name, and press <kbd>Enter</kbd>.
 3. For the value, type `EnableWorkerIndexing` and press <kbd>Enter</kbd>.'
 
 ::: zone-end
