From 4473e41ab37f9dbad07409f62bd6b1e72847b587 Mon Sep 17 00:00:00 2001
From: Yuri Benditovich <yuri.benditovich@daynix.com>
Date: Fri, 25 Jan 2019 11:22:55 +0200
Subject: [PATCH] Update project files for build with higher WDK installed

When higher WDK than 14393 is installed on the machine, the modified
files related to build of drivers and driver-related applications may
produce errors on build using VS2015. Fixed project files solve this.

Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com>
---
 Tools/Driver.Initial.props              | 31 +++++++++++++++++++++++++
 UsbDk Package/UsbDk Package.vcxproj     |  1 +
 UsbDk/UsbDk.vcxproj                     |  1 +
 UsbDkController/UsbDkController.vcxproj |  2 ++
 UsbDkHelper/UsbDkHelper.vcxproj         |  2 ++
 UsbDkInstHelper/UsbDkInstHelper.vcxproj |  2 ++
 6 files changed, 39 insertions(+)
 create mode 100644 Tools/Driver.Initial.props

diff --git a/Tools/Driver.Initial.props b/Tools/Driver.Initial.props
new file mode 100644
index 0000000..20189b1
--- /dev/null
+++ b/Tools/Driver.Initial.props
@@ -0,0 +1,31 @@
+<!--
+***********************************************************************************************
+Driver.Initial.props
+Should be imported just after Microsoft.Cpp.Default.props
+and after target Windows versions defined for configurations
+Common property definitions used by all drivers:
+
+***********************************************************************************************
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" TreatAsLocalProperty="Platform">
+
+  <Target Name="IntermediateNotify" BeforeTargets="PrepareForBuild" AfterTargets="DriverBuildNotifications">
+    <!-- Indicate to users what they are building -->
+    <Message Importance="high" Text="Driver.Initial.props: TargetVersion=$(TargetVersion) _NT_TARGET_VERSION=$(_NT_TARGET_VERSION) SUBSYSTEM_NATVER=$(SUBSYSTEM_NATVER) mismatch=$(MidlTargetMismatch)" />
+  </Target>
+
+  <PropertyGroup Condition="'$(TargetVersion)'=='Windows10'">
+  <_NT_TARGET_VERSION>0x0A00</_NT_TARGET_VERSION>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetVersion)'=='WindowsV6.3'">
+    <_NT_TARGET_VERSION>0x0603</_NT_TARGET_VERSION>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetVersion)'=='Windows8'">
+    <_NT_TARGET_VERSION>0x0602</_NT_TARGET_VERSION>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetVersion)'=='Windows7'">
+    <_NT_TARGET_VERSION>0x0601</_NT_TARGET_VERSION>
+  </PropertyGroup>
+
+</Project>
diff --git a/UsbDk Package/UsbDk Package.vcxproj b/UsbDk Package/UsbDk Package.vcxproj
index e726e30..621b988 100644
--- a/UsbDk Package/UsbDk Package.vcxproj	
+++ b/UsbDk Package/UsbDk Package.vcxproj	
@@ -381,6 +381,7 @@
     <DriverType>Package</DriverType>
     <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
   </PropertyGroup>
+  <Import Project="..\Tools\Driver.Initial.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
diff --git a/UsbDk/UsbDk.vcxproj b/UsbDk/UsbDk.vcxproj
index 4a82622..94c01a6 100644
--- a/UsbDk/UsbDk.vcxproj
+++ b/UsbDk/UsbDk.vcxproj
@@ -1178,6 +1178,7 @@
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <KMDF_VERSION_MINOR>11</KMDF_VERSION_MINOR>
   </PropertyGroup>
+  <Import Project="..\Tools\Driver.Initial.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
diff --git a/UsbDkController/UsbDkController.vcxproj b/UsbDkController/UsbDkController.vcxproj
index 10fdaa1..dc3ff61 100644
--- a/UsbDkController/UsbDkController.vcxproj
+++ b/UsbDkController/UsbDkController.vcxproj
@@ -127,6 +127,7 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>UsbDkController</RootNamespace>
     <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <TargetVersion>Windows7</TargetVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'" Label="Configuration">
@@ -322,6 +323,7 @@
     <CharacterSet>Unicode</CharacterSet>
     <DriverTargetPlatform>Desktop</DriverTargetPlatform>
   </PropertyGroup>
+  <Import Project="..\Tools\Driver.Initial.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
diff --git a/UsbDkHelper/UsbDkHelper.vcxproj b/UsbDkHelper/UsbDkHelper.vcxproj
index 2e8da91..bfdc94b 100644
--- a/UsbDkHelper/UsbDkHelper.vcxproj
+++ b/UsbDkHelper/UsbDkHelper.vcxproj
@@ -127,6 +127,7 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>UsbDkHelper</RootNamespace>
     <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <TargetVersion>Windows7</TargetVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'" Label="Configuration">
@@ -322,6 +323,7 @@
     <CharacterSet>Unicode</CharacterSet>
     <DriverTargetPlatform>Desktop</DriverTargetPlatform>
   </PropertyGroup>
+  <Import Project="..\Tools\Driver.Initial.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
diff --git a/UsbDkInstHelper/UsbDkInstHelper.vcxproj b/UsbDkInstHelper/UsbDkInstHelper.vcxproj
index cda36cf..7b4cda8 100644
--- a/UsbDkInstHelper/UsbDkInstHelper.vcxproj
+++ b/UsbDkInstHelper/UsbDkInstHelper.vcxproj
@@ -127,6 +127,7 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>UsbDkController</RootNamespace>
     <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <TargetVersion>Windows7</TargetVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'" Label="Configuration">
@@ -322,6 +323,7 @@
     <CharacterSet>Unicode</CharacterSet>
     <DriverTargetPlatform>Desktop</DriverTargetPlatform>
   </PropertyGroup>
+  <Import Project="..\Tools\Driver.Initial.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>