Update a sample to test nuget

7 files changed, 130 insertions, 20 deletions

diff --git a/general/echo/kmdf/driver/AutoSync/echo.vcxproj b/general/echo/kmdf/driver/AutoSync/echo.vcxproj
index ee243a5d..8383d1d1 100644
--- a/general/echo/kmdf/driver/AutoSync/echo.vcxproj
+++ b/general/echo/kmdf/driver/AutoSync/echo.vcxproj
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\Microsoft.Windows.WDK.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.WDK.props" Condition="Exists('..\..\packages\Microsoft.Windows.WDK.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.WDK.props')" />
+  <Import Project="..\..\packages\Microsoft.Windows.SDK.CPP.x86.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x86.props" Condition="Exists('..\..\packages\Microsoft.Windows.SDK.CPP.x86.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x86.props')" />
+  <Import Project="..\..\packages\Microsoft.Windows.SDK.CPP.x64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x64.props" Condition="Exists('..\..\packages\Microsoft.Windows.SDK.CPP.x64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x64.props')" />
+  <Import Project="..\..\packages\Microsoft.Windows.SDK.CPP.arm64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm64.props" Condition="Exists('..\..\packages\Microsoft.Windows.SDK.CPP.arm64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm64.props')" />
+  <Import Project="..\..\packages\Microsoft.Windows.SDK.CPP.arm.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm.props" Condition="Exists('..\..\packages\Microsoft.Windows.SDK.CPP.arm.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm.props')" />
+  <Import Project="..\..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.props" Condition="Exists('..\..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -153,9 +159,23 @@
     <None Exclude="@(None)" Include="*.txt;*.htm;*.html" />
     <None Exclude="@(None)" Include="*.ico;*.cur;*.bmp;*.dlg;*.rct;*.gif;*.jpg;*.jpeg;*.wav;*.jpe;*.tiff;*.tif;*.png;*.rc2" />
     <None Exclude="@(None)" Include="*.def;*.bat;*.hpj;*.asmx" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Exclude="@(ClInclude)" Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.SDK.CPP.arm.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.SDK.CPP.arm.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.SDK.CPP.arm64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.SDK.CPP.arm64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm64.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.SDK.CPP.x64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.SDK.CPP.x64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x64.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.SDK.CPP.x86.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.SDK.CPP.x86.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x86.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.WDK.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.WDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.WDK.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.WDK.props'))" />
+  </Target>
+  <Import Project="..\..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.targets" Condition="Exists('..\..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.targets')" />
+</Project>
\ No newline at end of file
diff --git a/general/echo/kmdf/driver/AutoSync/echo.vcxproj.Filters b/general/echo/kmdf/driver/AutoSync/echo.vcxproj.Filters
index b74c71cb..04f30df2 100644
--- a/general/echo/kmdf/driver/AutoSync/echo.vcxproj.Filters
+++ b/general/echo/kmdf/driver/AutoSync/echo.vcxproj.Filters
@@ -29,4 +29,23 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Inf Include="*.inx">
+      <Filter>Driver Files</Filter>
+    </Inf>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj b/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj
index 4a77818d..a136b802 100644
--- a/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj
+++ b/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\Microsoft.Windows.WDK.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.WDK.props" Condition="Exists('..\..\packages\Microsoft.Windows.WDK.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.WDK.props')" />
+  <Import Project="..\..\packages\Microsoft.Windows.SDK.CPP.x86.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x86.props" Condition="Exists('..\..\packages\Microsoft.Windows.SDK.CPP.x86.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x86.props')" />
+  <Import Project="..\..\packages\Microsoft.Windows.SDK.CPP.x64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x64.props" Condition="Exists('..\..\packages\Microsoft.Windows.SDK.CPP.x64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x64.props')" />
+  <Import Project="..\..\packages\Microsoft.Windows.SDK.CPP.arm64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm64.props" Condition="Exists('..\..\packages\Microsoft.Windows.SDK.CPP.arm64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm64.props')" />
+  <Import Project="..\..\packages\Microsoft.Windows.SDK.CPP.arm.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm.props" Condition="Exists('..\..\packages\Microsoft.Windows.SDK.CPP.arm.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm.props')" />
+  <Import Project="..\..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.props" Condition="Exists('..\..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -58,6 +64,7 @@
     <DriverType>KMDF</DriverType>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Driver</ConfigurationType>
+    <Driver_SpectreMitigation>false</Driver_SpectreMitigation>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <PropertyGroup>
@@ -165,9 +172,23 @@
     <None Exclude="@(None)" Include="*.txt;*.htm;*.html" />
     <None Exclude="@(None)" Include="*.ico;*.cur;*.bmp;*.dlg;*.rct;*.gif;*.jpg;*.jpeg;*.wav;*.jpe;*.tiff;*.tif;*.png;*.rc2" />
     <None Exclude="@(None)" Include="*.def;*.bat;*.hpj;*.asmx" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Exclude="@(ClInclude)" Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.SDK.CPP.arm.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.SDK.CPP.arm.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.SDK.CPP.arm64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.SDK.CPP.arm64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm64.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.SDK.CPP.x64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.SDK.CPP.x64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x64.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.SDK.CPP.x86.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.SDK.CPP.x86.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x86.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.WDK.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.WDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.WDK.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.WDK.props'))" />
+  </Target>
+  <Import Project="..\..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.targets" Condition="Exists('..\..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.targets')" />
 </Project>
\ No newline at end of file
diff --git a/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj.Filters b/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj.Filters
index a8292fef..9786fc70 100644
--- a/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj.Filters
+++ b/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj.Filters
@@ -29,4 +29,23 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Inf Include="*.inx">
+      <Filter>Driver Files</Filter>
+    </Inf>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/general/echo/kmdf/exe/echoapp.vcxproj b/general/echo/kmdf/exe/echoapp.vcxproj
index d0c2d740..6812f8d0 100644
--- a/general/echo/kmdf/exe/echoapp.vcxproj
+++ b/general/echo/kmdf/exe/echoapp.vcxproj
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Microsoft.Windows.WDK.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.WDK.props" Condition="Exists('..\packages\Microsoft.Windows.WDK.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.WDK.props')" />
+  <Import Project="..\packages\Microsoft.Windows.SDK.CPP.x86.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x86.props" Condition="Exists('..\packages\Microsoft.Windows.SDK.CPP.x86.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x86.props')" />
+  <Import Project="..\packages\Microsoft.Windows.SDK.CPP.x64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x64.props" Condition="Exists('..\packages\Microsoft.Windows.SDK.CPP.x64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x64.props')" />
+  <Import Project="..\packages\Microsoft.Windows.SDK.CPP.arm64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm64.props" Condition="Exists('..\packages\Microsoft.Windows.SDK.CPP.arm64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm64.props')" />
+  <Import Project="..\packages\Microsoft.Windows.SDK.CPP.arm.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm.props" Condition="Exists('..\packages\Microsoft.Windows.SDK.CPP.arm.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm.props')" />
+  <Import Project="..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.props" Condition="Exists('..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -174,9 +180,23 @@
     <None Exclude="@(None)" Include="*.txt;*.htm;*.html" />
     <None Exclude="@(None)" Include="*.ico;*.cur;*.bmp;*.dlg;*.rct;*.gif;*.jpg;*.jpeg;*.wav;*.jpe;*.tiff;*.tif;*.png;*.rc2" />
     <None Exclude="@(None)" Include="*.def;*.bat;*.hpj;*.asmx" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Exclude="@(ClInclude)" Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.CPP.arm.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.CPP.arm.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.CPP.arm64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.CPP.arm64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.arm64.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.CPP.x64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.CPP.x64.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x64.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.CPP.x86.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.CPP.x86.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.x86.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.WDK.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.WDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.WDK.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.WDK.props'))" />
+  </Target>
+  <Import Project="..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.targets" Condition="Exists('..\packages\Microsoft.Windows.SDK.CPP.10.0.21304.1000-preview.rs-onecore-sigma-dplat-kits\build\native\Microsoft.Windows.SDK.cpp.targets')" />
 </Project>
\ No newline at end of file
diff --git a/general/echo/kmdf/exe/echoapp.vcxproj.Filters b/general/echo/kmdf/exe/echoapp.vcxproj.Filters
index 0292f388..1721593d 100644
--- a/general/echo/kmdf/exe/echoapp.vcxproj.Filters
+++ b/general/echo/kmdf/exe/echoapp.vcxproj.Filters
@@ -19,4 +19,12 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/general/echo/kmdf/kmdfecho.sln b/general/echo/kmdf/kmdfecho.sln
index fc7a8245..f84d71ad 100644
--- a/general/echo/kmdf/kmdfecho.sln
+++ b/general/echo/kmdf/kmdfecho.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30709.132
 MinimumVisualStudioVersion = 12.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{4C3245DE-386F-4315-AE20-B7F8938239A7}"
 EndProject
@@ -11,7 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{4A3350
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DriverSync", "DriverSync", "{329569F4-D659-4E23-9B29-791CA85BF28F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echoapp", "exe\echoapp.vcxproj", "{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echoapp", "exe\echoapp.vcxproj", "{4500713F-105B-4F35-9FC9-85D30E7C3F2D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echo", "driver\AutoSync\echo.vcxproj", "{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}"
 EndProject
@@ -20,33 +20,33 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
 		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Debug|Win32.Build.0 = Debug|Win32
-		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Release|Win32.ActiveCfg = Release|Win32
-		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Release|Win32.Build.0 = Release|Win32
-		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Debug|x64.ActiveCfg = Debug|x64
-		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Debug|x64.Build.0 = Debug|x64
-		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Release|x64.ActiveCfg = Release|x64
-		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69}.Release|x64.Build.0 = Release|x64
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Debug|Win32.Build.0 = Debug|Win32
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Debug|x64.ActiveCfg = Debug|x64
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Debug|x64.Build.0 = Debug|x64
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Release|Win32.ActiveCfg = Release|Win32
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Release|Win32.Build.0 = Release|Win32
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Release|x64.ActiveCfg = Release|x64
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D}.Release|x64.Build.0 = Release|x64
 		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Debug|Win32.ActiveCfg = Debug|Win32
 		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Debug|Win32.Build.0 = Debug|Win32
-		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Release|Win32.ActiveCfg = Release|Win32
-		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Release|Win32.Build.0 = Release|Win32
 		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Debug|x64.ActiveCfg = Debug|x64
 		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Debug|x64.Build.0 = Debug|x64
+		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Release|Win32.ActiveCfg = Release|Win32
+		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Release|Win32.Build.0 = Release|Win32
 		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Release|x64.ActiveCfg = Release|x64
 		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66}.Release|x64.Build.0 = Release|x64
 		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Debug|Win32.Build.0 = Debug|Win32
-		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Release|Win32.ActiveCfg = Release|Win32
-		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Release|Win32.Build.0 = Release|Win32
 		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Debug|x64.ActiveCfg = Debug|x64
 		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Debug|x64.Build.0 = Debug|x64
+		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Release|Win32.ActiveCfg = Release|Win32
+		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Release|Win32.Build.0 = Release|Win32
 		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Release|x64.ActiveCfg = Release|x64
 		{8E09C05F-B634-49BE-96C9-64682605DFB0}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
@@ -54,10 +54,13 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{9F70D0C8-AA7D-49A2-BF1C-C09619329F69} = {4C3245DE-386F-4315-AE20-B7F8938239A7}
-		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66} = {F6CBEC4C-BA8E-46F5-9A69-B164E393E074}
-		{8E09C05F-B634-49BE-96C9-64682605DFB0} = {329569F4-D659-4E23-9B29-791CA85BF28F}
 		{F6CBEC4C-BA8E-46F5-9A69-B164E393E074} = {4A3350D6-C44E-40F3-9274-DCC201D5613E}
 		{329569F4-D659-4E23-9B29-791CA85BF28F} = {4A3350D6-C44E-40F3-9274-DCC201D5613E}
+		{4500713F-105B-4F35-9FC9-85D30E7C3F2D} = {4C3245DE-386F-4315-AE20-B7F8938239A7}
+		{44FE3C21-35D7-4253-B15A-3E0F6AAB8B66} = {F6CBEC4C-BA8E-46F5-9A69-B164E393E074}
+		{8E09C05F-B634-49BE-96C9-64682605DFB0} = {329569F4-D659-4E23-9B29-791CA85BF28F}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {CBA507D5-885B-463A-858D-F18517630AA8}
 	EndGlobalSection
 EndGlobal