Merge pull request #100760 from dominicbetts/pnp-build-updates

Update C build instructions

Author: v-albemi

articles/iot-pnp/quickstart-create-pnp-device-windows.md

@@ -82,9 +82,9 @@ In this quickstart, you use the [Vcpkg](https://github.com/microsoft/vcpkg) libr
 
 In this quickstart, you use an existing sample device capability model and associated interfaces.
 
-1. Create a `pnp_app` directory in your local drive. You use this folder for the device model files and device code stub.
+1. Create a `pnp_app` folder in your local drive. You use this folder for the device model files and device code stub.
 
-1. Download the [device capability model and interface sample files](https://github.com/Azure/IoTPlugandPlay/blob/master/samples/SampleDevice.capabilitymodel.json) and [interface sample](https://github.com/Azure/IoTPlugandPlay/blob/master/samples/EnvironmentalSensor.interface.json) and save files into `pnp_app` folder.
+1. Download the [device capability model and interface sample files](https://github.com/Azure/IoTPlugandPlay/blob/master/samples/SampleDevice.capabilitymodel.json) and [interface sample](https://github.com/Azure/IoTPlugandPlay/blob/master/samples/EnvironmentalSensor.interface.json) and save the files into the `pnp_app` folder.
 
     > [!TIP]
     > To download a file from GitHub, navigate to the file, right-click on **Raw**, and then select **Save link as**.
@@ -106,7 +106,7 @@ Now that you have a DCM and its associated interfaces, you can generate the devi
 
 1. Choose the **SampleDevice.capabilitymodel.json** file to use for generating the device code stub.
 
-1. Enter the project name **sample_device**. This will be the name of your device application.
+1. Enter the project name **sample_device**. This is the name of your device application.
 
 1. Choose **ANSI C** as your language.
 
@@ -121,7 +121,7 @@ Now that you have a DCM and its associated interfaces, you can generate the devi
 
 ## Build and run the code
 
-You use the device SDK source code to build the generated device code stub. The application you build simulates a device that connects to an IoT hub. The application sends telemetry and properties and receives commands.
+You use the Vcpkg package to build the generated device code stub. The application you build simulates a device that connects to an IoT hub. The application sends telemetry and properties and receives commands.
 
 1. Create a `cmake` subdirectory in the `sample_device` folder, and navigate to that folder:
 

articles/iot-pnp/tutorial-build-device-certification.md

@@ -30,7 +30,7 @@ To complete this tutorial, you need:
 - [Visual Studio Code](https://code.visualstudio.com/download)
 - [Azure IoT Tools for VS Code](https://marketplace.visualstudio.com/items?itemName=vsciot-vscode.azure-iot-tools) extension pack
 
-You also need the IoT Plug and Play device that you create in the [Quickstart: Use a device capability model to create a device](quickstart-create-pnp-device-windows.md).
+You also need to complete the [Use a device capability model to create a device](quickstart-create-pnp-device-windows.md) quickstart for Windows. The quickstart shows you how to set up your development environment using Vcpkg and create a sample project.
 
 ## Store a capability model and interfaces
 
@@ -102,20 +102,53 @@ To certify the device, it must enable provisioning through the [Azure IoT Device
 
 1. Choose the DCM file you want to use to generate the device code stub.
 
-1. Enter the project name, this is the name of your device application.
+1. Enter the project name, such as **sample_device**. This is the name of your device application.
 
 1. Choose **ANSI C** as the language.
 
 1. Choose **Via DPS (Device Provisioning Service) symmetric key** as connection method.
 
-1. Choose **CMake Project on Windows** or **CMake Project on Linux** as project template depending on your device OS.
+1. Choose **CMake Project on Windows** as your project template.
+
+1. Choose **Via Vcpkg** as the way to include the device SDK.
 
 1. VS Code opens a new window with generated device code stub files.
 
-1. After building the code, enter the DPS credentials (**DPS ID Scope**, **DPS Symmetric Key**, **Device Id**) as parameters for the application. To get the credentials from certification portal, see [Connect and test your IoT Plug and Play device](tutorial-certification-test.md#connect-and-discover-interfaces).
+## Build and run the code
 
-    ```cmd/sh
-    .\your_pnp_app.exe [DPS ID Scope] [DPS symmetric key] [device ID]
+You use the Vcpkg package to build the generated device code stub. The application you build simulates a device that connects to an IoT hub. The application sends telemetry and properties and receives commands.
+
+1. Create a `cmake` subdirectory in the `sample_device` folder, and navigate to that folder:
+
+    ```cmd
+    mkdir cmake
+    cd cmake
+    ```
+
+1. Run the following commands to build the generated code stub (replacing the placeholder with the directory of your Vcpkg repo):
+
+    ```cmd
+    cmake .. -G "Visual Studio 16 2019" -A Win32 -Duse_prov_client=ON -Dhsm_type_symm_key:BOOL=ON -DCMAKE_TOOLCHAIN_FILE="<directory of your Vcpkg repo>\scripts\buildsystems\vcpkg.cmake"
+
+    cmake --build .
+    ```
+    
+    > [!NOTE]
+    > If you are using Visual Studio 2017 or 2015, you need to specify the CMake generator based on the build tools you are using:
+    >```cmd
+    ># Either
+    >cmake .. -G "Visual Studio 15 2017" -Duse_prov_client=ON -Dhsm_type_symm_key:BOOL=ON -DCMAKE_TOOLCHAIN_FILE="{directory of your Vcpkg repo}\scripts\buildsystems\vcpkg.cmake"
+    ># or
+    >cmake .. -G "Visual Studio 14 2015" -Duse_prov_client=ON -Dhsm_type_symm_key:BOOL=ON -DCMAKE_TOOLCHAIN_FILE="{directory of your Vcpkg repo}\scripts\buildsystems\vcpkg.cmake"
+    >```
+
+    > [!NOTE]
+    > If cmake can't find your C++ compiler, you get build errors when you run the previous command. If that happens, try running this command at the [Visual Studio command prompt](https://docs.microsoft.com/dotnet/framework/tools/developer-command-prompt-for-vs).
+
+1. After the build completes successfully, enter the DPS credentials (**DPS ID Scope**, **DPS Symmetric Key**, **Device Id**) as parameters for the application. To get the credentials from certification portal, see [Connect and test your IoT Plug and Play device](tutorial-certification-test.md#connect-and-discover-interfaces).
+
+    ```cmd\sh
+    .\Debug\sample_device.exe [Device ID] [DPS ID Scope] [DPS symmetric key]
     ```
 
 ### Implement standard interfaces