Merge pull request #251160 from baanders/9-12-e2e

ADT: Update E2E tutorial

Author: v-shils

articles/digital-twins/media/tutorial-end-to-end/publish-zip.png

@@ -4,11 +4,12 @@ titleSuffix: Azure Digital Twins
 description: Follow this tutorial to learn how to build out an end-to-end Azure Digital Twins solution that's driven by device data.
 author: baanders
 ms.author: baanders # Microsoft employees only
-ms.date: 09/26/2022
+ms.date: 09/12/2023
 ms.topic: tutorial
 ms.service: digital-twins
 ms.custom: engagement-fy23, devx-track-azurecli
 
+# CustomerIntent: As a developer, I want to create a data flow from devices through Azure Digital Twins so that I can have a connected digital twin solution.
 # Optional fields. Don't forget to remove # if you need a field.
 # ms.custom: can-be-multiple-comma-separated
 # manager: MSFT-alias-of-manager-or-PM-counterpart
@@ -25,7 +26,7 @@ In this tutorial, you will...
 > * Use an [Azure Functions](../azure-functions/functions-overview.md) app to route simulated telemetry from an [IoT Hub](../iot-hub/about-iot-hub.md) device into digital twin properties
 > * Propagate changes through the twin graph by processing digital twin notifications with Azure Functions, endpoints, and routes
 
-[!INCLUDE [Azure Digital Twins tutorial: sample prerequisites](../../includes/digital-twins-tutorial-sample-prereqs.md)]
+[!INCLUDE [Sample prerequisites for Azure Digital Twins tutorial](../../includes/digital-twins-tutorial-sample-prereqs.md)]
 
 [!INCLUDE [azure-cli-prepare-your-environment.md](~/articles/reusable-content/azure-cli/azure-cli-prepare-your-environment-h3.md)]
 
@@ -99,7 +100,7 @@ The function app is part of the sample project you downloaded, located in the *d
 
 ### Publish the app
 
-To publish the function app to Azure, you'll need to create a storage account, then create the function app in Azure, and finally publish the functions to the Azure function app. This section completes these actions using the Azure CLI.
+To publish the function app to Azure, you'll need to create a storage account, then create the function app in Azure, and finally publish the functions to the Azure function app. This section completes these actions using the Azure CLI. In each command, replace any placeholders in angle brackets with the details for your own resources.
 
 1. Create an Azure storage account by running the following command:
 
@@ -110,7 +111,7 @@ To publish the function app to Azure, you'll need to create a storage account, t
 1. Create an Azure function app by running the following command:
 
     ```azurecli-interactive
-    az functionapp create --name <name-for-new-function-app> --storage-account <name-of-storage-account-from-previous-step> --functions-version 4 --consumption-plan-location <location> --runtime dotnet --runtime-version 6 --resource-group <resource-group>
+    az functionapp create --name <name-for-new-function-app> --storage-account <name-of-storage-account-from-previous-step> --functions-version 4 --consumption-plan-location <location> --runtime dotnet-isolated --runtime-version 7 --resource-group <resource-group>
     ```
 
 1. Next, you'll zip up the functions and publish them to your new Azure function app.
@@ -120,22 +121,17 @@ To publish the function app to Azure, you'll need to create a storage account, t
     1. In the console, run the following command to publish the project locally:
 
         ```cmd/sh
-        dotnet publish -c Release
+        dotnet publish -c Release -o publish
         ```
 
-        This command publishes the project to the *digital-twins-samples-main\AdtSampleApp\SampleFunctionsApp\bin\Release\netcoreapp3.1\publish* directory.
+        This command publishes the project to the *digital-twins-samples-main\AdtSampleApp\SampleFunctionsApp\publish* directory.
 
-    1. Using your preferred method, create a zip of the published files that are located in the *digital-twins-samples-main\AdtSampleApp\SampleFunctionsApp\bin\Release\netcoreapp3.1\publish* directory. Name the zipped folder *publish.zip*.
+    1. Using your preferred method, create a zip of the published files that are located **inside** the *digital-twins-samples-main\AdtSampleApp\SampleFunctionsApp\publish* directory. Name the zipped folder *publish.zip*.
         
-        >[!TIP] 
-        >If you're using PowerShell, you can create the zip by copying the full path to that *\publish* directory and pasting it into the following command:
-        >
-        >```powershell
-        >Compress-Archive -Path <full-path-to-publish-directory>\* -DestinationPath .\publish.zip
-        >```
-        > The cmdlet will create the *publish.zip* file in the directory location of your console.
+        >[!IMPORTANT] 
+        >Make sure the zipped folder does not include an extra layer for the *publish* folder itself. It should only contain the contents that were inside the *publish* folder.
 
-        Your *publish.zip* file should contain folders for *bin*, *ProcessDTRoutedData*, and *ProcessHubToDTEvents*, and there should also be a *host.json* file.
+        Here's an image of how the zip contents might look (it may change depending on your version of .NET).
 
         :::image type="content" source="media/tutorial-end-to-end/publish-zip.png" alt-text="Screenshot of File Explorer in Windows showing the contents of the publish zip folder.":::
 
@@ -193,7 +189,7 @@ The first setting gives the function app the **Azure Digital Twins Data Owner**
 
 The result of this command is outputted information about the role assignment you've created. The function app now has permissions to access data in your Azure Digital Twins instance.
 
-#### Configure application settings
+#### Configure application setting
 
 The second setting creates an environment variable for the function with the URL of your Azure Digital Twins instance. The function code will use the value of this variable to refer to your instance. For more information about environment variables, see [Manage your function app](../azure-functions/functions-how-to-use-azure-function-app-settings.md?tabs=portal). 
 
@@ -273,7 +269,7 @@ The output is information about the device that was created.
 
 Next, configure the device simulator to send data to your IoT Hub instance.
 
-Begin by getting the IoT hub connection string with this command:
+Begin by getting the IoT hub connection string with the following command. The connection string value will start with `HostName=`.
 
 ```azurecli-interactive
 az iot hub connection-string show --hub-name <your-IoT-hub-name>
@@ -320,6 +316,10 @@ The *ProcessHubToDTEvents* function you published earlier listens to the IoT Hub
 
 To see the data from the Azure Digital Twins side, switch to your other console window that's open to the *AdtSampleApp\SampleClientApp* folder. Run the *SampleClientApp* project with `dotnet run`.
 
+```cmd/sh
+dotnet run
+```
+
 Once the project is running and accepting commands, run the following command to get the temperatures being reported by the digital twin thermostat67:
 
 ```cmd/sh
@@ -397,7 +397,7 @@ Here's a review of the scenario that you built in this tutorial.
 2. Simulated device telemetry is sent to IoT Hub, where the *ProcessHubToDTEvents* Azure function is listening for telemetry events. The *ProcessHubToDTEvents* Azure function uses the information in these events to set the `Temperature` property on thermostat67 (**arrow B** in the diagram).
 3. Property change events in Azure Digital Twins are routed to an Event Grid topic, where the *ProcessDTRoutedData* Azure function is listening for events. The *ProcessDTRoutedData* Azure function uses the information in these events to set the `Temperature` property on room21 (**arrow C** in the diagram).
 
-:::image type="content" source="media/tutorial-end-to-end/building-scenario.png" alt-text="Diagram of the full building scenario, which shows the data flowing from a device into and out of Azure Digital Twins through various Azure services.":::
+:::image type="content" source="media/tutorial-end-to-end/building-scenario.png" alt-text="Diagram from the beginning of the article showing the full building scenario.":::
 
 ## Clean up resources
 

articles/digital-twins/tutorial-end-to-end.md

@@ -3,15 +3,15 @@ author: baanders
 description: prerequisites for Azure Digital Twins tutorials
 ms.service: digital-twins
 ms.topic: include
-ms.date: 9/26/2022
+ms.date: 9/12/2023
 ms.author: baanders
 ---
 
 ## Prerequisites
 
 Before beginning this tutorial, start with these prerequisites:
 * If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
-* This tutorial uses .NET Core 3.1. You can download this version of the .NET Core SDK for multiple platforms from [Download .NET Core 3.1](https://dotnet.microsoft.com/download/dotnet-core/3.1).
+* This tutorial uses .NET. You can download the latest version of the .NET SDK for multiple platforms from [Download .NET](https://dotnet.microsoft.com/download).
 
 Then, continue through the rest of this section to set up the remaining prerequisites.