Fixes for VS2015/WDK10 build

The package build was not working correctly and caused the overall build
to fail.
At least part of the reason for this is that Microsoft, in their infinite
wisdom, have removed the DIFx redist from WDK10. This patch makes use of
a new environment variable 'DPINST_REDIST' to find the copy of dpinst.exe
to package such that this can be pointed at an older WDK or alternative
location where dpinst.exe can be found.

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>

diff --git a/vs2015/package/package.vcxproj b/vs2015/package/package.vcxproj
index 9357e878401a39a2fea4b7af31667ac23351d1e6..907764fbfdaff589929bb6b8f7af95968ffc6ae5 100644 (file)
--- a/vs2015/package/package.vcxproj
+++ b/vs2015/package/package.vcxproj
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\configs.props" />
   <PropertyGroup Label="PropertySheets">
-    <DriverType>WDM</DriverType>
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
+    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Utility</ConfigurationType>
     <DriverType>Package</DriverType>
     <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
+    <SupportsPackaging>true</SupportsPackaging>
+    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Globals">
@@ -28,8 +29,7 @@
     <VerifyProjectOutput>True</VerifyProjectOutput>
     <VerifyFlags>133563</VerifyFlags>
     <IntDir>..\$(ProjectName)\$(ConfigurationName)\$(Platform)\</IntDir>
-    <OutDir>..\$(ConfigurationName)\$(Platform)\</OutDir>
-    <PackageDir>..\..\xennet\$(DDKPlatform)</PackageDir>
+    <OutDir>..\..\xennet\$(DDKPlatform)</OutDir>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\xennet\xennet.vcxproj">
@@ -40,8 +40,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <FilesToPackage Include="$(KIT)\Redist\DIFx\dpinst\EngMui\x86\dpinst.exe" Condition="'$(Platform)'=='Win32'" />
-    <FilesToPackage Include="$(KIT)\Redist\DIFx\dpinst\EngMui\x64\dpinst.exe" Condition="'$(Platform)'=='x64'" />
+    <FilesToPackage Include="$(DPINST_REDIST)\x86\dpinst.exe" Condition="'$(Platform)'=='Win32'" />
+    <FilesToPackage Include="$(DPINST_REDIST)\x64\dpinst.exe" Condition="'$(Platform)'=='x64'" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/vs2015/package/package.vcxproj.user b/vs2015/package/package.vcxproj.user
index a5433e9a6776d8c2389b48b3fd30b9cfe01d0174..8b034c4085c4f8e35877de3fe2c41732a61d873b 100644 (file)
--- a/vs2015/package/package.vcxproj.user
+++ b/vs2015/package/package.vcxproj.user
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <SignMode>TestSign</SignMode>
     <TestCertificate>..\..\src\xennet.pfx</TestCertificate>

diff --git a/vs2015/xennet/xennet.vcxproj b/vs2015/xennet/xennet.vcxproj
index 7dfddb2cc3c16f9c802fd3e762460e7b2f0e9215..d3b6e9a316d6f395af1a6f87c354114c08d654bb 100644 (file)
--- a/vs2015/xennet/xennet.vcxproj
+++ b/vs2015/xennet/xennet.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\configs.props" />
   <PropertyGroup Label="PropertySheets">
     <ConfigurationType>Driver</ConfigurationType>

diff --git a/vs2015/xennet/xennet.vcxproj.user b/vs2015/xennet/xennet.vcxproj.user
index 770fdca502ef4dbc33dd0e6b28052c95715deeb6..8b034c4085c4f8e35877de3fe2c41732a61d873b 100644 (file)
--- a/vs2015/xennet/xennet.vcxproj.user
+++ b/vs2015/xennet/xennet.vcxproj.user
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <SignMode>TestSign</SignMode>
     <TestCertificate>..\..\src\xennet.pfx</TestCertificate>

diff --git a/vs2015/xennet_coinst/xennet_coinst.vcxproj b/vs2015/xennet_coinst/xennet_coinst.vcxproj
index a3097a65e6295788fd5f700e1e5dc185b57357cf..3feda2df37d83934b1682eaab6c3692a0604e4cf 100644 (file)
--- a/vs2015/xennet_coinst/xennet_coinst.vcxproj
+++ b/vs2015/xennet_coinst/xennet_coinst.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\configs.props" />
   <PropertyGroup Label="PropertySheets">
     <DriverType>WDM</DriverType>

diff --git a/vs2015/xennet_coinst/xennet_coinst.vcxproj.user b/vs2015/xennet_coinst/xennet_coinst.vcxproj.user
index a5433e9a6776d8c2389b48b3fd30b9cfe01d0174..8b034c4085c4f8e35877de3fe2c41732a61d873b 100644 (file)
--- a/vs2015/xennet_coinst/xennet_coinst.vcxproj.user
+++ b/vs2015/xennet_coinst/xennet_coinst.vcxproj.user
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <SignMode>TestSign</SignMode>
     <TestCertificate>..\..\src\xennet.pfx</TestCertificate>