From 227918a3e954af73e5754bab10c49030b8625f36 Mon Sep 17 00:00:00 2001
From: ge0rdi <ge0rdi@gmx.com>
Date: Mon, 25 Dec 2017 13:09:38 +0100
Subject: [PATCH] Build using VS2017

---
 ClassicShellSrc/BUILDME.txt                             | 7 +++++--
 ClassicShellSrc/ClassicShellSetup/BuildBinaries.bat     | 6 ++++--
 ClassicShellSrc/ClassicShellSetup/BuildInstaller.bat    | 4 +++-
 ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.wxs | 2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ClassicShellSrc/BUILDME.txt b/ClassicShellSrc/BUILDME.txt
index 850d0c8..0d2e084 100644
--- a/ClassicShellSrc/BUILDME.txt
+++ b/ClassicShellSrc/BUILDME.txt
@@ -5,10 +5,13 @@ for other languages.
 The final files (installers, archives) are saved to the ClassicShellSetup\Final folder.
 
 You need the following tools:
-Visual Studio 2008
-Windows SDK 7.1
+Visual Studio 2017 (Community Edition is enough)
+  - Desktop development with C++ workload
+  - Windows 10 SDK (10.0.16299.0) for Desktop C++
+  - Visual C++ ATL support
 HTML Help Workshop
 WiX 3.7
+WinRAR
 It is possible to convert the projects to newer versions of Visual Studio and newer SDKs.
 Newer versions of WiX will probably work fine.
 
diff --git a/ClassicShellSrc/ClassicShellSetup/BuildBinaries.bat b/ClassicShellSrc/ClassicShellSetup/BuildBinaries.bat
index 880d624..a404c38 100644
--- a/ClassicShellSrc/ClassicShellSetup/BuildBinaries.bat
+++ b/ClassicShellSrc/ClassicShellSetup/BuildBinaries.bat
@@ -6,13 +6,15 @@ md Output\x64
 md Output\PDB32
 md Output\PDB64
 
+for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do set MSBuildDir=%%i\MSBuild\15.0\Bin\
+
 REM ********* Build 64-bit solution
-"%VS90COMNTOOLS%..\IDE\devenv.com" ..\ClassicShell.sln /rebuild "Setup|x64"
+"%MSBuildDir%MSBuild.exe" ..\ClassicShell.sln /t:Rebuild /p:Configuration="Setup" /p:Platform="x64"
 @if ERRORLEVEL 1 goto end
 
 
 REM ********* Build 32-bit solution (must be after 64-bit)
-"%VS90COMNTOOLS%..\IDE\devenv.com" ..\ClassicShell.sln /rebuild "Setup|Win32"
+"%MSBuildDir%MSBuild.exe" ..\ClassicShell.sln /t:Rebuild /p:Configuration="Setup" /p:Platform="Win32"
 @if ERRORLEVEL 1 goto end
 
 
diff --git a/ClassicShellSrc/ClassicShellSetup/BuildInstaller.bat b/ClassicShellSrc/ClassicShellSetup/BuildInstaller.bat
index 95abfc2..2684430 100644
--- a/ClassicShellSrc/ClassicShellSetup/BuildInstaller.bat
+++ b/ClassicShellSrc/ClassicShellSetup/BuildInstaller.bat
@@ -59,7 +59,9 @@ start /wait ClassicShellUtility\Release\ClassicShellUtility.exe crcmsi Temp
 @if ERRORLEVEL 1 goto end
 
 REM ********* Build bootstrapper
-"%VS90COMNTOOLS%..\IDE\devenv.com" ClassicShellSetup.sln /rebuild "Release|Win32"
+for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do set MSBuildDir=%%i\MSBuild\15.0\Bin\
+
+"%MSBuildDir%MSBuild.exe" ClassicShellSetup.sln /t:Rebuild /p:Configuration="Release" /p:Platform="Win32"
 @if ERRORLEVEL 1 goto end
 
 md Final
diff --git a/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.wxs b/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.wxs
index 8802b84..261e561 100644
--- a/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.wxs
+++ b/ClassicShellSrc/ClassicShellSetup/ClassicShellSetup.wxs
@@ -664,6 +664,6 @@
         <Binary Id="dialog2.jpg" SourceFile="..\ClassicShellSetup\dialog2.jpg" />
         <Binary Id="donate.ico" SourceFile="..\ClassicShellSetup\donate.ico" />
         <Binary Id="web.ico" SourceFile="..\ClassicShellSetup\web.ico" />
-        <Binary Id="facebook.ico" SourceFile="D:\Work\ClassicShellXX\ClassicShellSetup\facebook.ico" />
+        <Binary Id="facebook.ico" SourceFile="..\ClassicShellSetup\facebook.ico" />
     </Product>
 </Wix>