From 62dad2ef2f89c35094f234071cfdd021357ddd77 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Thu, 22 Aug 2019 16:41:12 +0100 Subject: [PATCH] [misc] update to Visual Studio 2019 --- .vs/bled.vcxproj | 18 +++++++++--------- .vs/ext2fs.vcxproj | 18 +++++++++--------- .vs/getopt.vcxproj | 18 +++++++++--------- .vs/libcdio-driver.vcxproj | 18 +++++++++--------- .vs/libcdio-iso9660.vcxproj | 18 +++++++++--------- .vs/libcdio-udf.vcxproj | 18 +++++++++--------- .vs/ms-sys.vcxproj | 18 +++++++++--------- .vs/rufus.vcxproj | 18 +++++++++--------- .vs/syslinux-libfat.vcxproj | 18 +++++++++--------- .vs/syslinux-libinstaller.vcxproj | 18 +++++++++--------- .vs/syslinux-win.vcxproj | 18 +++++++++--------- README.md | 2 +- _sign.cmd | 2 +- appveyor.yml | 3 ++- res/appstore/packme.cmd | 4 ++-- rufus.sln | 5 +++-- src/rufus.rc | 10 +++++----- 17 files changed, 113 insertions(+), 111 deletions(-) diff --git a/.vs/bled.vcxproj b/.vs/bled.vcxproj index 21801bb5..b1b2c593 100644 --- a/.vs/bled.vcxproj +++ b/.vs/bled.vcxproj @@ -76,52 +76,52 @@ bled {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D} bled - 10.0.17763.0 + 10.0 StaticLibrary Unicode - v141 + v142 StaticLibrary Unicode - v141 + v142 true StaticLibrary Unicode - v141 + v142 true StaticLibrary Unicode - v141 + v142 StaticLibrary Unicode - v141 + v142 StaticLibrary Unicode - v141 + v142 true StaticLibrary Unicode - v141 + v142 true StaticLibrary Unicode - v141 + v142 diff --git a/.vs/ext2fs.vcxproj b/.vs/ext2fs.vcxproj index 31ffeb1f..3ff9300e 100644 --- a/.vs/ext2fs.vcxproj +++ b/.vs/ext2fs.vcxproj @@ -115,52 +115,52 @@ ext2fs {B01F5886-2B39-4B66-B65C-6427135B6A02} ext2fs - 10.0.17763.0 + 10.0 StaticLibrary Unicode - v141 + v142 StaticLibrary Unicode - v141 + v142 true StaticLibrary Unicode - v141 + v142 true StaticLibrary Unicode - v141 + v142 StaticLibrary Unicode - v141 + v142 StaticLibrary Unicode - v141 + v142 true StaticLibrary Unicode - v141 + v142 true StaticLibrary Unicode - v141 + v142 diff --git a/.vs/getopt.vcxproj b/.vs/getopt.vcxproj index 91b184f4..893d814a 100644 --- a/.vs/getopt.vcxproj +++ b/.vs/getopt.vcxproj @@ -37,56 +37,56 @@ {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} getopt - 10.0.17763.0 + 10.0 StaticLibrary Unicode true - v141 + v142 StaticLibrary Unicode true - v141 + v142 true StaticLibrary Unicode true - v141 + v142 true StaticLibrary Unicode - v141 + v142 StaticLibrary Unicode - v141 + v142 true StaticLibrary Unicode - v141 + v142 true StaticLibrary Unicode true - v141 + v142 StaticLibrary Unicode - v141 + v142 diff --git a/.vs/libcdio-driver.vcxproj b/.vs/libcdio-driver.vcxproj index 39cd542e..34cf811e 100644 --- a/.vs/libcdio-driver.vcxproj +++ b/.vs/libcdio-driver.vcxproj @@ -69,27 +69,27 @@ Win32Proj driver libcdio-driver - 10.0.17763.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true StaticLibrary true Unicode - v141 + v142 true @@ -97,14 +97,14 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true @@ -112,21 +112,21 @@ false true Unicode - v141 + v142 true StaticLibrary true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 diff --git a/.vs/libcdio-iso9660.vcxproj b/.vs/libcdio-iso9660.vcxproj index e70d1942..9f47edf7 100644 --- a/.vs/libcdio-iso9660.vcxproj +++ b/.vs/libcdio-iso9660.vcxproj @@ -61,27 +61,27 @@ Win32Proj iso9660 libcdio-iso9660 - 10.0.17763.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true StaticLibrary true Unicode - v141 + v142 true @@ -89,14 +89,14 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true @@ -104,21 +104,21 @@ false true Unicode - v141 + v142 true StaticLibrary true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 diff --git a/.vs/libcdio-udf.vcxproj b/.vs/libcdio-udf.vcxproj index 57a4b7e3..4364a160 100644 --- a/.vs/libcdio-udf.vcxproj +++ b/.vs/libcdio-udf.vcxproj @@ -55,27 +55,27 @@ Win32Proj udf libcdio-udf - 10.0.17763.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true StaticLibrary true Unicode - v141 + v142 true @@ -83,14 +83,14 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true @@ -98,21 +98,21 @@ false true Unicode - v141 + v142 true StaticLibrary true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 diff --git a/.vs/ms-sys.vcxproj b/.vs/ms-sys.vcxproj index a24b8efb..23c3d70f 100644 --- a/.vs/ms-sys.vcxproj +++ b/.vs/ms-sys.vcxproj @@ -98,27 +98,27 @@ {2B1D078D-8EB4-4398-9CA4-23457265A7F6} Win32Proj mssys - 10.0.17763.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true StaticLibrary true Unicode - v141 + v142 true @@ -126,14 +126,14 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true @@ -141,21 +141,21 @@ false true Unicode - v141 + v142 true StaticLibrary true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 diff --git a/.vs/rufus.vcxproj b/.vs/rufus.vcxproj index 94b57769..fb3d129d 100644 --- a/.vs/rufus.vcxproj +++ b/.vs/rufus.vcxproj @@ -39,56 +39,56 @@ {731858A7-0303-4988-877B-9C0DD6471864} rufus Win32Proj - 10.0.17763.0 + 10.0 Application Unicode true - v141 + v142 Application Unicode true - v141 + v142 true Application Unicode true - v141 + v142 true Application Unicode - v141 + v142 Application Unicode - v141 + v142 true Application Unicode - v141 + v142 true Application Unicode true - v141 + v142 Application Unicode - v141 + v142 diff --git a/.vs/syslinux-libfat.vcxproj b/.vs/syslinux-libfat.vcxproj index 246a0240..66f8cf24 100644 --- a/.vs/syslinux-libfat.vcxproj +++ b/.vs/syslinux-libfat.vcxproj @@ -52,27 +52,27 @@ Win32Proj libfat syslinux-libfat - 10.0.17763.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true StaticLibrary true Unicode - v141 + v142 true @@ -80,14 +80,14 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true @@ -95,21 +95,21 @@ false true Unicode - v141 + v142 true StaticLibrary true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 diff --git a/.vs/syslinux-libinstaller.vcxproj b/.vs/syslinux-libinstaller.vcxproj index e12a94a9..8081742c 100644 --- a/.vs/syslinux-libinstaller.vcxproj +++ b/.vs/syslinux-libinstaller.vcxproj @@ -51,27 +51,27 @@ Win32Proj libinstaller syslinux-libinstaller - 10.0.17763.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true StaticLibrary true Unicode - v141 + v142 true @@ -79,14 +79,14 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true @@ -94,21 +94,21 @@ false true Unicode - v141 + v142 true StaticLibrary true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 diff --git a/.vs/syslinux-win.vcxproj b/.vs/syslinux-win.vcxproj index 5e45ec7c..fb8ee870 100644 --- a/.vs/syslinux-win.vcxproj +++ b/.vs/syslinux-win.vcxproj @@ -45,27 +45,27 @@ Win32Proj win syslinux-win - 10.0.17763.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true StaticLibrary true Unicode - v141 + v142 true @@ -73,14 +73,14 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true @@ -88,21 +88,21 @@ false true Unicode - v141 + v142 true StaticLibrary true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 diff --git a/README.md b/README.md index 86f87275..3f4c998a 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Features Compilation ----------- -Use either Visual Studio 2017 (version 15.8 or later with SDK 10.0.17134 installed) or MinGW and +Use either Visual Studio 2019 (version 16.0 or later with SDK 10.0.18362 installed) or MinGW and then invoke the `.sln` or `configure`/`make` respectively. #### Visual Studio diff --git a/_sign.cmd b/_sign.cmd index dce50768..1207bc91 100644 --- a/_sign.cmd +++ b/_sign.cmd @@ -1,3 +1,3 @@ @echo off -"C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64\signtool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp %1 +"C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64\signtool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp %1 exit diff --git a/appveyor.yml b/appveyor.yml index e122c9f5..02d95df2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,5 @@ -os: Visual Studio 2017 +# The image below must be enabled in the AppVeyor settings +image: Visual Studio 2019 skip_commits: # Don't run AppVeyor for commits that only modify resource or non-code files diff --git a/res/appstore/packme.cmd b/res/appstore/packme.cmd index c00ddfe3..42a20959 100644 --- a/res/appstore/packme.cmd +++ b/res/appstore/packme.cmd @@ -6,8 +6,8 @@ del /q *.appx >NUL 2>&1 del /q *.appxbundle >NUL 2>&1 del /q *.map >NUL 2>&1 -set WDK_PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64 -set MSBUILD_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin +set WDK_PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64 +set MSBUILD_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin set MANIFEST=AppxManifest.xml set ARCHS=x86 x64 arm arm64 diff --git a/rufus.sln b/rufus.sln index 37264f40..b87b081b 100644 --- a/rufus.sln +++ b/rufus.sln @@ -1,6 +1,7 @@ + Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27004.2006 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29215.179 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rufus", ".vs\rufus.vcxproj", "{731858A7-0303-4988-877B-9C0DD6471864}" EndProject diff --git a/src/rufus.rc b/src/rufus.rc index 7e2dc30f..ed884d7e 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 232, 326 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Rufus 3.7.1564" +CAPTION "Rufus 3.7.1565" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -394,8 +394,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,1564,0 - PRODUCTVERSION 3,7,1564,0 + FILEVERSION 3,7,1565,0 + PRODUCTVERSION 3,7,1565,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -413,13 +413,13 @@ BEGIN VALUE "Comments", "https://akeo.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.7.1564" + VALUE "FileVersion", "3.7.1565" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus-3.7.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.7.1564" + VALUE "ProductVersion", "3.7.1565" END END BLOCK "VarFileInfo"