Updated YAML manifest for Microsoft Samples portal. (#287)

* Rename YAML manifests to use .yml extension
* Add preserveParentHierarchy: true to YAML manifest
* Updated YAML manifest for Microsoft Samples portal.
* Fix YAML newline warnings
* Updated vssolution path in YAML manifests

158 files changed, 336 insertions, 12 deletions

diff --git a/TrEE/tree.yaml b/TrEE/tree.yml
index 19e07b1b..018a7537 100644
--- a/TrEE/tree.yaml
+++ b/TrEE/tree.yml
@@ -3,8 +3,10 @@ sample:
 - name: TrEE sample
   description: TrEE sample
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /TrEE/TrEESample.sln
diff --git a/audio/sysvad/README.md b/audio/sysvad/README.md
index 72a4c364..43fd6f3e 100644
--- a/audio/sysvad/README.md
+++ b/audio/sysvad/README.md
@@ -1,3 +1,12 @@
+<!---
+    name: SysVAD Virtual Audio Device Driver Sample
+    platform: WDM
+    language: cpp
+    category: Audio
+    description: The Microsoft SysVAD Virtual Audio Device Driver (SYSVAD) shows how to develop a WDM audio driver that exposes support for multiple audio devices.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620183
+--->
+
 SysVAD Virtual Audio Device Driver Sample
 ========================================
 
diff --git a/audio/sysvad/audio-sysvad.yaml b/audio/sysvad/audio-sysvad.yml
index 15206298..7ef714a3 100644
--- a/audio/sysvad/audio-sysvad.yaml
+++ b/audio/sysvad/audio-sysvad.yml
@@ -3,8 +3,10 @@ sample:
 - name: SysVAD Virtual Audio Device Driver Sample
   description: The Microsoft SysVAD Virtual Audio Device Driver (SYSVAD) shows how to develop a WDM audio driver that exposes support for multiple audio devices.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /audio/sysvad/sysvad.sln
diff --git a/avstream/avscamera/avstream-avscamera.yaml b/avstream/avscamera/avstream-avscamera.yml
index c4b4e71b..25e4b8e9 100644
--- a/avstream/avscamera/avstream-avscamera.yaml
+++ b/avstream/avscamera/avstream-avscamera.yml
@@ -3,8 +3,10 @@ sample:
 - name: AvsCamera - AVStream Camera Sample Driver
   description: Provides a pin-centric AVStream capture driver for a simulated front and back camera that performs simulated captures at 320x240 or 640x480 in RGB24, RGB32, YUY2 and NV12 formats at various frame rates.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /avstream/avscamera/avscamera.sln
diff --git a/avstream/avshws/avstream-avshws.yaml b/avstream/avshws/avstream-avshws.yml
index 08a6bb4a..fb3799fc 100644
--- a/avstream/avshws/avstream-avshws.yaml
+++ b/avstream/avshws/avstream-avshws.yml
@@ -3,8 +3,10 @@ sample:
 - name: AVStream simulated hardware sample driver (Avshws)
   description: A simulated hardware sample driver providing a pin-centric capture driver to simulate AV capture hardware.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /avstream/avshws/avshws.sln
diff --git a/avstream/avssamp/avstream-avssamp.yaml b/avstream/avssamp/avstream-avssamp.yml
index 495c207d..9b36d54b 100644
--- a/avstream/avssamp/avstream-avssamp.yaml
+++ b/avstream/avssamp/avstream-avssamp.yml
@@ -3,8 +3,10 @@ sample:
 - name: AVStream filter-centric simulated capture sample driver (Avssamp)
   description: An AVStream filter-centric simulated capture sample driver with functional audio.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /avstream/avssamp/avssamp.sln
diff --git a/avstream/sampledevicemft/README.md b/avstream/sampledevicemft/README.md
index 2b79c451..79ddc9f0 100644
--- a/avstream/sampledevicemft/README.md
+++ b/avstream/sampledevicemft/README.md
@@ -23,7 +23,7 @@ Related topics
 
 **Concepts**
 
-[Windows Store device apps for cameras](http://go.microsoft.com/fwlink/p/?LinkId=306683)
+[UWP device apps for cameras](http://go.microsoft.com/fwlink/p/?LinkId=306683)
 
 [Media Foundation Transforms](http://msdn.microsoft.com/en-us/library/windows/hardware/ms703138)
 
@@ -33,6 +33,6 @@ Related topics
 
 **Samples**
 
-[Windows Store device app for camera sample](http://go.microsoft.com/fwlink/p/?linkid=249442)
+[Device app for camera sample](http://go.microsoft.com/fwlink/p/?linkid=249442)
 
 [Camera Capture UI sample](http://go.microsoft.com/fwlink/p/?linkid=249441%20)
diff --git a/avstream/sampledevicemft/avstream-sampledevicemft.yaml b/avstream/sampledevicemft/avstream-sampledevicemft.yml
index d1e877c4..84ffd6d0 100644
--- a/avstream/sampledevicemft/avstream-sampledevicemft.yaml
+++ b/avstream/sampledevicemft/avstream-sampledevicemft.yml
@@ -3,8 +3,10 @@ sample:
 - name: Driver Device Transform Sample
   description: A driver device transform which loads in a process streaming an Avstream based camera device using Media Foundation.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /avstream/sampledevicemft/SampleDeviceMft.sln
diff --git a/avstream/samplemft0/README.md b/avstream/samplemft0/README.md
index 42f23db4..111d4073 100644
--- a/avstream/samplemft0/README.md
+++ b/avstream/samplemft0/README.md
@@ -3,16 +3,16 @@
     platform: WDM
     language: cpp
     category: Camera
-    description: A driver MFT for use with a camera's Windows Store device app.
+    description: A driver MFT for use with a camera's UWP device app.
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617126
 --->
 
 Driver MFT Sample
 =================
 
-Provides a *driver MFT* for use with a camera's Windows Store device app.A *driver MFT* is a Media Foundation Transform that's used with a specific camera when capturing video. The driver MFT is also known as MFT0 because it is the first MFT applied to the video stream captured from the camera. This MFT can provide a video effect or other processing when capturing photos or video from the camera. It can be distributed along with the driver package for a camera.
+Provides a *driver MFT* for use with a camera's UWP device app.A *driver MFT* is a Media Foundation Transform that's used with a specific camera when capturing video. The driver MFT is also known as MFT0 because it is the first MFT applied to the video stream captured from the camera. This MFT can provide a video effect or other processing when capturing photos or video from the camera. It can be distributed along with the driver package for a camera.
 
-In this sample, the driver MFT, when enabled, replaces a portion of the captured video with a green box. To test this sample, download the [Windows Store device app for camera sample](http://go.microsoft.com/fwlink/p/?linkid=249442) and the [Camera Capture UI sample](http://go.microsoft.com/fwlink/p/?linkid=249441). The [Windows Store device app for camera sample](http://go.microsoft.com/fwlink/p/?linkid=249442) provides a *Windows Store device app* that controls the effect implemented by the driver MFT. The [Camera Capture UI sample](http://go.microsoft.com/fwlink/p/?linkid=249441) provides a way to invoke the *Windows Store device app*.
+In this sample, the driver MFT, when enabled, replaces a portion of the captured video with a green box. To test this sample, download the [UWP device app for camera sample](http://go.microsoft.com/fwlink/p/?linkid=249442) and the [Camera Capture UI sample](http://go.microsoft.com/fwlink/p/?linkid=249441). The [UWP device app for camera sample](http://go.microsoft.com/fwlink/p/?linkid=249442) provides a *UWP device app* that controls the effect implemented by the driver MFT. The [Camera Capture UI sample](http://go.microsoft.com/fwlink/p/?linkid=249441) provides a way to invoke the *UWP device app*.
 
 This sample is designed to be used with a specific camera. To run the sample, you need the your camera's device ID and device metadata package.
 
@@ -22,7 +22,7 @@ Related topics
 
 **Concepts**
 
-[Windows Store device apps for cameras](http://go.microsoft.com/fwlink/p/?LinkId=306683)
+[UWP device apps for cameras](http://go.microsoft.com/fwlink/p/?LinkId=306683)
 
 [Media Foundation Transforms](http://msdn.microsoft.com/en-us/library/windows/hardware/ms703138)
 
@@ -32,6 +32,6 @@ Related topics
 
 **Samples**
 
-[Windows Store device app for camera sample](http://go.microsoft.com/fwlink/p/?linkid=249442)
+[Device app for camera sample](http://go.microsoft.com/fwlink/p/?linkid=249442)
 
 [Camera Capture UI sample](http://go.microsoft.com/fwlink/p/?linkid=249441%20)
diff --git a/avstream/samplemft0/avstream-samplemft0.yaml b/avstream/samplemft0/avstream-samplemft0.yml
index 43ea7515..5a4e4c0a 100644
--- a/avstream/samplemft0/avstream-samplemft0.yaml
+++ b/avstream/samplemft0/avstream-samplemft0.yml
@@ -1,10 +1,12 @@
 ### YamlMime:Sample
 sample:
 - name: Driver MFT Sample
-  description: A driver MFT for use with a camera's Windows Store device app.
+  description: A driver MFT for use with a camera's Windows device app.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /avstream/samplemft0/SampleMft0.sln
diff --git a/biometrics/biometrics.yaml b/biometrics/biometrics.yml
index 259607d2..c4d427f7 100644
--- a/biometrics/biometrics.yaml
+++ b/biometrics/biometrics.yml
@@ -3,8 +3,10 @@ sample:
 - name: Windows Biometric Driver Samples (UMDF Version 1)
   description: Contains the Windows Biometric Driver Interface sample and the Windows Biometric Service Adapter samples.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /biometrics/WBDIsample.sln
diff --git a/bluetooth/bthecho/bluetooth-bthecho.yaml b/bluetooth/bthecho/bluetooth-bthecho.yml
index 2b5737f5..7e128d10 100644
--- a/bluetooth/bthecho/bluetooth-bthecho.yaml
+++ b/bluetooth/bthecho/bluetooth-bthecho.yml
@@ -3,8 +3,10 @@ sample:
 - name: Bluetooth Echo L2CAP Profile Driver
   description: Demonstrates development of Bluetooth L2CAP profile drivers using the Bluetooth L2CAP DDIs.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /bluetooth/bthecho/bthecho.sln
diff --git a/bluetooth/serialhcibus/bluetooth-serialhcibus.yaml b/bluetooth/serialhcibus/bluetooth-serialhcibus.yml
index f5fc2542..9c2f19fb 100644
--- a/bluetooth/serialhcibus/bluetooth-serialhcibus.yaml
+++ b/bluetooth/serialhcibus/bluetooth-serialhcibus.yml
@@ -3,8 +3,10 @@ sample:
 - name: Bluetooth Serial HCI Bus Driver
   description: Demonstrates how to implement a basic bus driver to support the new Bluetooth Extensibility transport DDIs over the UART transport.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /bluetooth/serialhcibus/serialhcibus.sln
diff --git a/filesys/cdfs/filesys-cdfs.yaml b/filesys/cdfs/filesys-cdfs.yml
index 399c3d7d..077aabec 100644
--- a/filesys/cdfs/filesys-cdfs.yaml
+++ b/filesys/cdfs/filesys-cdfs.yml
@@ -3,8 +3,10 @@ sample:
 - name: CDFS File System Driver
   description: The CD-ROM file system driver (cdfs) sample is a file system driver for removable media.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /filesys/cdfs/cdfs.sln
diff --git a/filesys/fastfat/filesys-fastfat.yaml b/filesys/fastfat/filesys-fastfat.yml
index 0d13ffa9..168a8169 100644
--- a/filesys/fastfat/filesys-fastfat.yaml
+++ b/filesys/fastfat/filesys-fastfat.yml
@@ -3,8 +3,10 @@ sample:
 - name: fastfat File System Driver
   description: A file system driver based on the Windows inbox FastFAT file system used as a model for new file systems.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /filesys/fastfat/fastfat.sln
diff --git a/filesys/miniFilter/MetadataManager/filesys-minifilter-metadatamanager.yaml b/filesys/miniFilter/MetadataManager/filesys-minifilter-metadatamanager.yml
index 7999fa05..11dddd29 100644
--- a/filesys/miniFilter/MetadataManager/filesys-minifilter-metadatamanager.yaml
+++ b/filesys/miniFilter/MetadataManager/filesys-minifilter-metadatamanager.yml
@@ -3,8 +3,10 @@ sample:
 - name: Metadata Manager File System Minifilter Driver
   description:  An example of how to use files for storing metadata that corresponds to minifilters.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /filesys/miniFilter/MetadataManager/MetadataManager.sln
diff --git a/filesys/miniFilter/NameChanger/filesys-minifilter-namechanger.yaml b/filesys/miniFilter/NameChanger/filesys-minifilter-namechanger.yml
index f673d137..c8448c80 100644
--- a/filesys/miniFilter/NameChanger/filesys-minifilter-namechanger.yaml
+++ b/filesys/miniFilter/NameChanger/filesys-minifilter-namechanger.yml
@@ -3,8 +3,10 @@ sample:
 - name: NameChanger File System Minifilter Driver
   description: Grafts a directory from one part of a volume's namespace to another part using a mapping.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /filesys/miniFilter/NameChanger/NameChanger.sln
diff --git a/filesys/miniFilter/avscan/filesys-minifilter-avscan.yaml b/filesys/miniFilter/avscan/filesys-minifilter-avscan.yml
index 15bc5d08..4dc19a30 100644
--- a/filesys/miniFilter/avscan/filesys-minifilter-avscan.yaml
+++ b/filesys/miniFilter/avscan/filesys-minifilter-avscan.yml
@@ -3,8 +3,10 @@ sample:
 - name: AvScan File System Minifilter Driver
   description: This filter is a transaction-aware file scanner that examines data in files.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /filesys/miniFilter/avscan/avscan.sln
diff --git a/filesys/miniFilter/cancelSafe/filesys-minifilter-cancelsafe.yaml b/filesys/miniFilter/cancelSafe/filesys-minifilter-cancelsafe.yml
index eb554177..3219f608 100644
--- a/filesys/miniFilter/cancelSafe/filesys-minifilter-cancelsafe.yaml
+++ b/filesys/miniFilter/cancelSafe/filesys-minifilter-cancelsafe.yml
@@ -3,8 +3,10 @@ sample:
 - name: CancelSafe File System Minifilter Driver
   description: A minifilter demonstrating the use of cancel-safe queues.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /filesys/miniFilter/cancelSafe/cancelSafe.sln
diff --git a/filesys/miniFilter/cdo/filesys-minifilter-cdo.yaml b/filesys/miniFilter/cdo/filesys-minifilter-cdo.yml
index 984e4280..ee34df68 100644
--- a/filesys/miniFilter/cdo/filesys-minifilter-cdo.yaml
+++ b/filesys/miniFilter/cdo/filesys-minifilter-cdo.yml
@@ -3,8 +3,10 @@ sample:
 - name: CDO File System Minifilter Driver
   description: An example of using a control device object (CDO) with a minifilter.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /filesys/miniFilter/cdo/cdo.sln
diff --git a/filesys/miniFilter/change/filesys-minifilter-change.yaml b/filesys/miniFilter/change/filesys-minifilter-change.yml
index cef3a123..5096faf3 100644
--- a/filesys/miniFilter/change/filesys-minifilter-change.yaml
+++ b/filesys/miniFilter/change/filesys-minifilter-change.yml
@@ -3,8 +3,10 @@ sample:
 - name: Change File System Minifilter Driver
   description: A transaction-aware filter that monitors file changes in real time.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /filesys/miniFilter/change/change.sln
diff --git a/filesys/miniFilter/ctx/filesys-minifilter-ctx.yaml b/filesys/miniFilter/ctx/filesys-minifilter-ctx.yml
index 0c39b160..4e81b18f 100644
--- a/filesys/miniFilter/ctx/filesys-minifilter-ctx.yaml
+++ b/filesys/miniFilter/ctx/filesys-minifilter-ctx.yml
@@ -3,8 +3,10 @@ sample:
 - name: Ctx File System Minifilter Driver
   description: Demonstrates how to attach contexts to instances, files, streams, and stream handles in your minifilter.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /filesys/miniFilter/ctx/ctx.sln
diff --git a/filesys/miniFilter/delete/filesys-minifilter-delete.yaml b/filesys/miniFilter/delete/filesys-minifilter-delete.yml
index d98cafab..a9c31962 100644
--- a/filesys/miniFilter/delete/filesys-minifilter-delete.yaml
+++ b/filesys/miniFilter/delete/filesys-minifilter-delete.yml
@@ -3,8 +3,10 @@ sample:
 - name: Delete File System Minifilter Driver
   description: Demonstrates how to detect deletions of files or streams.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /filesys/miniFilter/delete/delete.sln
diff --git a/filesys/miniFilter/minispy/filesys-minifilter-minispy.yaml b/filesys/miniFilter/minispy/filesys-minifilter-minispy.yml
index a688e5da..783502e2 100644
--- a/filesys/miniFilter/minispy/filesys-minifilter-minispy.yaml
+++ b/filesys/miniFilter/minispy/filesys-minifilter-minispy.yml
@@ -3,8 +3,10 @@ sample:
 - name: Minispy File System Minifilter Driver
   description: A tool to monitor and log any I/O and transaction activity that occurs in the system.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /filesys/miniFilter/minispy/minispy.sln
diff --git a/filesys/miniFilter/nullFilter/filesys-minifilter-nullfilter.yaml b/filesys/miniFilter/nullFilter/filesys-minifilter-nullfilter.yml
index cb49ce7e..2d9b6729 100644
--- a/filesys/miniFilter/nullFilter/filesys-minifilter-nullfilter.yaml
+++ b/filesys/miniFilter/nullFilter/filesys-minifilter-nullfilter.yml
@@ -3,8 +3,10 @@ sample:
 - name: NullFilter File System Minifilter Driver
   description: A minifilter that demonstrates registration with the filter manager.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /filesys/miniFilter/nullFilter/nullFilter.sln
diff --git a/filesys/miniFilter/passThrough/filesys-minifilter-passthrough.yaml b/filesys/miniFilter/passThrough/filesys-minifilter-passthrough.yml
index bd1088a1..b42596b2 100644
--- a/filesys/miniFilter/passThrough/filesys-minifilter-passthrough.yaml
+++ b/filesys/miniFilter/passThrough/filesys-minifilter-passthrough.yml
@@ -3,8 +3,10 @@ sample:
 - name: PassThrough File System Minifilter Driver
   description: Demonstrates how to specify callback functions for different types of I/O requests.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /filesys/miniFilter/passThrough/passThrough.sln
diff --git a/filesys/miniFilter/scanner/filesys-minifilter-scanner.yaml b/filesys/miniFilter/scanner/filesys-minifilter-scanner.yml
index 1ed434da..85be9e86 100644
--- a/filesys/miniFilter/scanner/filesys-minifilter-scanner.yaml
+++ b/filesys/miniFilter/scanner/filesys-minifilter-scanner.yml
@@ -3,8 +3,10 @@ sample:
 - name: Scanner File System Minifilter Driver
   description: A file data scanner example. Typically, anti-virus filters are of this type.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /filesys/miniFilter/scanner/scanner.sln
diff --git a/filesys/miniFilter/simrep/filesys-minifilter-simrep.yaml b/filesys/miniFilter/simrep/filesys-minifilter-simrep.yml
index 96e2be66..c5d82551 100644
--- a/filesys/miniFilter/simrep/filesys-minifilter-simrep.yaml
+++ b/filesys/miniFilter/simrep/filesys-minifilter-simrep.yml
@@ -3,8 +3,10 @@ sample:
 - name: SimRep File System Minifilter Driver
   description: Demonstrates how a file system filter can simulate file-system like reparse-point behavior to redirect a file open to an alternate path.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /filesys/miniFilter/simrep/simrep.sln
diff --git a/filesys/miniFilter/swapBuffers/filesys-minifilter-swapbuffers.yaml b/filesys/miniFilter/swapBuffers/filesys-minifilter-swapbuffers.yml
index 5791933a..0f206567 100644
--- a/filesys/miniFilter/swapBuffers/filesys-minifilter-swapbuffers.yaml
+++ b/filesys/miniFilter/swapBuffers/filesys-minifilter-swapbuffers.yml
@@ -3,8 +3,10 @@ sample:
 - name: SwapBuffer File System Minifilter Driver
   description: Demonstrates how to switch buffers between reads and writes of data. This technique is particularly useful for encryption filters.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /filesys/miniFilter/swapBuffers/swapBuffers.sln
diff --git a/general/DCHU/general-dchu.yaml b/general/DCHU/general-dchu.yml
index 0821b2a1..2276cd93 100644
--- a/general/DCHU/general-dchu.yaml
+++ b/general/DCHU/general-dchu.yml
@@ -3,6 +3,7 @@ sample:
 - name: DHCU - Driver package installation toolkit for universal drivers
   description: Illustrates DCHU principles of universal driver design.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
diff --git a/general/PLX9x5x/general-plx9x5x.yaml b/general/PLX9x5x/general-plx9x5x.yml
index 940cea0e..6deebe96 100644
--- a/general/PLX9x5x/general-plx9x5x.yaml
+++ b/general/PLX9x5x/general-plx9x5x.yml
@@ -3,8 +3,10 @@ sample:
 - name: PLX9x5x PCI Driver
   description: Demonstrates how to write a driver for a generic PCI device using Windows Driver Frameworks (WDF).
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/PLX9x5x/PLX9x5x.sln
diff --git a/general/SystemDma/wdm/general-systemdma-wdm.yaml b/general/SystemDma/wdm/general-systemdma-wdm.yml
index f352f00a..aed5b8f2 100644
--- a/general/SystemDma/wdm/general-systemdma-wdm.yaml
+++ b/general/SystemDma/wdm/general-systemdma-wdm.yml
@@ -3,8 +3,10 @@ sample:
 - name: System DMA sample
   description: Demonstrates how a driver could use a system DMA controller to write data to a hardware location using V3 System DMA.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/SystemDma/wdm/SystemDma.sln
diff --git a/general/WinHEC 2017 Lab/general-winhec-2017-lab.yaml b/general/WinHEC 2017 Lab/general-winhec-2017-lab.yml
index 4eda32ab..502914e4 100644
--- a/general/WinHEC 2017 Lab/general-winhec-2017-lab.yaml
+++ b/general/WinHEC 2017 Lab/general-winhec-2017-lab.yml
@@ -3,6 +3,7 @@ sample:
 - name: WinHEC 2017 Lab
   description: WinHEC 2017 Lab
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
diff --git a/general/cancel/general-cancel.yaml b/general/cancel/general-cancel.yml
index 1e13c79f..7c38e259 100644
--- a/general/cancel/general-cancel.yaml
+++ b/general/cancel/general-cancel.yml
@@ -3,8 +3,10 @@ sample:
 - name: Cancel-Safe IRP Queue Sample
   description: Demonstrates the use of the cancel-safe queue routines.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/cancel/cancel.sln
diff --git a/general/echo/kmdf/general-echo-kmdf.yaml b/general/echo/kmdf/general-echo-kmdf.yml
index 302886b9..bc1d383b 100644
--- a/general/echo/kmdf/general-echo-kmdf.yaml
+++ b/general/echo/kmdf/general-echo-kmdf.yml
@@ -3,8 +3,10 @@ sample:
 - name: KMDF Echo Sample
   description: Demonstrates how to use a sequential queue to serialize read and write requests presented to the driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/echo/kmdf/kmdfecho.sln
diff --git a/general/echo/umdf/general-echo-umdf.yaml b/general/echo/umdf/general-echo-umdf.yml
index 696fcf46..9a9b9f23 100644
--- a/general/echo/umdf/general-echo-umdf.yaml
+++ b/general/echo/umdf/general-echo-umdf.yml
@@ -3,8 +3,10 @@ sample:
 - name: Echo Sample (UMDF Version 1)
   description: Demonstrates how to use UMDF version 1 to write a driver and demonstrates best practices.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/echo/umdf/echo.sln
diff --git a/general/echo/umdf2/general-echo-umdf2.yaml b/general/echo/umdf2/general-echo-umdf2.yml
index 32931718..62d719f3 100644
--- a/general/echo/umdf2/general-echo-umdf2.yaml
+++ b/general/echo/umdf2/general-echo-umdf2.yml
@@ -3,8 +3,10 @@ sample:
 - name: Echo Sample (UMDF Version 2)
   description: Demonstrates how to use UMDF 2 to write a driver and to employ best practices.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/echo/umdf2/umdf2echo.sln
diff --git a/general/echo/umdfSocketEcho/general-echo-umdfsocketecho.yaml b/general/echo/umdfSocketEcho/general-echo-umdfsocketecho.yml
index 1af773c2..06962f42 100644
--- a/general/echo/umdfSocketEcho/general-echo-umdfsocketecho.yaml
+++ b/general/echo/umdfSocketEcho/general-echo-umdfsocketecho.yml
@@ -3,8 +3,10 @@ sample:
 - name: UMDF SocketEcho Sample (UMDF Version 1)
   description: Demonstrates how to use UMDF version 1 to write a driver and demonstrates best practices.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/echo/umdfSocketEcho/umdfsocketecho.sln
diff --git a/general/event/general-event.yaml b/general/event/general-event.yml
index 24b9515b..35ff1a45 100644
--- a/general/event/general-event.yaml
+++ b/general/event/general-event.yml
@@ -3,8 +3,10 @@ sample:
 - name: Hardware Event Sample
   description: Demonstrates different ways a kernel-mode driver can notify an application about a hardware event.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/event/eventsample.sln
diff --git a/general/filehistory/general-filehistory.yaml b/general/filehistory/general-filehistory.yml
index c711753d..3a2327fa 100644
--- a/general/filehistory/general-filehistory.yaml
+++ b/general/filehistory/general-filehistory.yml
@@ -3,8 +3,10 @@ sample:
 - name: File History Sample
   description: A console application that starts the file history service, if it is stopped, and schedules regular backups.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/filehistory/filehistory.sln
diff --git a/general/installwdf/general-installwdf.yaml b/general/installwdf/general-installwdf.yml
index 98546c22..b4e4a662 100644
--- a/general/installwdf/general-installwdf.yaml
+++ b/general/installwdf/general-installwdf.yml
@@ -3,8 +3,10 @@ sample:
 - name: WDF Installation Package
   description: Demonstrates how to install WDF packages on a system.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/installwdf/installwdf.sln
diff --git a/general/ioctl/kmdf/general-ioctl-kmdf.yaml b/general/ioctl/kmdf/general-ioctl-kmdf.yml
index 1ec6b3ab..8a4f4251 100644
--- a/general/ioctl/kmdf/general-ioctl-kmdf.yaml
+++ b/general/ioctl/kmdf/general-ioctl-kmdf.yml
@@ -3,8 +3,10 @@ sample:
 - name: Non-PnP Driver Sample
   description: Demonstrates how to write a non-PnP driver using the Kernel Mode Driver Framework.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/ioctl/kmdf/ioctl.sln
diff --git a/general/ioctl/wdm/general-ioctl-wdm.yaml b/general/ioctl/wdm/general-ioctl-wdm.yml
index bf905228..f527d17c 100644
--- a/general/ioctl/wdm/general-ioctl-wdm.yaml
+++ b/general/ioctl/wdm/general-ioctl-wdm.yml
@@ -3,8 +3,10 @@ sample:
 - name: IOCTL
   description: Demonstrates usage of four different types of IOCTLs
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/ioctl/wdm/ioctl.sln
diff --git a/general/obcallback/general-obcallback.yaml b/general/obcallback/general-obcallback.yml
index 4710e5ac..67ea5fa1 100644
--- a/general/obcallback/general-obcallback.yaml
+++ b/general/obcallback/general-obcallback.yml
@@ -3,8 +3,10 @@ sample:
 - name: ObCallback Callback Registration Driver
   description: Demonstrates the use of registered callbacks for process protection.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/obcallback/obcallback.sln
diff --git a/general/pcidrv/general-pcidrv.yaml b/general/pcidrv/general-pcidrv.yml
index 65539778..67df668f 100644
--- a/general/pcidrv/general-pcidrv.yaml
+++ b/general/pcidrv/general-pcidrv.yml
@@ -3,8 +3,10 @@ sample:
 - name: PCIDRV - WDF Driver for PCI Device
   description: Demonstrates how to write a KMDF driver for a PCI device.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/pcidrv/pcidrv.sln
diff --git a/general/perfcounters/kcs/general-perfcounters-kcs.yaml b/general/perfcounters/kcs/general-perfcounters-kcs.yml
index 18d10db0..05746590 100644
--- a/general/perfcounters/kcs/general-perfcounters-kcs.yaml
+++ b/general/perfcounters/kcs/general-perfcounters-kcs.yml
@@ -3,8 +3,10 @@ sample:
 - name: Kernel Counter Sample (Kcs)
   description: Demonstrates the use of the kernel-mode performance library.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/perfcounters/kcs/kcs.sln
diff --git a/general/registry/regfltr/general-registry-regfltr.yaml b/general/registry/regfltr/general-registry-regfltr.yml
index 0afc5812..999500f8 100644
--- a/general/registry/regfltr/general-registry-regfltr.yaml
+++ b/general/registry/regfltr/general-registry-regfltr.yml
@@ -3,8 +3,10 @@ sample:
 - name: RegFltr Sample Driver
   description: Demonstrates how to write a registry filter driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/registry/regfltr/regfltr.sln
diff --git a/general/toaster/toastDrv/general-toaster-toastdrv.yaml b/general/toaster/toastDrv/general-toaster-toastdrv.yml
index c89e4734..5c5fcef1 100644
--- a/general/toaster/toastDrv/general-toaster-toastdrv.yaml
+++ b/general/toaster/toastDrv/general-toaster-toastdrv.yml
@@ -3,8 +3,10 @@ sample:
 - name: Toaster Sample Driver
   description: An iterative series of samples that demonstrate KDMF and UDMF1 driver development.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/toaster/toastDrv/toaster.sln
diff --git a/general/toaster/toastpkg/general-toaster-toastpkg.yaml b/general/toaster/toastpkg/general-toaster-toastpkg.yml
index cd66b444..2698b119 100644
--- a/general/toaster/toastpkg/general-toaster-toastpkg.yaml
+++ b/general/toaster/toastpkg/general-toaster-toastpkg.yml
@@ -3,8 +3,10 @@ sample:
 - name: Toaster Package Sample Driver
   description: Simulates hardware-first and software-first installation of the toaster sample driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/toaster/toastpkg/toastpkg.sln
diff --git a/general/toaster/umdf2/general-toaster-umdf2.yaml b/general/toaster/umdf2/general-toaster-umdf2.yml
index 90b963fb..9ccf446f 100644
--- a/general/toaster/umdf2/general-toaster-umdf2.yaml
+++ b/general/toaster/umdf2/general-toaster-umdf2.yml
@@ -3,8 +3,10 @@ sample:
 - name: Toaster Sample (UMDF version 2)
   description: An iterative series of samples that demonstrate driver development using UMDF version 2.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/toaster/umdf2/umdf2toaster.sln
diff --git a/general/tracing/SystemTraceControl/general-tracing-systemtracecontrol.yaml b/general/tracing/SystemTraceControl/general-tracing-systemtracecontrol.yml
index ee694d96..1d54d1da 100644
--- a/general/tracing/SystemTraceControl/general-tracing-systemtracecontrol.yaml
+++ b/general/tracing/SystemTraceControl/general-tracing-systemtracecontrol.yml
@@ -3,8 +3,10 @@ sample:
 - name: System Trace Control
   description: Demonstrates how to use event tracing control APIs to collect events from the system trace provider.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/tracing/SystemTraceControl/SystemTraceControl.sln
diff --git a/general/tracing/evntdrv/general-tracing-evntdrv.yaml b/general/tracing/evntdrv/general-tracing-evntdrv.yml
index a12ebd76..9acd3683 100644
--- a/general/tracing/evntdrv/general-tracing-evntdrv.yaml
+++ b/general/tracing/evntdrv/general-tracing-evntdrv.yml
@@ -3,8 +3,10 @@ sample:
 - name: Eventdrv
   description: Demonstrates the use of the Event Tracing for Windows (ETW) API in a driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/tracing/evntdrv/eventdrv.sln
diff --git a/general/tracing/tracedriver/general-tracing-tracedriver.yaml b/general/tracing/tracedriver/general-tracing-tracedriver.yml
index 483136db..ad383818 100644
--- a/general/tracing/tracedriver/general-tracing-tracedriver.yaml
+++ b/general/tracing/tracedriver/general-tracing-tracedriver.yml
@@ -3,8 +3,10 @@ sample:
 - name: Tracedrv
   description: A sample driver instrumented for software tracing.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/tracing/tracedriver/tracedrv.sln
diff --git a/general/umdfSkeleton/general-umdfskeleton.yaml b/general/umdfSkeleton/general-umdfskeleton.yml
index 44c21d58..9acc8543 100644
--- a/general/umdfSkeleton/general-umdfskeleton.yaml
+++ b/general/umdfSkeleton/general-umdfskeleton.yml
@@ -3,8 +3,10 @@ sample:
 - name: UMDF Driver Skeleton Sample (UMDF version 1)
   description: Demonstrates how to use UDMF to write a minimal driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /general/umdfSkeleton/umdfSkeleton.sln
diff --git a/gpio/samples/gpio-samples.yaml b/gpio/samples/gpio-samples.yml
index d1576406..069fff47 100644
--- a/gpio/samples/gpio-samples.yaml
+++ b/gpio/samples/gpio-samples.yml
@@ -3,8 +3,10 @@ sample:
 - name:  GPIO Sample Drivers
   description: Illustrates how to write a GPIO controller driver that works in conjunction with the GPIO framework extension (GpioClx).
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /gpio/samples/sim.sln
diff --git a/hid/firefly/hid-firefly.yaml b/hid/firefly/hid-firefly.yml
index 7b11f3c6..7a57b1cd 100644
--- a/hid/firefly/hid-firefly.yaml
+++ b/hid/firefly/hid-firefly.yml
@@ -3,8 +3,10 @@ sample:
 - name: KMDF filter driver for a HID device
   description: Illustrates using remote I/O target interfaces to open a HID collection in kernel-mode and send IOCTL requests to set and get feature reports.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /hid/firefly/firefly.sln
diff --git a/hid/hclient/hid-hclient.yaml b/hid/hclient/hid-hclient.yml
index b6a740f8..50177e19 100644
--- a/hid/hclient/hid-hclient.yaml
+++ b/hid/hclient/hid-hclient.yml
@@ -3,8 +3,10 @@ sample:
 - name: HClient sample application
   description: Demonstrates how to write a user-mode client application that communicates with HID devices.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /hid/hclient/hclient.sln
diff --git a/hid/hidusbfx2/hid-hidusbfx2.yaml b/hid/hidusbfx2/hid-hidusbfx2.yml
index 8800e6b1..d47eb14c 100644
--- a/hid/hidusbfx2/hid-hidusbfx2.yaml
+++ b/hid/hidusbfx2/hid-hidusbfx2.yml
@@ -3,8 +3,10 @@ sample:
 - name: HIDUSBFX2 sample driver
   description: TBDemonstrates mapping of a non-HID USB device to a HID device.D
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /hid/hidusbfx2/hidusbfx2.sln
diff --git a/hid/vhidmini2/hid-vhidmini2.yaml b/hid/vhidmini2/hid-vhidmini2.yml
index b20d76ca..b85ad8aa 100644
--- a/hid/vhidmini2/hid-vhidmini2.yaml
+++ b/hid/vhidmini2/hid-vhidmini2.yml
@@ -3,8 +3,10 @@ sample:
 - name: HID Minidriver Sample (UMDF version 2)
   description: Demonstrates how to write a HID minidriver using User-Mode Driver Framework (UMDF).
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /hid/vhidmini2/vhidmini2.sln
diff --git a/input/kbfiltr/input-kbfiltr.yaml b/input/kbfiltr/input-kbfiltr.yml
index d8db9151..67f42ce3 100644
--- a/input/kbfiltr/input-kbfiltr.yaml
+++ b/input/kbfiltr/input-kbfiltr.yml
@@ -3,8 +3,10 @@ sample:
 - name: Keyboard Input WDF Filter Driver (Kbfiltr)
   description: A WDF example of a keyboard input filter driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /input/kbfiltr/kbfiltr.sln
diff --git a/input/layout/input-layout.yaml b/input/layout/input-layout.yml
index 646d5857..99199482 100644
--- a/input/layout/input-layout.yaml
+++ b/input/layout/input-layout.yml
@@ -3,8 +3,10 @@ sample:
 - name: Keyboard Layout Samples
   description: Demonstrates how to generate layouts for various keyboards and locales.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /input/layout/kbd.sln
diff --git a/input/moufiltr/input-moufiltr.yaml b/input/moufiltr/input-moufiltr.yml
index 505fa889..900d70c3 100644
--- a/input/moufiltr/input-moufiltr.yaml
+++ b/input/moufiltr/input-moufiltr.yml
@@ -3,8 +3,10 @@ sample:
 - name: Mouse Input WDF Filter Driver (Moufiltr)
   description: A WDF example of a mouse input filter driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /input/moufiltr/moufiltr.sln
diff --git a/network/config/bindview/network-config-bindview.yaml b/network/config/bindview/network-config-bindview.yml
index 8928ac55..a43c64bf 100644
--- a/network/config/bindview/network-config-bindview.yaml
+++ b/network/config/bindview/network-config-bindview.yml
@@ -3,8 +3,10 @@ sample:
 - name: Bindview Network Configuration Utility
   description: An application that demonstrates how to use INetCfg APIs to enumerate, install, uninstall, bind and unbind network components.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /network/config/bindview/bindview.sln
diff --git a/network/modem/fakemodem/network-modem-fakemodem.yaml b/network/modem/fakemodem/network-modem-fakemodem.yml
index aa9eda4b..ac15da5c 100644
--- a/network/modem/fakemodem/network-modem-fakemodem.yaml
+++ b/network/modem/fakemodem/network-modem-fakemodem.yml
@@ -3,8 +3,10 @@ sample:
 - name: Fakemodem Driver
   description: Demonstrates a simple controller-less modem driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /network/modem/fakemodem/fakemodem.sln
diff --git a/network/ndis/extension/network-ndis-extension.yaml b/network/ndis/extension/network-ndis-extension.yml
index 37d33a7d..0494f22b 100644
--- a/network/ndis/extension/network-ndis-extension.yaml
+++ b/network/ndis/extension/network-ndis-extension.yml
@@ -3,8 +3,10 @@ sample:
 - name: Hyper-V Extensible Switch extension filter driver
   description: A base library used to implement a Hyper-V Extensible Switch extension filter driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /network/ndis/extension/extensions.sln
diff --git a/network/ndis/filter/network-ndis-filter.yaml b/network/ndis/filter/network-ndis-filter.yml
index a310da6d..cef3ec90 100644
--- a/network/ndis/filter/network-ndis-filter.yaml
+++ b/network/ndis/filter/network-ndis-filter.yml
@@ -3,8 +3,10 @@ sample:
 - name: NDIS 6.0 Filter Driver
   description: A pass-through NDIS 6 filter driver demonstrating the basic principles of an NDIS 6.0 Filter driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /network/ndis/filter/filter.sln
diff --git a/network/ndis/mux/network-ndis-mux.yaml b/network/ndis/mux/network-ndis-mux.yml
index 2b8b4ad6..d3dfdc31 100644
--- a/network/ndis/mux/network-ndis-mux.yaml
+++ b/network/ndis/mux/network-ndis-mux.yml
@@ -3,8 +3,10 @@ sample:
 - name: NDIS MUX Intermediate Driver and Notify Object
   description: An NDIS 6.0 driver that demonstrates the operation of an N:1 MUX driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /network/ndis/mux/mux.sln
diff --git a/network/ndis/ndisprot/6x/network-ndis-ndisprot-6x.yaml b/network/ndis/ndisprot/6x/network-ndis-ndisprot-6x.yml
index 16a3b40c..657790e4 100644
--- a/network/ndis/ndisprot/6x/network-ndis-ndisprot-6x.yaml
+++ b/network/ndis/ndisprot/6x/network-ndis-ndisprot-6x.yml
@@ -3,8 +3,10 @@ sample:
 - name: NDIS Connection-less Protocol WDM Driver Sample
   description: Demonstrates a connection-less NDIS 6.0 protocol WDM driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /network/ndis/ndisprot/6x/ndisprot60.sln
diff --git a/network/ndis/ndisprot_kmdf/network-ndis-ndisprot-kmdf.yaml b/network/ndis/ndisprot_kmdf/network-ndis-ndisprot-kmdf.yml
index eafc836d..129a1693 100644
--- a/network/ndis/ndisprot_kmdf/network-ndis-ndisprot-kmdf.yaml
+++ b/network/ndis/ndisprot_kmdf/network-ndis-ndisprot-kmdf.yml
@@ -3,8 +3,10 @@ sample:
 - name: Connection-less NDIS 6.0 Protocol KMDF Sample Driver
   description: Demonstrates a connection-less NDIS 6.0 protocol KMDF driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /network/ndis/ndisprot_kmdf/ndisprot_kmdf.sln
diff --git a/network/ndis/netvmini/6x/network-ndis-netvmini-6x.yaml b/network/ndis/netvmini/6x/network-ndis-netvmini-6x.yml
index 2faada3c..6cd74b8a 100644
--- a/network/ndis/netvmini/6x/network-ndis-netvmini-6x.yaml
+++ b/network/ndis/netvmini/6x/network-ndis-netvmini-6x.yml
@@ -3,8 +3,10 @@ sample:
 - name: NDIS Virtual Miniport Driver
   description: Demonstrates the functionality of an NDIS miniport driver without requiring a physical network adapter.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /network/ndis/netvmini/6x/netvmini.sln
diff --git a/network/radio/HidSwitchDriverSample/network-radio-hidswitchdriversample.yaml b/network/radio/HidSwitchDriverSample/network-radio-hidswitchdriversample.yml
index d4aa957f..d106b9d1 100644
--- a/network/radio/HidSwitchDriverSample/network-radio-hidswitchdriversample.yaml
+++ b/network/radio/HidSwitchDriverSample/network-radio-hidswitchdriversample.yml
@@ -3,8 +3,10 @@ sample:
 - name: Radio Switch Test Driver for OSR USB-FX2 Development Board
   description: Demonstrates how to structure a HID driver for radio switches for the OSR USB-FX2 Development Board.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /network/radio/HidSwitchDriverSample/HidSwitchDriverSample.sln
diff --git a/network/radio/RadioManagerSample/network-radio-radiomanagersample.yaml b/network/radio/RadioManagerSample/network-radio-radiomanagersample.yml
index 94191d4f..82a05e36 100644
--- a/network/radio/RadioManagerSample/network-radio-radiomanagersample.yaml
+++ b/network/radio/RadioManagerSample/network-radio-radiomanagersample.yml
@@ -3,8 +3,10 @@ sample:
 - name: Windows Radio Management Sample
   description: Demonstrates how to structure a Radio Manager for use with the Windows Radio Management APIs.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /network/radio/RadioManagerSample/RadioManagerSample.sln
diff --git a/network/trans/WFPSampler/network-trans-wfpsampler.yaml b/network/trans/WFPSampler/network-trans-wfpsampler.yml
index 2c00e36f..ad4e75d0 100644
--- a/network/trans/WFPSampler/network-trans-wfpsampler.yaml
+++ b/network/trans/WFPSampler/network-trans-wfpsampler.yml
@@ -3,8 +3,10 @@ sample:
 - name: Windows Filtering Platform Sample
   description: A sample firewall that has a command-line interface which allows adding filters at various WFP layers.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /network/trans/WFPSampler/WFPSampler.sln
diff --git a/network/trans/ddproxy/network-trans-ddproxy.yaml b/network/trans/ddproxy/network-trans-ddproxy.yml
index 9851ef42..2ceb94a7 100644
--- a/network/trans/ddproxy/network-trans-ddproxy.yaml
+++ b/network/trans/ddproxy/network-trans-ddproxy.yml
@@ -3,8 +3,10 @@ sample:
 - name: Windows Filtering Platform Packet Modification Sample
   description: Demonstrates the packet modification capabilities of the Windows Filtering Platform (WFP).
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /network/trans/ddproxy/ddproxy.sln
diff --git a/network/trans/inspect/network-trans-inspect.yaml b/network/trans/inspect/network-trans-inspect.yml
index 2c9d1f17..464fabdc 100644
--- a/network/trans/inspect/network-trans-inspect.yaml
+++ b/network/trans/inspect/network-trans-inspect.yml
@@ -3,8 +3,10 @@ sample:
 - name: Windows Filtering Platform Traffic Inspection Sample
   description: Demonstrates the traffic inspection capabilities of the Windows Filtering Platform (WFP).
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /network/trans/inspect/inspect.sln
diff --git a/network/trans/msnmntr/network-trans-msnmntr.yaml b/network/trans/msnmntr/network-trans-msnmntr.yml
index eebfd2b7..6c6cdde9 100644
--- a/network/trans/msnmntr/network-trans-msnmntr.yaml
+++ b/network/trans/msnmntr/network-trans-msnmntr.yml
@@ -3,8 +3,10 @@ sample:
 - name: Windows Filtering Platform MSN Messenger Monitor Sample
   description: Demonstrates the stream inspection capabilities of the Windows Filtering Platform (WFP).
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /network/trans/msnmntr/msnmntr.sln
diff --git a/network/trans/stmedit/network-trans-stmedit.yaml b/network/trans/stmedit/network-trans-stmedit.yml
index 6cbb402d..c3101e05 100644
--- a/network/trans/stmedit/network-trans-stmedit.yaml
+++ b/network/trans/stmedit/network-trans-stmedit.yml
@@ -3,8 +3,10 @@ sample:
 - name: Windows Filtering Platform Stream Edit Sample
   description: Demonstrates replacing a string pattern for a Transmission Control Protocol (TCP) connection using the Windows Filtering Platform (WFP).
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /network/trans/stmedit/stmedit.sln
diff --git a/network/wlan/WDI/network-wlan-wdi.yaml b/network/wlan/WDI/network-wlan-wdi.yml
index 01427ff6..216f3449 100644
--- a/network/wlan/WDI/network-wlan-wdi.yaml
+++ b/network/wlan/WDI/network-wlan-wdi.yml
@@ -3,8 +3,10 @@ sample:
 - name: WDI samples
   description: WDI samples
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /network/wlan/WDI/windows.msbuild.rtwssample.sln
diff --git a/network/wlan/ihvsampleui/network-wlan-ihvsampleui.yaml b/network/wlan/ihvsampleui/network-wlan-ihvsampleui.yml
index 8cbe115b..eb043ec0 100644
--- a/network/wlan/ihvsampleui/network-wlan-ihvsampleui.yaml
+++ b/network/wlan/ihvsampleui/network-wlan-ihvsampleui.yml
@@ -3,6 +3,7 @@ sample:
 - name: IHV Sample UI
   description: IHV Sample UI
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
diff --git a/network/wsk/echosrv/network-wsk-echosrv.yaml b/network/wsk/echosrv/network-wsk-echosrv.yml
index bb675a32..e0aa241f 100644
--- a/network/wsk/echosrv/network-wsk-echosrv.yaml
+++ b/network/wsk/echosrv/network-wsk-echosrv.yml
@@ -3,8 +3,10 @@ sample:
 - name: WSK TCP Echo Server
   description: A minimal sample driver to demonstrate the usage of the Winsock Kernel (WSK) programming interface.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /network/wsk/echosrv/echosrv.sln
diff --git a/nfp/net/nfp-net.yaml b/nfp/net/nfp-net.yml
index f75c0455..04291841 100644
--- a/nfp/net/nfp-net.yaml
+++ b/nfp/net/nfp-net.yml
@@ -3,8 +3,10 @@ sample:
 - name: Near-Field Proximity Sample Driver (UMDF Version 1)
   description: Demonstrates how to use UMDF version 1 to write a near-field proximity driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /nfp/net/netnfp.sln
diff --git a/pofx/PEP/pofx-pep.yaml b/pofx/PEP/pofx-pep.yml
index ffc0a901..fefc0757 100644
--- a/pofx/PEP/pofx-pep.yaml
+++ b/pofx/PEP/pofx-pep.yml
@@ -3,8 +3,10 @@ sample:
 - name: Power Engine Plugin (PEP) ACPI Sample
   description: Demonstrates an interface which allows PEP to implement ACPI runtime methods natively via a driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /pofx/PEP/pepsamples.sln
diff --git a/pofx/UMDF2/pofx-umdf2.yaml b/pofx/UMDF2/pofx-umdf2.yml
index e7db0b9e..0d981467 100644
--- a/pofx/UMDF2/pofx-umdf2.yaml
+++ b/pofx/UMDF2/pofx-umdf2.yml
@@ -3,8 +3,10 @@ sample:
 - name: Power Framework (PoFx) Sample (UMDF Version 2)
   description: Demonstrates how a UMDF version 2 driver can implement F-state-based power management.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /pofx/UMDF2/pofx.sln
diff --git a/pofx/WDF/pofx-wdf.yaml b/pofx/WDF/pofx-wdf.yml
index 7541a404..9e048157 100644
--- a/pofx/WDF/pofx-wdf.yaml
+++ b/pofx/WDF/pofx-wdf.yml
@@ -3,8 +3,10 @@ sample:
 - name: KMDF Power Framework (PoFx) Sample
   description: Demonstrate how a KMDF driver can implement F-state-based power management.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /pofx/WDF/pofx.sln
diff --git a/pos/drivers/MagneticStripeReader/pos-drivers-magneticstripereader.yaml b/pos/drivers/MagneticStripeReader/pos-drivers-magneticstripereader.yml
index 10933f61..de4c8a60 100644
--- a/pos/drivers/MagneticStripeReader/pos-drivers-magneticstripereader.yaml
+++ b/pos/drivers/MagneticStripeReader/pos-drivers-magneticstripereader.yml
@@ -3,8 +3,10 @@ sample:
 - name: Magnetic Stripe Reader Driver Sample
   description: This UMDF version 2 sample serves as a template for creating a new Magnetic Stripe Reader driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /pos/drivers/MagneticStripeReader/MagneticStripeReader.sln
diff --git a/pos/drivers/barcodescanner/pos-drivers-barcodescanner.yaml b/pos/drivers/barcodescanner/pos-drivers-barcodescanner.yml
index 191c3e1b..b51c7aef 100644
--- a/pos/drivers/barcodescanner/pos-drivers-barcodescanner.yaml
+++ b/pos/drivers/barcodescanner/pos-drivers-barcodescanner.yml
@@ -3,8 +3,10 @@ sample:
 - name: Barcode Scanner Driver Sample
   description: This UDMF version 2 sample serves as a template for creating a new Barcode Scanner driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /pos/drivers/barcodescanner/BarcodeScanner.sln
diff --git a/print/OEM Printer Customization Plug-in Samples/print-oem-printer-customization-plug-in-samples.yaml b/print/OEM Printer Customization Plug-in Samples/print-oem-printer-customization-plug-in-samples.yml
index 91c9a3b9..6a0356a3 100644
--- a/print/OEM Printer Customization Plug-in Samples/print-oem-printer-customization-plug-in-samples.yaml
+++ b/print/OEM Printer Customization Plug-in Samples/print-oem-printer-customization-plug-in-samples.yml
@@ -3,8 +3,10 @@ sample:
 - name: OEM Printer Customization Plug-in Samples
   description: Provides examples of how to build OEM printer customization plug-ins.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /print/OEM Printer Customization Plug-in Samples/C++/oemdll.sln
diff --git a/print/SampleOpenXPS/print-sampleopenxps.yaml b/print/SampleOpenXPS/print-sampleopenxps.yml
index 9a8aed72..4c4a323d 100644
--- a/print/SampleOpenXPS/print-sampleopenxps.yaml
+++ b/print/SampleOpenXPS/print-sampleopenxps.yml
@@ -3,8 +3,10 @@ sample:
 - name: OpenXPS Documents Print Sample
   description: Contains a set of documents that exercise a variety of features of OpenXPS.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /print/SampleOpenXPS/SampleOpenXPS.sln
diff --git a/print/SampleXPS/print-samplexps.yaml b/print/SampleXPS/print-samplexps.yml
index 5ad6a15b..610c0d84 100644
--- a/print/SampleXPS/print-samplexps.yaml
+++ b/print/SampleXPS/print-samplexps.yml
@@ -3,8 +3,10 @@ sample:
 - name: XPS Documents Print Sample
   description: Contains a set of documents that exercise a variety of features of the XML Paper Specification.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /print/SampleXPS/SampleXPS.sln
diff --git a/print/SimplePipelineFilter/print-simplepipelinefilter.yaml b/print/SimplePipelineFilter/print-simplepipelinefilter.yml
index 09bdce20..48f292df 100644
--- a/print/SimplePipelineFilter/print-simplepipelinefilter.yaml
+++ b/print/SimplePipelineFilter/print-simplepipelinefilter.yml
@@ -3,8 +3,10 @@ sample:
 - name: Print Pipeline Simple Filter
   description: This sample shows how to use the print pipeline's filter interfaces.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /print/SimplePipelineFilter/SimplePipelineFilter.sln
diff --git a/print/XPSDrvSmpl/print-xpsdrvsmpl.yaml b/print/XPSDrvSmpl/print-xpsdrvsmpl.yml
index 96c66eae..94a5eb05 100644
--- a/print/XPSDrvSmpl/print-xpsdrvsmpl.yaml
+++ b/print/XPSDrvSmpl/print-xpsdrvsmpl.yml
@@ -3,8 +3,10 @@ sample:
 - name: XPSDrv Driver and Filter Sample
   description: Provide a starting point for developing XPSDrv printer drivers and to illustrate the facility and potential of an XPSDrv print driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /print/XPSDrvSmpl/XPSDrvSmpl.sln
diff --git a/print/XpsRasFilter/print-xpsrasfilter.yaml b/print/XpsRasFilter/print-xpsrasfilter.yml
index 240e8c44..17ca1420 100644
--- a/print/XpsRasFilter/print-xpsrasfilter.yaml
+++ b/print/XpsRasFilter/print-xpsrasfilter.yml
@@ -3,8 +3,10 @@ sample:
 - name: XPS Rasterization Filter Service Sample
   description: Implements an XPSDrv filter that rasterizes fixed pages in an XPS document.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /print/XpsRasFilter/XpsRasFilter.sln
diff --git a/print/autoconfig/print-autoconfig.yaml b/print/autoconfig/print-autoconfig.yml
index 00d4babc..db71bffc 100644
--- a/print/autoconfig/print-autoconfig.yaml
+++ b/print/autoconfig/print-autoconfig.yml
@@ -3,8 +3,10 @@ sample:
 - name: Print auto-configuration sample
   description: Demonstrates how to implement auto-configuration in v4 print drivers.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /print/autoconfig/AutoConfig.sln
diff --git a/print/cpsuisam/print-cpsuisam.yaml b/print/cpsuisam/print-cpsuisam.yml
index 98637f3b..02862cb1 100644
--- a/print/cpsuisam/print-cpsuisam.yaml
+++ b/print/cpsuisam/print-cpsuisam.yml
@@ -3,8 +3,10 @@ sample:
 - name: Common Property Sheet User Interface (CPSUI) Sample
   description: The CPSUISAM application causes the CPSUI to call the print spooler to create property sheet pages for the default printer.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /print/cpsuisam/cpsuisam.sln
diff --git a/print/v4PrintDriverSamples/PrinterExtensionSample/print-v4printdriversamples-printerextensionsample.yaml b/print/v4PrintDriverSamples/PrinterExtensionSample/print-v4printdriversamples-printerextensionsample.yml
index 10286877..3dcc5d76 100644
--- a/print/v4PrintDriverSamples/PrinterExtensionSample/print-v4printdriversamples-printerextensionsample.yaml
+++ b/print/v4PrintDriverSamples/PrinterExtensionSample/print-v4printdriversamples-printerextensionsample.yml
@@ -3,8 +3,10 @@ sample:
 - name: Printer Extension Sample
   description: Demonstrates how to use .NET to build a customized, desktop UI for a v4 print driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - csharp
   technologies:
   - windows
+  vssolution: /print/v4PrintDriverSamples/PrinterExtensionSample/PrinterExtensionSample.sln
diff --git a/print/v4PrintDriverSamples/v4PrintDriver-ConstraintScript/print-v4printdriversamples-v4printdriver-constraintscript.yaml b/print/v4PrintDriverSamples/v4PrintDriver-ConstraintScript/print-v4printdriversamples-v4printdriver-constraintscript.yml
index b69d0551..837aa248 100644
--- a/print/v4PrintDriverSamples/v4PrintDriver-ConstraintScript/print-v4printdriversamples-v4printdriver-constraintscript.yaml
+++ b/print/v4PrintDriverSamples/v4PrintDriver-ConstraintScript/print-v4printdriversamples-v4printdriver-constraintscript.yml
@@ -3,8 +3,10 @@ sample:
 - name: Print Driver Constraints Sample
   description: Demonstrates how to implement advanced constraint handling and PrintTicket/PrintCapabilities handling using JavaScript.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
-  - js
+  - javascript
   technologies:
   - windows
+  vssolution: /print/v4PrintDriverSamples/v4PrintDriver-ConstraintScript/ConstraintScript.sln
diff --git a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/print-v4printdriversamples-v4printdriver-hostbasedsampledriver.yaml b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/print-v4printdriversamples-v4printdriver-hostbasedsampledriver.yml
index a775060a..844de91b 100644
--- a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/print-v4printdriversamples-v4printdriver-hostbasedsampledriver.yaml
+++ b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/print-v4printdriversamples-v4printdriver-hostbasedsampledriver.yml
@@ -3,9 +3,11 @@ sample:
 - name: USB Host-Based Print Driver Sample
   description: Demonstrates how to support host-based devices that use the v4 print driver model and are connected via USB.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
-  - js
+  - javascript
   - xml
   technologies:
   - windows
+  vssolution: /print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/HostBasedSampleDriver.sln
diff --git a/print/v4PrintDriverSamples/v4PrintDriver-USBMon-Bidi-Extension/print-v4printdriversamples-v4printdriver-usbmon-bidi-extension.yaml b/print/v4PrintDriverSamples/v4PrintDriver-USBMon-Bidi-Extension/print-v4printdriversamples-v4printdriver-usbmon-bidi-extension.yml
index 2a998e4a..3cbf769c 100644
--- a/print/v4PrintDriverSamples/v4PrintDriver-USBMon-Bidi-Extension/print-v4printdriversamples-v4printdriver-usbmon-bidi-extension.yaml
+++ b/print/v4PrintDriverSamples/v4PrintDriver-USBMon-Bidi-Extension/print-v4printdriversamples-v4printdriver-usbmon-bidi-extension.yml
@@ -3,9 +3,11 @@ sample:
 - name: Print Driver USB Monitor and Bidi Sample
   description: Demonstrates how to support bidirectional (Bidi) communication over the USB bus using JavaScript and XML.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
-  - js
+  - javascript
   - xml
   technologies:
   - windows
+  vssolution: /print/v4PrintDriverSamples/v4PrintDriver-USBMon-Bidi-Extension/USBMon-Bidi-Extension.sln
diff --git a/print/v4PrintDriverSamples/v4PrintDriver-WSDMon-Bidi-Extension/print-v4printdriversamples-v4printdriver-wsdmon-bidi-extension.yaml b/print/v4PrintDriverSamples/v4PrintDriver-WSDMon-Bidi-Extension/print-v4printdriversamples-v4printdriver-wsdmon-bidi-extension.yml
index b5e2e1ab..c14153ff 100644
--- a/print/v4PrintDriverSamples/v4PrintDriver-WSDMon-Bidi-Extension/print-v4printdriversamples-v4printdriver-wsdmon-bidi-extension.yaml
+++ b/print/v4PrintDriverSamples/v4PrintDriver-WSDMon-Bidi-Extension/print-v4printdriversamples-v4printdriver-wsdmon-bidi-extension.yml
@@ -3,8 +3,10 @@ sample:
 - name: WSDMon Bidi Extension Sample
   description: Demonstrates how to use an XML extension file to support bidirectional (Bidi) communication with a WSD connected printer.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - xml
   technologies:
   - windows
+  vssolution: /print/v4PrintDriverSamples/v4PrintDriver-WSDMon-Bidi-Extension/WSDMon-Bidi-Extension.sln
diff --git a/sd/miniport/sdhc/sd-miniport-sdhc.yaml b/sd/miniport/sdhc/sd-miniport-sdhc.yml
index b17b2901..0f2925ec 100644
--- a/sd/miniport/sdhc/sd-miniport-sdhc.yaml
+++ b/sd/miniport/sdhc/sd-miniport-sdhc.yml
@@ -3,8 +3,10 @@ sample:
 - name: Standard SD Host Controller Miniport
   description: Provides a functional miniport implementation for a standard SD host controller.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /sd/miniport/sdhc/sdhc.sln
diff --git a/security/elam/security-elam.yaml b/security/elam/security-elam.yml
index 8ca3424c..8a338784 100644
--- a/security/elam/security-elam.yaml
+++ b/security/elam/security-elam.yml
@@ -3,8 +3,10 @@ sample:
 - name: Early Launch Anti-Malware Driver
   description: Demonstrates how to receive notifications about the initialization of regular boot start drivers in an Early Launch Anti-Malware driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /security/elam/elam.sln
diff --git a/sensors/ADXL345Acc/sensors-adxl345acc.yaml b/sensors/ADXL345Acc/sensors-adxl345acc.yml
index 68e3dcb3..261bf3d4 100644
--- a/sensors/ADXL345Acc/sensors-adxl345acc.yaml
+++ b/sensors/ADXL345Acc/sensors-adxl345acc.yml
@@ -3,8 +3,10 @@ sample:
 - name: ADXL345 Accelerometer Sample Driver
   description: Demonstrates how to write a UMDF v2 driver to control an ADXL345 accelerometer chip.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /sensors/ADXL345Acc/ADXL345Acc.sln
diff --git a/sensors/Activity/sensors-activity.yaml b/sensors/Activity/sensors-activity.yml
index ebf3b7e8..966d20b5 100644
--- a/sensors/Activity/sensors-activity.yaml
+++ b/sensors/Activity/sensors-activity.yml
@@ -3,8 +3,10 @@ sample:
 - name: Activity Sensor Driver Sample
   description: Demonstrates how to write a UMDF v2 driver to control an activity sensor.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /sensors/Activity/Activity.sln
diff --git a/sensors/CustomSensors/sensors-customsensors.yaml b/sensors/CustomSensors/sensors-customsensors.yml
index b5e67a74..e8987e4e 100644
--- a/sensors/CustomSensors/sensors-customsensors.yaml
+++ b/sensors/CustomSensors/sensors-customsensors.yml
@@ -3,8 +3,10 @@ sample:
 - name: Custom Sensor Driver Sample
   description: Demonstrates how to write a UMDF v2 driver to control a custom sensor.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /sensors/CustomSensors/CustomSensors.sln
diff --git a/sensors/Fusion/sensors-fusion.yaml b/sensors/Fusion/sensors-fusion.yml
index 1960bbb1..5c834124 100644
--- a/sensors/Fusion/sensors-fusion.yaml
+++ b/sensors/Fusion/sensors-fusion.yml
@@ -3,8 +3,10 @@ sample:
 - name: Fusion Sensor Driver Sample
   description: Demonstrates how to write a UMDF v2 driver to control a virtual FusionSensor sensor.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /sensors/Fusion/FusionSensor.sln
diff --git a/sensors/Pedometer/sensors-pedometer.yaml b/sensors/Pedometer/sensors-pedometer.yml
index b69758ba..38c29a84 100644
--- a/sensors/Pedometer/sensors-pedometer.yaml
+++ b/sensors/Pedometer/sensors-pedometer.yml
@@ -3,8 +3,10 @@ sample:
 - name: Pedometer Sensor Sample
   description: Demonstrates how to write a UMDF v2 driver to control a virtual Pedometer sensor.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /sensors/Pedometer/Pedometer.sln
diff --git a/sensors/SensorsComboDriver/sensors-sensorscombodriver.yaml b/sensors/SensorsComboDriver/sensors-sensorscombodriver.yml
index ebbc6c29..0650c2b8 100644
--- a/sensors/SensorsComboDriver/sensors-sensorscombodriver.yaml
+++ b/sensors/SensorsComboDriver/sensors-sensorscombodriver.yml
@@ -3,8 +3,10 @@ sample:
 - name: Sensors Combo Driver Sample
   description: Demonstrates how to write UMDF v2 drivers to control various types of virtual sensors.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /sensors/SensorsComboDriver/SensorsComboDriver.sln
diff --git a/sensors/SimpleDeviceOrientationSensor/sensors-simpledeviceorientationsensor.yaml b/sensors/SimpleDeviceOrientationSensor/sensors-simpledeviceorientationsensor.yml
index c65bc84b..684a29fb 100644
--- a/sensors/SimpleDeviceOrientationSensor/sensors-simpledeviceorientationsensor.yaml
+++ b/sensors/SimpleDeviceOrientationSensor/sensors-simpledeviceorientationsensor.yml
@@ -3,8 +3,10 @@ sample:
 - name: Simple Device Orientation Sensor Sample
   description: Demonstrates how to write a UMDF v2 sensor driver to output Simple Device Orientation values.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /sensors/SimpleDeviceOrientationSensor/SimpleDeviceOrientationSensor.sln
diff --git a/serial/VirtualSerial/serial-virtualserial.yaml b/serial/VirtualSerial/serial-virtualserial.yml
index c6b05387..7b33b547 100644
--- a/serial/VirtualSerial/serial-virtualserial.yaml
+++ b/serial/VirtualSerial/serial-virtualserial.yml
@@ -3,8 +3,10 @@ sample:
 - name: The Serial (16550-based RS-232) sample driver is a WDF version of the inbox Serial.sys driver.
   description: Demonstrates a simple virtual serial driver (ComPort) and a controller-less modem driver (FakeModem).
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /serial/VirtualSerial/VirtualSerial.sln
diff --git a/serial/VirtualSerial2/serial-virtualserial2.yaml b/serial/VirtualSerial2/serial-virtualserial2.yml
index a145aef5..aff10eda 100644
--- a/serial/VirtualSerial2/serial-virtualserial2.yaml
+++ b/serial/VirtualSerial2/serial-virtualserial2.yml
@@ -3,8 +3,10 @@ sample:
 - name: Virtual serial driver sample (UMDF version 2)
   description: Demonstrates UMDF version 2 serial drivers and includes a simple virtual serial driver (ComPort) and a controller-less modem driver (FakeModem).
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /serial/VirtualSerial2/VirtualSerial.sln
diff --git a/serial/serenum/serial-serenum.yaml b/serial/serenum/serial-serenum.yml
index 9e796cd0..c3638f32 100644
--- a/serial/serenum/serial-serenum.yaml
+++ b/serial/serenum/serial-serenum.yml
@@ -3,8 +3,10 @@ sample:
 - name: Serenum sample
   description: Enumerates Plug-n-Play RS-232 devices that are compliant with the current revision of Plug and Play External COM Device.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /serial/serenum/serenum.sln
diff --git a/serial/serial/serial-serial.yaml b/serial/serial/serial-serial.yml
index 283c24b7..c9146bfb 100644
--- a/serial/serial/serial-serial.yaml
+++ b/serial/serial/serial-serial.yml
@@ -3,8 +3,10 @@ sample:
 - name: Serial Port Driver
   description: The Serial (16550-based RS-232) sample driver is a WDF version of the inbox Serial.sys driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /serial/serial/serial.sln
diff --git a/setup/devcon/setup-devcon.yaml b/setup/devcon/setup-devcon.yml
index fba27feb..41547d72 100644
--- a/setup/devcon/setup-devcon.yaml
+++ b/setup/devcon/setup-devcon.yml
@@ -3,8 +3,10 @@ sample:
 - name: Device Console (DevCon) Tool
   description: DevCon enables, disables, installs, configures, and removes devices on the local computer and displays detailed information about devices on local and remote computers.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /setup/devcon/devcon.sln
diff --git a/simbatt/simbatt.yaml b/simbatt/simbatt.yml
index 5820375b..a78ba609 100644
--- a/simbatt/simbatt.yaml
+++ b/simbatt/simbatt.yml
@@ -3,8 +3,10 @@ sample:
 - name: Simulated Battery Driver Sample
   description: Demonstrates a KMDF-based implementation of Windows battery driver interfaces.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /simbatt/func/simbatt.sln
diff --git a/smartcrd/smartcrd.yaml b/smartcrd/smartcrd.yml
index f07f107e..b9820593 100644
--- a/smartcrd/smartcrd.yaml
+++ b/smartcrd/smartcrd.yml
@@ -3,8 +3,10 @@ sample:
 - name: PCMCIA Smart Card Driver
   description: Demonstrates how to write a KMDF driver for the SCM Microsystems PCMCIA smart card reader.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /smartcrd/smartcrd.sln
diff --git a/spb/SkeletonI2C/spb-skeletoni2c.yaml b/spb/SkeletonI2C/spb-skeletoni2c.yml
index 82324a5b..cf7791ae 100644
--- a/spb/SkeletonI2C/spb-skeletoni2c.yaml
+++ b/spb/SkeletonI2C/spb-skeletoni2c.yml
@@ -3,8 +3,10 @@ sample:
 - name: Skeleton I2C Sample Driver
   description: Demonstrates how to design a KMDF controller driver for Windows that conforms to the simple peripheral bus (SPB) device driver interface (DDI).
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /spb/SkeletonI2C/SkeletonI2C.sln
diff --git a/spb/SpbTestTool/spb-spbtesttool.yaml b/spb/SpbTestTool/spb-spbtesttool.yml
index c16a2401..08f40f4f 100644
--- a/spb/SpbTestTool/spb-spbtesttool.yaml
+++ b/spb/SpbTestTool/spb-spbtesttool.yml
@@ -3,8 +3,10 @@ sample:
 - name: SpbTestTool sample
   description: Demonstrates how to open a handle to the SPB controller, use the SPB interface from a KMDF driver, and employ GPIO.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /spb/SpbTestTool/SpbTestTool.sln
diff --git a/storage/class/cdrom/storage-class-cdrom.yaml b/storage/class/cdrom/storage-class-cdrom.yml
index f20a0512..9a18eaa4 100644
--- a/storage/class/cdrom/storage-class-cdrom.yaml
+++ b/storage/class/cdrom/storage-class-cdrom.yml
@@ -3,8 +3,10 @@ sample:
 - name: CDROM Storage Class Driver
   description: Provide access to CD, DVD and Blu-ray drives, supports Plug and Play, Power Management, and AutoRun (media change notification).
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /storage/class/cdrom/cdrom.sln
diff --git a/storage/class/classpnp/storage-class-classpnp.yaml b/storage/class/classpnp/storage-class-classpnp.yml
index 2fa3ac8e..727fcb7b 100644
--- a/storage/class/classpnp/storage-class-classpnp.yaml
+++ b/storage/class/classpnp/storage-class-classpnp.yml
@@ -3,8 +3,10 @@ sample:
 - name: ClassPnP Class Driver Library
   description: A library storage class driver used by disk, CDROM, and the tape class drivers.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /storage/class/classpnp/classpnp.sln
diff --git a/storage/class/disk/storage-class-disk.yaml b/storage/class/disk/storage-class-disk.yml
index 31f19473..5b97a768 100644
--- a/storage/class/disk/storage-class-disk.yaml
+++ b/storage/class/disk/storage-class-disk.yml
@@ -3,8 +3,10 @@ sample:
 - name: Disk Class Driver
   description: A class driver for disk devices.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /storage/class/disk/disk.sln
diff --git a/storage/filters/addfilter/storage-filters-addfilter.yaml b/storage/filters/addfilter/storage-filters-addfilter.yml
index 94e94e71..4b23ef39 100644
--- a/storage/filters/addfilter/storage-filters-addfilter.yaml
+++ b/storage/filters/addfilter/storage-filters-addfilter.yml
@@ -3,8 +3,10 @@ sample:
 - name: AddFilter Storage Filter Tool
   description: A command-line application that adds and removes filter drivers for a given drive or volume.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /storage/filters/addfilter/addfilter.sln
diff --git a/storage/iscsi/storage-iscsi.yaml b/storage/iscsi/storage-iscsi.yml
index 0b819375..e9759d59 100644
--- a/storage/iscsi/storage-iscsi.yaml
+++ b/storage/iscsi/storage-iscsi.yml
@@ -3,8 +3,10 @@ sample:
 - name: iSCSI WMI Client
   description: A WMI iSCSI miniport that can be tested using the iSCSICLI.exe tool, the iSCSI Initiator Properties page, the WBEMTEST.exe tool, and customized WMI scripts.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /storage/iscsi/iscsi.sln
diff --git a/storage/miniports/lsi_u3/storage-miniports-lsi-u3.yaml b/storage/miniports/lsi_u3/storage-miniports-lsi-u3.yml
index 9ee7be12..94391734 100644
--- a/storage/miniports/lsi_u3/storage-miniports-lsi-u3.yaml
+++ b/storage/miniports/lsi_u3/storage-miniports-lsi-u3.yml
@@ -3,8 +3,10 @@ sample:
 - name: LSI_U3 StorPort Miniport Driver
   description: An adapter driver for use with Parallel SCSI Host Bus Adapters or on-motherboard solutions that use the LSI 53C1010 SCSI ASIC.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /storage/miniports/lsi_u3/lsi_u3.sln
diff --git a/storage/miniports/storahci/storage-miniports-storahci.yaml b/storage/miniports/storahci/storage-miniports-storahci.yml
index 97d1aaec..de494421 100644
--- a/storage/miniports/storahci/storage-miniports-storahci.yaml
+++ b/storage/miniports/storahci/storage-miniports-storahci.yml
@@ -3,8 +3,10 @@ sample:
 - name: StorAHCI StorPort Miniport
   description: A sample Storport ACHI miniport driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /storage/miniports/storahci/storahci.sln
diff --git a/storage/msdsm/storage-msdsm.yaml b/storage/msdsm/storage-msdsm.yml
index 28187f83..24db8baf 100644
--- a/storage/msdsm/storage-msdsm.yaml
+++ b/storage/msdsm/storage-msdsm.yml
@@ -3,8 +3,10 @@ sample:
 - name: Multipath I/O (MPIO) DSM Sample
   description: Provides a sample for building vendor-specific device-specific modules (DSM), supports iSCSI and Fibre Channel devices.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /storage/msdsm/msdsm.sln
diff --git a/storage/sfloppy/storage-sfloppy.yaml b/storage/sfloppy/storage-sfloppy.yml
index 76e62af3..8945a3c8 100644
--- a/storage/sfloppy/storage-sfloppy.yaml
+++ b/storage/sfloppy/storage-sfloppy.yml
@@ -3,8 +3,10 @@ sample:
 - name: Super Floppy (sfloppy) Storage Class Driver
   description: A sample class driver for Super Floppy disk drives.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /storage/sfloppy/sfloppy.sln
diff --git a/storage/tools/spti/storage-tools-spti.yaml b/storage/tools/spti/storage-tools-spti.yml
index f43107de..c8cc5267 100644
--- a/storage/tools/spti/storage-tools-spti.yaml
+++ b/storage/tools/spti/storage-tools-spti.yml
@@ -3,8 +3,10 @@ sample:
 - name: SCSI Pass-Through Interface Tool
   description: Demonstrates how to communicate with a SCSI device using pass-through IOCTLs in an application using DeviceIoControl API.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /storage/tools/spti/spti.sln
diff --git a/thermal/simsensor/thermal-simsensor.yaml b/thermal/simsensor/thermal-simsensor.yml
index d02d1d57..085e4db6 100644
--- a/thermal/simsensor/thermal-simsensor.yaml
+++ b/thermal/simsensor/thermal-simsensor.yml
@@ -3,8 +3,10 @@ sample:
 - name: SimSensor - Simulated Temperature Sensor Sample Driver
   description: Demonstrates a simulated temperature sensor device.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /thermal/simsensor/simsensor.sln
diff --git a/thermal/thermalclient/thermal-thermalclient.yaml b/thermal/thermalclient/thermal-thermalclient.yml
index c295593b..1c0f955b 100644
--- a/thermal/thermalclient/thermal-thermalclient.yaml
+++ b/thermal/thermalclient/thermal-thermalclient.yml
@@ -3,8 +3,10 @@ sample:
 - name: SimThermalClient - Simulated Thermal Client Sample Driver
   description: Simulates a device that is a Windows thermal management client.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /thermal/thermalclient/thermalclient.sln
diff --git a/tools/dv/samples/DV-FailDriver-WDM/tools-dv-samples-dv-faildriver-wdm.yaml b/tools/dv/samples/DV-FailDriver-WDM/tools-dv-samples-dv-faildriver-wdm.yml
index 7e9dd247..86c935f6 100644
--- a/tools/dv/samples/DV-FailDriver-WDM/tools-dv-samples-dv-faildriver-wdm.yaml
+++ b/tools/dv/samples/DV-FailDriver-WDM/tools-dv-samples-dv-faildriver-wdm.yml
@@ -3,8 +3,10 @@ sample:
 - name: DV-FailDriver-WDM
   description: Demonstrates how Driver Verifier (DV) can find errors in a WDM driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /tools/dv/samples/DV-FailDriver-WDM/driver/DV-FailDriver-WDM.sln
diff --git a/tools/sdv/samples/SDV-FailDriver-KMDF/tools-sdv-samples-sdv-faildriver-kmdf.yaml b/tools/sdv/samples/SDV-FailDriver-KMDF/tools-sdv-samples-sdv-faildriver-kmdf.yml
index 179187d4..2c6d9197 100644
--- a/tools/sdv/samples/SDV-FailDriver-KMDF/tools-sdv-samples-sdv-faildriver-kmdf.yaml
+++ b/tools/sdv/samples/SDV-FailDriver-KMDF/tools-sdv-samples-sdv-faildriver-kmdf.yml
@@ -3,8 +3,10 @@ sample:
 - name: SDV-FailDriver-KMDF
   description: Demonstrates how Static Driver Verifier (SDV) can find errors in a KMDF driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /tools/sdv/samples/SDV-FailDriver-KMDF/SDV-FailDriver-KMDF.sln
diff --git a/tools/sdv/samples/SDV-FailDriver-NDIS/tools-sdv-samples-sdv-faildriver-ndis.yaml b/tools/sdv/samples/SDV-FailDriver-NDIS/tools-sdv-samples-sdv-faildriver-ndis.yml
index ff5b6f30..13804411 100644
--- a/tools/sdv/samples/SDV-FailDriver-NDIS/tools-sdv-samples-sdv-faildriver-ndis.yaml
+++ b/tools/sdv/samples/SDV-FailDriver-NDIS/tools-sdv-samples-sdv-faildriver-ndis.yml
@@ -3,8 +3,10 @@ sample:
 - name: SDV-FailDriver-NDIS
   description: Demonstrates how Static Driver Verifier (SDV) can find errors in a NDIS driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /tools/sdv/samples/SDV-FailDriver-NDIS/SDV-FailDriver-NDIS.sln
diff --git a/tools/sdv/samples/SDV-FailDriver-STORPORT/tools-sdv-samples-sdv-faildriver-storport.yaml b/tools/sdv/samples/SDV-FailDriver-STORPORT/tools-sdv-samples-sdv-faildriver-storport.yml
index 4cf3e540..81734590 100644
--- a/tools/sdv/samples/SDV-FailDriver-STORPORT/tools-sdv-samples-sdv-faildriver-storport.yaml
+++ b/tools/sdv/samples/SDV-FailDriver-STORPORT/tools-sdv-samples-sdv-faildriver-storport.yml
@@ -3,8 +3,10 @@ sample:
 - name: SDV-FailDriver-STORPORT
   description: Demonstrates how Static Driver Verifier (SDV) can find errors in a Storport driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /tools/sdv/samples/SDV-FailDriver-STORPORT/SDV-FailDriver-STORPORT.sln
diff --git a/tools/sdv/samples/SDV-FailDriver-WDM/tools-sdv-samples-sdv-faildriver-wdm.yaml b/tools/sdv/samples/SDV-FailDriver-WDM/tools-sdv-samples-sdv-faildriver-wdm.yml
index 835a52a5..a746c40c 100644
--- a/tools/sdv/samples/SDV-FailDriver-WDM/tools-sdv-samples-sdv-faildriver-wdm.yaml
+++ b/tools/sdv/samples/SDV-FailDriver-WDM/tools-sdv-samples-sdv-faildriver-wdm.yml
@@ -3,8 +3,10 @@ sample:
 - name: SDV-FailDriver-WDM
   description: Demonstrates how Static Driver Verifier (SDV) can find errors in a WDM driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /tools/sdv/samples/SDV-FailDriver-WDM/SDV-FailDriver-WDM.sln
diff --git a/usb/UcmCxUcsi/usb-ucmcxucsi.yaml b/usb/UcmCxUcsi/usb-ucmcxucsi.yml
index 45dd9b0e..3b169724 100644
--- a/usb/UcmCxUcsi/usb-ucmcxucsi.yaml
+++ b/usb/UcmCxUcsi/usb-ucmcxucsi.yml
@@ -3,8 +3,10 @@ sample:
 - name: UcmTcpciCx Port Controller Client Driver
   description: Demonstrates how to create a Windows USB Type-C port controller driver using the USB Connector Manager class extension driver (UcmCx).
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /usb/UcmCxUcsi/UcmCxUcsi.sln
diff --git a/usb/UcmTcpciCxClientSample/usb-ucmtcpcicxclientsample.yaml b/usb/UcmTcpciCxClientSample/usb-ucmtcpcicxclientsample.yml
index 350e7cca..f65285df 100644
--- a/usb/UcmTcpciCxClientSample/usb-ucmtcpcicxclientsample.yaml
+++ b/usb/UcmTcpciCxClientSample/usb-ucmtcpcicxclientsample.yml
@@ -3,8 +3,10 @@ sample:
 - name: UcmTcpciCx Port Controller Client Driver
   description: Demonstrates how to create a Windows USB Type-C port controller driver using the USB Connector Manager Type-C Port Controller Interface class extension driver (UcmTcpciCx).
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /usb/UcmTcpciCxClientSample/UcmTcpciCxClientSample.sln
diff --git a/usb/UcmUcsiAcpiSample/usb-ucmucsiacpisample.yml b/usb/UcmUcsiAcpiSample/usb-ucmucsiacpisample.yml
new file mode 100644
index 00000000..0b2b419d
--- /dev/null
+++ b/usb/UcmUcsiAcpiSample/usb-ucmucsiacpisample.yml
@@ -0,0 +1,12 @@
+### YamlMime:Sample
+sample:
+- name: UcmUcsiCx ACPI Client Driver
+  description: Demonstrates how to create a Windows USB Type-C port controller driver using the USB Connector Manager class extension driver (UcmCx).
+  generateZip: true
+  preserveParentHierarchy: true
+  author: windows-driver-samples
+  languages:
+  - cpp
+  technologies:
+  - windows
+  vssolution: /usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample.sln
diff --git a/usb/kmdf_enumswitches/usb-kmdf-enumswitches.yaml b/usb/kmdf_enumswitches/usb-kmdf-enumswitches.yml
index 46f5efb3..251db0e4 100644
--- a/usb/kmdf_enumswitches/usb-kmdf-enumswitches.yaml
+++ b/usb/kmdf_enumswitches/usb-kmdf-enumswitches.yml
@@ -3,8 +3,10 @@ sample:
 - name: Sample KMDF Bus Driver for OSR USB-FX2
   description: Demonstrates how to use KMDF as a bus driver using the OSR USB-FX2 device.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /usb/kmdf_enumswitches/kmdf_enumswitches.sln
diff --git a/usb/kmdf_fx2/README.md b/usb/kmdf_fx2/README.md
index 68666660..dbab6c16 100644
--- a/usb/kmdf_fx2/README.md
+++ b/usb/kmdf_fx2/README.md
@@ -58,7 +58,7 @@ This directory contains driver code that demonstrates the following functionalit
 -   Loads the driver and responds to PnP and Power events. You can install, uninstall, disable, enable, suspend, and resume the system.
 -   Creates a context with the WDFDEVICE object.
 -   Initializes the USB device by registering a *EvtPrepareHardware* callback.
--   Marks the interface restricted so that it can be accessed by a privileged Windows Store device app.
+-   Marks the interface restricted so that it can be accessed by a privileged UWP device app.
 -   Creates a default parallel queue to receive an IOCTL request to set bar graph display.
 -   Retrieves memory handle from the requests and uses it to send a vendor command to the USB device.
 -   Registers read and write events on the default queue.
diff --git a/usb/kmdf_fx2/usb-kmdf-fx2.yaml b/usb/kmdf_fx2/usb-kmdf-fx2.yml
index b9fc8bec..dcbf9021 100644
--- a/usb/kmdf_fx2/usb-kmdf-fx2.yaml
+++ b/usb/kmdf_fx2/usb-kmdf-fx2.yml
@@ -3,8 +3,10 @@ sample:
 - name: Sample KMDF Function Driver for OSR USB-FX2
   description: Demonstrates how to use KMDF to perform bulk and interrupt data transfers to a USB device.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /usb/kmdf_fx2/kmdf_fx2.sln
diff --git a/usb/ufxclientsample/usb-ufxclientsample.yaml b/usb/ufxclientsample/usb-ufxclientsample.yml
index e22c8b93..54c5eea7 100644
--- a/usb/ufxclientsample/usb-ufxclientsample.yaml
+++ b/usb/ufxclientsample/usb-ufxclientsample.yml
@@ -3,8 +3,10 @@ sample:
 - name: USB Function Client Driver
   description: Demonstrates how to create a Windows USB function controller driver using the USB function class extension driver (UFX).
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /usb/ufxclientsample/ufxclientsample.sln
diff --git a/usb/umdf2_fx2/usb-umdf2-fx2.yaml b/usb/umdf2_fx2/usb-umdf2-fx2.yml
index 892a3bd3..dd64a682 100644
--- a/usb/umdf2_fx2/usb-umdf2-fx2.yaml
+++ b/usb/umdf2_fx2/usb-umdf2-fx2.yml
@@ -3,8 +3,10 @@ sample:
 - name: Sample Function Driver for OSR USB-FX2 (UMDF Version 2)
   description: Demonstrates a UMDF version 2 driver for the OSR USB-FX2 device.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /usb/umdf2_fx2/umdf2_fx2.sln
diff --git a/usb/umdf_filter_kmdf/usb-umdf-filter-kmdf.yaml b/usb/umdf_filter_kmdf/usb-umdf-filter-kmdf.yml
index 837266a5..00a33b2b 100644
--- a/usb/umdf_filter_kmdf/usb-umdf-filter-kmdf.yaml
+++ b/usb/umdf_filter_kmdf/usb-umdf-filter-kmdf.yml
@@ -3,8 +3,10 @@ sample:
 - name: Sample UMDF Filter above KMDF Function Driver for OSR USB-FX2 (UMDF Version 1)
   description: Demonstrates how to load a UMDF filter driver as an upper filter driver above the kmdf_fx2 sample driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /usb/umdf_filter_kmdf/umdf_filter_kmdf.sln
diff --git a/usb/umdf_filter_umdf/usb-umdf-filter-umdf.yaml b/usb/umdf_filter_umdf/usb-umdf-filter-umdf.yml
index 9e2098e9..987a1355 100644
--- a/usb/umdf_filter_umdf/usb-umdf-filter-umdf.yaml
+++ b/usb/umdf_filter_umdf/usb-umdf-filter-umdf.yml
@@ -3,8 +3,10 @@ sample:
 - name: Sample UMDF Filter above UMDF Function Driver for OSR USB-FX2 (UMDF Version 1)
   description: Demonstrates how to load a UMDF filter driver as an upper filter driver above the umdf_fx2 sample driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /usb/umdf_filter_umdf/umdf_filter_umdf.sln
diff --git a/usb/umdf_fx2/usb-umdf-fx2.yaml b/usb/umdf_fx2/usb-umdf-fx2.yml
index 20de8651..e802c6f5 100644
--- a/usb/umdf_fx2/usb-umdf-fx2.yaml
+++ b/usb/umdf_fx2/usb-umdf-fx2.yml
@@ -3,8 +3,10 @@ sample:
 - name: Sample UMDF Function Driver for OSR USB-FX2 (UMDF version 1)
   description: A UMDF driver for the OSR USB-FX2 device that includes a test application, sample device metadata, and supports impersonation and idle power down.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /usb/umdf_fx2/umdf_fx2.sln
diff --git a/usb/usbsamp/usb-usbsamp.yaml b/usb/usbsamp/usb-usbsamp.yml
index 1d8b9af1..f6c894a8 100644
--- a/usb/usbsamp/usb-usbsamp.yaml
+++ b/usb/usbsamp/usb-usbsamp.yml
@@ -3,8 +3,10 @@ sample:
 - name: Usbsamp Generic USB Driver
   description: Demonstrates how to perform full speed, high speed, and SuperSpeed transfers to and from bulk and isochronous endpoints of a generic USB device.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /usb/usbsamp/usbsamp.sln
diff --git a/usb/usbview/usb-usbview.yaml b/usb/usbview/usb-usbview.yml
index cc4df433..9cd8ed94 100644
--- a/usb/usbview/usb-usbview.yaml
+++ b/usb/usbview/usb-usbview.yml
@@ -3,8 +3,10 @@ sample:
 - name: USBView sample application
   description: Provides an application that allows you to browse all USB controllers and connected USB devices on your system.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /usb/usbview/usbview.sln
diff --git a/usb/wdf_osrfx2_lab/usb-wdf-osrfx2-lab.yaml b/usb/wdf_osrfx2_lab/usb-wdf-osrfx2-lab.yml
index be0ca560..8604f630 100644
--- a/usb/wdf_osrfx2_lab/usb-wdf-osrfx2-lab.yaml
+++ b/usb/wdf_osrfx2_lab/usb-wdf-osrfx2-lab.yml
@@ -3,8 +3,10 @@ sample:
 - name: WDF Sample Driver Learning Lab for OSR USB-FX2
   description: Contains a console test application and a series of iterative drivers for both KMDF and UMDF version 1.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /usb/wdf_osrfx2_lab/wdf_osrfx2_lab.sln
diff --git a/video/KMDOD/video-kmdod.yaml b/video/KMDOD/video-kmdod.yml
index cfb0d0ea..70824db6 100644
--- a/video/KMDOD/video-kmdod.yaml
+++ b/video/KMDOD/video-kmdod.yml
@@ -3,8 +3,10 @@ sample:
 - name: Kernel mode display-only miniport driver (KMDOD) sample
   description: Implements most DDIs that a display-only miniport driver should provide to the Windows Display Driver Model (WDDM).
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /video/KMDOD/KMDOD.sln
diff --git a/video/pixlib/video-pixlib.yaml b/video/pixlib/video-pixlib.yml
index 15263676..efff7fdd 100644
--- a/video/pixlib/video-pixlib.yaml
+++ b/video/pixlib/video-pixlib.yml
@@ -3,8 +3,10 @@ sample:
 - name: PixLib sample
   description: Demonstrates how to implement the CPixel class for use by a display driver.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /video/pixlib/pixlib.sln
diff --git a/wia/wia.yaml b/wia/wia.yml
index 5c83df05..036fbde7 100644
--- a/wia/wia.yaml
+++ b/wia/wia.yml
@@ -3,8 +3,10 @@ sample:
 - name: Windows Image Acquisition (WIA) Driver Samples
   description: Contains samples and test tools for Windows Image Acquisition (WIA), a driver architecture and user interface for acquiring images from still image devices such as scanners.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /wia/wia.sln
diff --git a/wmi/wmiacpi/wmi-wmiacpi.yaml b/wmi/wmiacpi/wmi-wmiacpi.yml
index 47110a29..fd6a5ab0 100644
--- a/wmi/wmiacpi/wmi-wmiacpi.yaml
+++ b/wmi/wmiacpi/wmi-wmiacpi.yml
@@ -3,8 +3,10 @@ sample:
 - name: WMIACPI Sample
   description: Contains ACPI BIOS and WMI sample code that enables instrumentation of the ACPI BIOS from within ACPI Source Language (ASL) code.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /wmi/wmiacpi/wmiacpi.sln
diff --git a/wmi/wmisamp/wmi-wmisamp.yaml b/wmi/wmisamp/wmi-wmisamp.yml
index f6885baa..50b5446f 100644
--- a/wmi/wmisamp/wmi-wmisamp.yaml
+++ b/wmi/wmisamp/wmi-wmisamp.yml
@@ -3,8 +3,10 @@ sample:
 - name: WmiSamp WMI Provider
   description: Demonstrates how to register WMI providers in KMDF, create provider instances, and handle WMI queries sent to a device.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /wmi/wmisamp/wmisamp.sln
diff --git a/wpd/WpdBasicHardwareDriver/wpd-wpdbasichardwaredriver.yaml b/wpd/WpdBasicHardwareDriver/wpd-wpdbasichardwaredriver.yml
index 32f84f45..087df718 100644
--- a/wpd/WpdBasicHardwareDriver/wpd-wpdbasichardwaredriver.yaml
+++ b/wpd/WpdBasicHardwareDriver/wpd-wpdbasichardwaredriver.yml
@@ -3,8 +3,10 @@ sample:
 - name: WPD Basic Hardware Sample Driver
   description: Supports nine sensor devices that integrate with the Parallax BS2 programmable microcontroller.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /wpd/WpdBasicHardwareDriver/WpdBasicHardwareDriver.sln
diff --git a/wpd/WpdHelloWorldDriver/wpd-wpdhelloworlddriver.yaml b/wpd/WpdHelloWorldDriver/wpd-wpdhelloworlddriver.yml
index 8ce3dc30..3de52214 100644
--- a/wpd/WpdHelloWorldDriver/wpd-wpdhelloworlddriver.yaml
+++ b/wpd/WpdHelloWorldDriver/wpd-wpdhelloworlddriver.yml
@@ -3,8 +3,10 @@ sample:
 - name: WPD Hello World Sample
   description: Supports four objects - a device object, a storage object, a folder object, and a file object.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /wpd/WpdHelloWorldDriver/WpdHelloWorldDriver.sln
diff --git a/wpd/WpdMultiTransportDriver/wpd-wpdmultitransportdriver.yaml b/wpd/WpdMultiTransportDriver/wpd-wpdmultitransportdriver.yml
index 8561eb53..776835d2 100644
--- a/wpd/WpdMultiTransportDriver/wpd-wpdmultitransportdriver.yaml
+++ b/wpd/WpdMultiTransportDriver/wpd-wpdmultitransportdriver.yml
@@ -3,8 +3,10 @@ sample:
 - name: WPD multi-transport sample driver
   description: Demonstrates how to extend the WpdHelloWorldDriver for a device that supports multiple transports.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /wpd/WpdMultiTransportDriver/WpdMultiTransportDriver.sln
diff --git a/wpd/WpdServiceSampleDriver/wpd-wpdwudfsampledriver.yaml b/wpd/WpdServiceSampleDriver/wpd-wpdwudfsampledriver.yml
index 889c2fee..20472a08 100644
--- a/wpd/WpdServiceSampleDriver/wpd-wpdwudfsampledriver.yaml
+++ b/wpd/WpdServiceSampleDriver/wpd-wpdwudfsampledriver.yml
@@ -3,8 +3,10 @@ sample:
 - name: WPD service sample driver
   description: Demonstrates how to extend the WpdHelloWorldDriver sample so that it supports a simulated device with a Contacts device service.
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.sln
diff --git a/wpd/WpdWudfSampleDriver/wpd-wpdservicesampledriver.yaml b/wpd/WpdWudfSampleDriver/wpd-wpdservicesampledriver.yml
index 4aa740c7..4a2becbd 100644
--- a/wpd/WpdWudfSampleDriver/wpd-wpdservicesampledriver.yaml
+++ b/wpd/WpdWudfSampleDriver/wpd-wpdservicesampledriver.yml
@@ -3,8 +3,10 @@ sample:
 - name: WPD WUDF sample driver
   description: Demonstrates virtually all aspects of the WPD device driver interface (DDI).
   generateZip: true
+  preserveParentHierarchy: true
   author: windows-driver-samples
   languages:
   - cpp
   technologies:
   - windows
+  vssolution: /wpd/WpdWudfSampleDriver/WpdWudfSampleDriver.sln