Merge pull request #96264 from dominicbetts/pnp-linux-vcpkg

Use vcpkg in Linux Quickstart

Author: PRMerger16

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

@@ -91,6 +91,22 @@ Run the following commands to get the _device connection string_ for the device
 az iot hub device-identity show-connection-string --hub-name <YourIoTHubName> --device-id <YourDevice> --output table
 ```
 
+## Prepare the development environment
+
+In this quickstart, you use the [Vcpkg](https://github.com/microsoft/vcpkg) library manager to install the Azure IoT C device SDK in your development environment.
+
+Open a shell. Execute the following command to install Vcpkg:
+
+```bash
+cd ~
+git clone https://github.com/microsoft/vcpkg
+cd vcpkg
+./bootstrap-vcpkg.sh
+./vcpkg install azure-iot-sdk-c[public-preview,use_prov_client]
+```
+
+You should expect this operation to take several minutes to complete.
+
 ## Author your model
 
 In this quickstart, you use an existing sample device capability model and associated interfaces.
@@ -135,7 +151,7 @@ Now that you have a DCM and its associated interfaces, you can generate the devi
 
 1. Choose **CMake Project on Linux** as your project template.
 
-1. Choose **Via Source Code** as the way to include the device SDK.
+1. Choose **Via Vcpkg** as the way to include the device SDK.
 
 1. A new folder called **sample_device** is created in the same location as the DCM file, and in it are the generated device code stub files. VS Code opens a new window to display these.
     ![Device code](media/quickstart-create-pnp-device-linux/device-code.png)
@@ -144,13 +160,6 @@ Now that you have a DCM and its associated interfaces, you can generate the devi
 
 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.
 
-1. Run the following commands to download the device SDK source code:
-
-    ```bash
-    cd ~/pnp_app/sample_device
-    git clone https://github.com/Azure/azure-iot-sdk-c --recursive -b public-preview
-    ```
-
 1. Create a **CMake** build folder for the **sample_device** application:
 
     ```bash
@@ -159,10 +168,10 @@ You use the device SDK source code to build the generated device code stub. The
     cd cmake
     ```
 
-1. Run CMake to build your app with the SDK:
+1. Run CMake to build your app with the SDK. The following command assumes you installed **vcpkg** in your home folder:
 
     ```bash
-    cmake .. -Duse_prov_client=ON -Dhsm_type_symm_key:BOOL=ON -Dskip_samples:BOOL=ON
+    cmake .. -DCMAKE_TOOLCHAIN_FILE=~/vcpkg/scripts/buildsystems/vcpkg.cmake -Duse_prov_client=ON -Dhsm_type_symm_key:BOOL=ON
     cmake --build .
     ```
 
@@ -212,6 +221,7 @@ Use the following command to view all the properties sent by the device:
 ```azurecli-interactive
 az iot dt list-properties --device-id <YourDevice> --hub-name <YourIoTHubNme> --source private --repo-login "<YourCompanyModelRepositoryConnectionString>"
 ```
+
 [!INCLUDE [iot-pnp-clean-resources.md](../../includes/iot-pnp-clean-resources.md)]
 
 ## Next steps

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

@@ -47,13 +47,11 @@ You can find your _company model repository connection string_ in the [Azure Cer
 
 ## Prepare the development environment
 
-### Get Azure IoT device SDK for C
-
-In this quickstart, you prepare a development environment by installing the Azure IoT C device SDK via [Vcpkg](https://github.com/microsoft/vcpkg).
+In this quickstart, you use the [Vcpkg](https://github.com/microsoft/vcpkg) library manager to install the Azure IoT C device SDK in your development environment.
 
 1. Open a command prompt. Execute the following command to install Vcpkg:
 
-    ```cmd/sh
+    ```cmd
     git clone https://github.com/Microsoft/vcpkg.git
     cd vcpkg
 
@@ -62,13 +60,13 @@ In this quickstart, you prepare a development environment by installing the Azur
 
     Then, to hook up user-wide [integration](https://github.com/microsoft/vcpkg/blob/master/docs/users/integration.md), run the following (note: requires admin on first use):
 
-    ```cmd/sh
+    ```cmd
     .\vcpkg.exe integrate install
     ```
 
 1. Install Azure IoT C device SDK Vcpkg:
 
-    ```cmd/sh
+    ```cmd
     .\vcpkg.exe install azure-iot-sdk-c[public-preview,use_prov_client]
     ```
 
@@ -108,7 +106,7 @@ Now that you have a DCM and its associated interfaces, you can generate the devi
 
 1. Choose **CMake Project on Windows** as your project template.
 
-1. Choose **Via Vcpkg** as way to include the device SDK.
+1. Choose **Via Vcpkg** as the way to include the device SDK.
 
 1. A new folder called **sample_device** is created in the same location as the DCM file, and in it are the generated device code stub files. VS Code opens a new window to display these.
     ![Device code](media/quickstart-create-pnp-device/device-code.png)
@@ -119,22 +117,22 @@ You use the device SDK source code to build the generated device code stub. The
 
 1. Create a `cmake` subdirectory in the `sample_device` folder, and navigate to that folder:
 
-    ```cmd\sh
+    ```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\sh
+    ```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\sh
+    >```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
@@ -146,7 +144,7 @@ You use the device SDK source code to build the generated device code stub. The
 
 1. After the build completes successfully, run your application, passing the IoT hub device connection string as a parameter.
 
-    ```cmd\sh
+    ```cmd
     .\Debug\sample_device.exe "<device connection string>"
     ```