From d37a28a76c4680e4338c16126ca161aceb5614a6 Mon Sep 17 00:00:00 2001
From: Aaron Robson <aaron.robson@citrix.com>
Date: Thu, 1 Nov 2018 13:34:03 +0000
Subject: [PATCH] CP-27819: Switch to Visual Studio 2017 (#2294)

* Changing the tools version from 13.0 (VS2013) to to 15.0 (VS2017).

* Updating the Splash project from PlatformToolset of "v120_xp" to "v141" and to a more modern Windows SDK Version available in VS2017.

Signed-off-by: Aaron Robson aaron.robson@citrix.com
---
 mk/xenadmin-build.sh  | 2 +-
 splash/splash.vcxproj | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mk/xenadmin-build.sh b/mk/xenadmin-build.sh
index 9d2dde75f..af6cb774f 100755
--- a/mk/xenadmin-build.sh
+++ b/mk/xenadmin-build.sh
@@ -57,7 +57,7 @@ source ${REPO}/Branding/branding.sh
 source ${REPO}/mk/re-branding.sh
 
 #build
-MSBUILD="MSBuild.exe /nologo /m /verbosity:minimal /p:Configuration=Release /p:TargetFrameworkVersion=v4.6 /p:VisualStudioVersion=13.0"
+MSBUILD="MSBuild.exe /nologo /m /verbosity:minimal /p:Configuration=Release /p:TargetFrameworkVersion=v4.6 /p:VisualStudioVersion=15.0"
 
 ${UNZIP} -d ${REPO}/XenOvfApi ${SCRATCH_DIR}/XenCenterOVF.zip
 cd ${REPO}
diff --git a/splash/splash.vcxproj b/splash/splash.vcxproj
index 86e3b68f5..8197560ed 100644
--- a/splash/splash.vcxproj
+++ b/splash/splash.vcxproj
@@ -14,18 +14,19 @@
     <ProjectGuid>{AFB19C9D-DD63-478B-A4A3-8452CBD0B9AB}</ProjectGuid>
     <RootNamespace>test</RootNamespace>
     <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -119,4 +120,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file