From c5513447c9c4bf8397ed14166e6fa77504f6005a Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Wed, 27 Feb 2019 18:47:15 +0000 Subject: [PATCH] [misc] update project to use latest default VS2017 SDK * Also add missing control in localization_data.h --- .vs/bled.vcxproj | 2 +- .vs/getopt.vcxproj | 2 +- .vs/libcdio-driver.vcxproj | 2 +- .vs/libcdio-iso9660.vcxproj | 2 +- .vs/libcdio-udf.vcxproj | 2 +- .vs/ms-sys.vcxproj | 2 +- .vs/rufus.vcxproj | 2 +- .vs/syslinux-libfat.vcxproj | 2 +- .vs/syslinux-libinstaller.vcxproj | 2 +- .vs/syslinux-win.vcxproj | 2 +- _sign.cmd | 2 +- res/appstore/packme.cmd | 2 +- src/localization_data.h | 1 + src/rufus.rc | 10 +++++----- 14 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.vs/bled.vcxproj b/.vs/bled.vcxproj index 50d904e0..bca4b65a 100644 --- a/.vs/bled.vcxproj +++ b/.vs/bled.vcxproj @@ -76,7 +76,7 @@ bled {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D} bled - 10.0.17134.0 + 10.0.17763.0 diff --git a/.vs/getopt.vcxproj b/.vs/getopt.vcxproj index a929b362..d44cffe5 100644 --- a/.vs/getopt.vcxproj +++ b/.vs/getopt.vcxproj @@ -37,7 +37,7 @@ {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} getopt - 10.0.17134.0 + 10.0.17763.0 diff --git a/.vs/libcdio-driver.vcxproj b/.vs/libcdio-driver.vcxproj index 2a7b0606..82a876f9 100644 --- a/.vs/libcdio-driver.vcxproj +++ b/.vs/libcdio-driver.vcxproj @@ -69,7 +69,7 @@ Win32Proj driver libcdio-driver - 10.0.17134.0 + 10.0.17763.0 diff --git a/.vs/libcdio-iso9660.vcxproj b/.vs/libcdio-iso9660.vcxproj index 24a8f436..f7113c13 100644 --- a/.vs/libcdio-iso9660.vcxproj +++ b/.vs/libcdio-iso9660.vcxproj @@ -61,7 +61,7 @@ Win32Proj iso9660 libcdio-iso9660 - 10.0.17134.0 + 10.0.17763.0 diff --git a/.vs/libcdio-udf.vcxproj b/.vs/libcdio-udf.vcxproj index 39f5e606..c3b0b20c 100644 --- a/.vs/libcdio-udf.vcxproj +++ b/.vs/libcdio-udf.vcxproj @@ -55,7 +55,7 @@ Win32Proj udf libcdio-udf - 10.0.17134.0 + 10.0.17763.0 diff --git a/.vs/ms-sys.vcxproj b/.vs/ms-sys.vcxproj index bdab55ed..a044749d 100644 --- a/.vs/ms-sys.vcxproj +++ b/.vs/ms-sys.vcxproj @@ -96,7 +96,7 @@ {2B1D078D-8EB4-4398-9CA4-23457265A7F6} Win32Proj mssys - 10.0.17134.0 + 10.0.17763.0 diff --git a/.vs/rufus.vcxproj b/.vs/rufus.vcxproj index 224ad4ed..370e4c20 100644 --- a/.vs/rufus.vcxproj +++ b/.vs/rufus.vcxproj @@ -39,7 +39,7 @@ {731858A7-0303-4988-877B-9C0DD6471864} rufus Win32Proj - 10.0.17134.0 + 10.0.17763.0 diff --git a/.vs/syslinux-libfat.vcxproj b/.vs/syslinux-libfat.vcxproj index 42e1fc88..cec54be3 100644 --- a/.vs/syslinux-libfat.vcxproj +++ b/.vs/syslinux-libfat.vcxproj @@ -51,7 +51,7 @@ Win32Proj libfat syslinux-libfat - 10.0.17134.0 + 10.0.17763.0 diff --git a/.vs/syslinux-libinstaller.vcxproj b/.vs/syslinux-libinstaller.vcxproj index 3585f8fb..680f522a 100644 --- a/.vs/syslinux-libinstaller.vcxproj +++ b/.vs/syslinux-libinstaller.vcxproj @@ -51,7 +51,7 @@ Win32Proj libinstaller syslinux-libinstaller - 10.0.17134.0 + 10.0.17763.0 diff --git a/.vs/syslinux-win.vcxproj b/.vs/syslinux-win.vcxproj index 3924a358..0a9dbb6c 100644 --- a/.vs/syslinux-win.vcxproj +++ b/.vs/syslinux-win.vcxproj @@ -45,7 +45,7 @@ Win32Proj win syslinux-win - 10.0.17134.0 + 10.0.17763.0 diff --git a/_sign.cmd b/_sign.cmd index a80dd71f..dce50768 100644 --- a/_sign.cmd +++ b/_sign.cmd @@ -1,3 +1,3 @@ @echo off -"C:\Program Files (x86)\Windows Kits\10\bin\10.0.17134.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.17763.0\x64\signtool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp %1 exit diff --git a/res/appstore/packme.cmd b/res/appstore/packme.cmd index 3072aeb7..bb09acad 100644 --- a/res/appstore/packme.cmd +++ b/res/appstore/packme.cmd @@ -6,7 +6,7 @@ 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.17134.0\x64 +set WDK_PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64 set MANIFEST=AppxManifest.xml set ARCHS=x86 x64 arm arm64 diff --git a/src/localization_data.h b/src/localization_data.h index 95cd3e8c..ca79712a 100644 --- a/src/localization_data.h +++ b/src/localization_data.h @@ -86,6 +86,7 @@ const loc_control_id control_id[] = { LOC_CTRL(IDC_LOG_EDIT), LOC_CTRL(IDC_LOG_SAVE), LOC_CTRL(IDC_LOG_CLEAR), + LOC_CTRL(IDC_DONT_DISPLAY_AGAIN), LOC_CTRL(IDC_MORE_INFO), LOC_CTRL(IDC_POLICY), LOC_CTRL(IDC_UPDATE_FREQUENCY), diff --git a/src/rufus.rc b/src/rufus.rc index ca312ec7..e18fa7d2 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.5.1447" +CAPTION "Rufus 3.5.1448" 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,5,1447,0 - PRODUCTVERSION 3,5,1447,0 + FILEVERSION 3,5,1448,0 + PRODUCTVERSION 3,5,1448,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.5.1447" + VALUE "FileVersion", "3.5.1448" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus-3.5.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.5.1447" + VALUE "ProductVersion", "3.5.1448" END END BLOCK "VarFileInfo"