Update device tutorial

Author: dominicbetts

articles/iot-central/preview/tutorial-connect-pnp-device.md

@@ -31,7 +31,7 @@ Complete the [Create an Azure IoT Central application (preview features)](./quic
 
 To complete this tutorial, you need to install the following software on your local machine:
 
-* [Visual Studio (Community, Professional, or Enterprise)](https://visualstudio.microsoft.com/downloads/) - make sure that you include the **NuGet package manager** component and the **Desktop Development with C++** workload when you install Visual Studio.
+* [Build Tools for Visual Studio](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools&rel=16) with **C++ build tools** and **Nuget package manager component** workloads. Or if you already have [Visual Studio (Community, Professional, or Enterprise)](https://visualstudio.microsoft.com/downloads/) 2019, 2017 or 2015 with same workloads installed.
 * [Git](https://git-scm.com/download/).
 * [CMake](https://cmake.org/download/) - when you install **CMake**, select the option **Add CMake to the system PATH**.
 * [Visual Studio Code](https://code.visualstudio.com/).
@@ -52,23 +52,27 @@ Use the following steps to install the Azure IoT Tools extension pack in VS Code
 
 ## Prepare the development environment
 
-### Get Azure IoT device SDK for C
+In this tutorial, you use the [Vcpkg](https://github.com/microsoft/vcpkg) library manager to install the Azure IoT C device SDK in your development environment.
 
-Prepare a development environment you can use to  build the Azure IoT C device SDK.
+1. Open a command prompt. Execute the following command to install Vcpkg:
 
-1. Open a command prompt. Execute the following command to clone the [Azure IoT C SDK](https://github.com/Azure/azure-iot-sdk-c) GitHub repository:
+    ```cmd
+    git clone https://github.com/Microsoft/vcpkg.git
+    cd vcpkg
 
-    ```cmd/sh
-    git clone https://github.com/Azure/azure-iot-sdk-c --recursive -b public-preview
+    .\bootstrap-vcpkg.bat
     ```
 
-    You should expect this operation to take several minutes to complete.
+    Then, to hook up user-wide [integration](https://github.com/microsoft/vcpkg/blob/master/docs/users/integration.md), run the following command. The first time you run this command it requires administrative rights:
+
+    ```cmd
+    .\vcpkg.exe integrate install
+    ```
 
-1. Create a `central_app` folder in the root of the local clone of the repository. You use this folder for the device model files and device code stub.
+1. Install Azure IoT C device SDK Vcpkg:
 
-    ```cmd/sh
-    cd azure-iot-sdk-c
-    mkdir central_app
+    ```cmd
+    .\vcpkg.exe install azure-iot-sdk-c[public-preview,use_prov_client]
     ```
 
 ## Generate device key
@@ -86,7 +90,7 @@ To connect a device to an IoT Central application, you need a device key. To gen
 1. Open a command prompt and run the following command to generate a device key:
 
     ```cmd/sh
-    dps-keygen  -di:mxchip-01 -mk:{Primary Key from previous step}
+    dps-keygen -di:mxchip-001 -mk:{Primary Key from previous step}
     ```
 
     Make a note of the generated _device key_, you use this value in a later step in this tutorial.
@@ -95,7 +99,7 @@ To connect a device to an IoT Central application, you need a device key. To gen
 
 In this tutorial, you use the public DCM for an MxChip IoT DevKit device. You don't need an actual DevKit device to run the code, in this tutorial you compile the code to run on Windows.
 
-1. Open `azure-iot-sdk-c\central_app` folder with VS Code.
+1. Create a folder called `central_app` and open it in VS Code.
 
 1. Use **Ctrl+Shift+P** to open the command palette, enter **IoT Plug and Play**, and select **Open Model Repository**. Select **Public repository**. VS Code shows a list of the DCMs in the public model repository.
 
@@ -121,10 +125,12 @@ Now you have the **MXChip IoT DevKit** DCM and its associated interfaces, you ca
 
 1. Choose **ANSI C** as your language.
 
-1. Choose **CMake Project** as your project type. Don't choose **MXChip IoT DevKit Project**, this option is for when you have a real DevKit device.
-
 1. Choose **Via DPS (Device Provisioning Service) symmetric key** as the connection method.
 
+1. Choose **CMake Project on Windows** as your project type. Don't choose **MXChip IoT DevKit Project**, this option is for when you have a real DevKit device.
+
+1. Choose **Via Vcpkg** as the way to include the SDK.
+
 1. VS Code opens a new window with generated device code stub files in the `devkit_device` folder.
 
 ![Generated device code](./media/tutorial-connect-pnp-device/generated-code.png)
@@ -133,35 +139,37 @@ Now you have the **MXChip IoT DevKit** DCM and its associated interfaces, you ca
 
 You use the device SDK to build the generated device code stub. The application you build simulates an **MXChip IoT DevKit** device and connects to your IoT Central application. The application sends telemetry and properties, and receives commands.
 
-1. In VS Code, open the `CMakeLists.txt` file in the `azure-iot-sdk-c` folder. Make sure you open the `CMakeLists.txt` file in the `azure-iot-sdk-c` folder, not the one in the `devkit_device` folder.
+1. At a command prompt, create a `cmake` subdirectory in the `devkit_device` folder, and navigate to that folder:
 
-1. Add the line below at the bottom of the `CMakeLists.txt` file to include the device code stub folder when compiling:
-
-    ```txt
-    add_subdirectory(central_app/devkit_device)
+    ```cmd
+    mkdir cmake
+    cd cmake
     ```
 
-1. Create a `cmake` folder in the `azure-iot-sdk-c` folder, and navigate to that folder at a command prompt:
+1. Run the following commands to build the generated code stub. Replace the `<directory of your Vcpkg repo>` placeholder with the path to your copy of the **Vcpkg** repository:
 
-    ```cmd\sh
-    mkdir cmake
-    cd cmake
+    ```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 . -- /p:Configuration=Release
     ```
 
-1. Run the following commands to build the device SDK and the generated code stub:
+    If you're using Visual Studio 2017 or 2015, you need to specify the CMake generator based on the build tools you're using:
 
-    ```cmd\sh
-    cmake .. -Duse_prov_client=ON -Dhsm_type_symm_key:BOOL=ON
-    cmake --build . -- /m /p:Configuration=Release
+    ```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"
     ```
 
-1. After the build completes successfully, at the same command prompt run your application. Replace `scopeid`, `primarykey` with the values you noted previously :
+1. After the build completes successfully, at the same command prompt run your application. Replace `<scopeid>` and `<devicekey>` with the values you noted previously:
 
-    ```cmd\sh
-    .\central_app\devkit_device\Release\devkit_device.exe scopeid primarykey mxchip-001
+    ```cmd
+    .\Release\devkit_device.exe mxchip-001 <scopeid> <devicekey>
     ```
 
-1. The device application starts sending data to your IoT Central application.
+1. The device application starts sending data to IoT Hub. Sometimes you see the error `Error registering device for DPS` the first time you run the previous command. If you see this error, retry the command.
 
 ## View the device