From 1e85b4dbf558dcf8058d1e08507b776af9411861 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Thu, 18 Jun 2020 11:42:57 +0100
Subject: [PATCH] v3.11 (build 1678)

* Also fix a warning in msapi_utf8.h
---
 ChangeLog.txt                 |  2 +-
 res/appstore/AppxManifest.xml |  4 ++--
 res/appstore/packme.cmd       |  5 +++++
 src/msapi_utf8.h              |  2 +-
 src/rufus.rc                  | 10 +++++-----
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index b48423f9..167b3cac 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,4 +1,4 @@
-o Version 3.11 (2020.06.??)
+o Version 3.11 (2020.06.18)
     Add Rock Ridge deep directory support
     Add an option to write small ISOs to an ESP (GPT only)
     Add a cheat mode (Ctrl-SELECT) to extract content from an additional zip archive on top of the ISO
diff --git a/res/appstore/AppxManifest.xml b/res/appstore/AppxManifest.xml
index 634683cf..045606e0 100644
--- a/res/appstore/AppxManifest.xml
+++ b/res/appstore/AppxManifest.xml
@@ -8,7 +8,7 @@
        for an interesting struggle, when you also happen to have a comma in one of the fields... -->
   <Identity
    Name="Rufus"
-   Version="3.11.1647.0"
+   Version="3.11.1678.0"
    ProcessorArchitecture="@ARCH@"
    Publisher='CN=Akeo Consulting, O=Akeo Consulting, STREET=24 Grey Rock, L=Milford, S=Co. Donegal, PostalCode=F92 D667, C=IE' />
   <Properties>
@@ -24,7 +24,7 @@
     <TargetDeviceFamily
      Name="Windows.Desktop"
      MinVersion="10.0.14316.0"
-     MaxVersionTested="10.0.17763.0" />
+     MaxVersionTested="10.0.19041.329" />
   </Dependencies>
   <Capabilities>
     <rescap:Capability Name="runFullTrust" />
diff --git a/res/appstore/packme.cmd b/res/appstore/packme.cmd
index 8175eb2f..202e187a 100644
--- a/res/appstore/packme.cmd
+++ b/res/appstore/packme.cmd
@@ -11,6 +11,11 @@ set MSBUILD_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\M
 set MANIFEST=AppxManifest.xml
 set ARCHS=x86 x64 arm arm64
 
+rem if you don't set the temp/tmp you get:
+rem error MSB6001: Invalid command line switch for "CL.exe". System.ArgumentExcep Key being added: 'TEMP'
+set temp=
+set tmp=
+
 cd /d "%~dp0"
 setlocal EnableDelayedExpansion
 set FILES_TO_SIGN=
diff --git a/src/msapi_utf8.h b/src/msapi_utf8.h
index 05fdc0d9..d410c491 100644
--- a/src/msapi_utf8.h
+++ b/src/msapi_utf8.h
@@ -1057,7 +1057,7 @@ static __inline const char* _filenameU(const char* path)
 	int i;
 	if (path == NULL)
 		return NULL;
-	for (i = strlen(path) - 1; i >= 0; i--)
+	for (i = (int)strlen(path) - 1; i >= 0; i--)
 		if ((path[i] == '/') || (path[i] == '\\'))
 			return &path[i + 1];
 	return path;
diff --git a/src/rufus.rc b/src/rufus.rc
index 0f0e579f..5a4d80cb 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.11.1677"
+CAPTION "Rufus 3.11.1678"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -395,8 +395,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,11,1677,0
- PRODUCTVERSION 3,11,1677,0
+ FILEVERSION 3,11,1678,0
+ PRODUCTVERSION 3,11,1678,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -414,13 +414,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.11.1677"
+            VALUE "FileVersion", "3.11.1678"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-3.11.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.11.1677"
+            VALUE "ProductVersion", "3.11.1678"
         END
     END
     BLOCK "VarFileInfo"