From 58a38145b7f5a21f507708a9e1e18468ca6ad01d Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Mon, 14 Aug 2017 21:40:56 +0100
Subject: [PATCH] [misc] finally, set .editorconfig to use UTF-8 *without* BOM

* The new VS2017 15.3 appears to have fixed this annoying bug at long last:
  https://developercommunity.visualstudio.com/content/problem/22922/editorconfig-support-interprets-charset-utf-8-as-u.html
---
 src/.editorconfig |  6 ++----
 src/rufus.rc      | 10 +++++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/.editorconfig b/src/.editorconfig
index dadc965c..13d6cf4a 100644
--- a/src/.editorconfig
+++ b/src/.editorconfig
@@ -4,7 +4,5 @@ root = true
 [*]
 trim_trailing_whitespace = true
 insert_final_newline = true
-# Of course the following is broken in VS2017 release.
-# Hopefully will be fixed with next update:
-# https://developercommunity.visualstudio.com/content/problem/22922/editorconfig-support-interprets-charset-utf-8-as-u.html
-#charset = utf-8
+# Finally, having a default of UTF-8 *without* BOM got fixed in VS2017 15.3
+charset = utf-8
diff --git a/src/rufus.rc b/src/rufus.rc
index 7ee30925..5895af35 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 2.17.1179"
+CAPTION "Rufus 2.17.1180"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -366,8 +366,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,17,1179,0
- PRODUCTVERSION 2,17,1179,0
+ FILEVERSION 2,17,1180,0
+ PRODUCTVERSION 2,17,1180,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -384,13 +384,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.17.1179"
+            VALUE "FileVersion", "2.17.1180"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2017 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.17.1179"
+            VALUE "ProductVersion", "2.17.1180"
         END
     END
     BLOCK "VarFileInfo"