diff --git a/_pre-commit.sh b/_pre-commit.sh
index cc4fb9e2..daf4fede 100755
--- a/_pre-commit.sh
+++ b/_pre-commit.sh
@@ -12,13 +12,13 @@
type -P sed &>/dev/null || { echo "sed command not found. Aborting." >&2; exit 1; }
type -P git &>/dev/null || { echo "git command not found. Aborting." >&2; exit 1; }
-VER=`git log --oneline | wc -l`
+TAGVER=`git rev-list HEAD --count`
# adjust so that we match the github commit count
-TAGVER=`expr $VER + 1`
+((TAGVER++))
# there may be a better way to prevent improper micro on amend. For now the detection
# of a .amend file in the current directory will do
if [ -f ./.amend ]; then
- TAGVER=`expr $TAGVER - 1`
+ ((TAGVER--))
git tag -d "b$TAGVER"
rm ./.amend;
fi
diff --git a/res/appstore/AppxManifest.xml b/res/appstore/AppxManifest.xml
index cceb5b0a..c4b21ed3 100644
--- a/res/appstore/AppxManifest.xml
+++ b/res/appstore/AppxManifest.xml
@@ -8,14 +8,14 @@
for an interesting struggle, when you also happen to have a comma in one of the fields... -->
Rufus
Akeo Consulting
Rufus
- Assets\Rufus-48.png
+ Assets\Square44x44Logo.png
@@ -37,8 +37,8 @@
diff --git a/res/appstore/packme.cmd b/res/appstore/packme.cmd
index 65055dd2..6cf15fb1 100644
--- a/res/appstore/packme.cmd
+++ b/res/appstore/packme.cmd
@@ -1,15 +1,26 @@
@echo off
set VERSION=2.15
-echo [Files]>mappings.lst
-echo "..\icon-set\rufus-44.png" "Assets\Rufus-44.png">>mappings.lst
-echo "..\icon-set\rufus-48.png" "Assets\Rufus-48.png">>mappings.lst
-echo "..\icon-set\rufus-150.png" "Assets\Rufus-150.png">>mappings.lst
-echo "..\..\rufus-%VERSION%.exe" "rufus.exe">>mappings.lst
-echo "AppxManifest.xml" "AppxManifest.xml">>mappings.lst
-"C:\Program Files (x86)\Windows Kits\10\bin\x64\MakeAppx" pack /o /f mappings.lst /p Rufus-%VERSION%.appx
+
+rem Make sure you don't have anything you don't want included in the package, as anything residing in the
+rem current directory will be included, including any previous .appx, which makes for nice recursion...
+del /q *.appx >NUL 2>&1
+
+rem According to the link below, you need "altform-unplated" icons and run MakePri to get transparent icons
+rem on the taskbar... Still doesn't seem to work though :(
+rem https://social.msdn.microsoft.com/Forums/windowsapps/en-US/dc505f68-d120-43e3-a9e1-d7c77746d588/uwpdesktop-bridgeunplated-taskbar-icons-in-desktop-bridge-apps
+mkdir Assets >NUL 2>&1
+copy "..\icon-set\rufus-44.png" "Assets\Square44x44Logo.png"
+copy "..\icon-set\rufus-48.png" "Assets\Square44x44Logo_targetsize-48.png"
+copy "..\icon-set\rufus-48.png" "Assets\Square44x44Logo_targetsize-48_altform-unplated.png"
+copy "..\icon-set\rufus-150.png" "Assets\Square150x150Logo.png"
+copy "..\..\rufus-%VERSION%.exe" "rufus.exe"
+"C:\Program Files (x86)\Windows Kits\10\bin\x64\MakePri" createconfig /o /dq en-US /cf priconfig.xml
+"C:\Program Files (x86)\Windows Kits\10\bin\x64\MakePri" new /o /pr . /cf priconfig.xml
+"C:\Program Files (x86)\Windows Kits\10\bin\x64\MakeAppx" pack /o /d . /p Rufus-%VERSION%.appx
if ERRORLEVEL 1 goto out
"C:\Program Files (x86)\Windows Kits\10\bin\x64\SignTool" sign /v /sha1 5759b23dc8f45e9120a7317f306e5b6890b612f0 /fd SHA256 /tr http://timestamp.comodoca.com/rfc3161 /td SHA256 Rufus-%VERSION%.appx
:out
-del mappings.lst
+del /q rufus.exe
+rmdir /s /q Assets
pause
exit
diff --git a/rufus.sln b/rufus.sln
index 945ad47d..5c694614 100644
--- a/rufus.sln
+++ b/rufus.sln
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.9
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rufus", "src\.msvc\rufus.vcxproj", "{731858A7-0303-4988-877B-9C0DD6471864}"
EndProject
diff --git a/src/rufus.rc b/src/rufus.rc
index ead379be..b784adff 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.15.1112"
+CAPTION "Rufus 2.15.1113"
FONT 8, "Segoe UI Symbol", 400, 0, 0x0
BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -334,8 +334,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,15,1112,0
- PRODUCTVERSION 2,15,1112,0
+ FILEVERSION 2,15,1113,0
+ PRODUCTVERSION 2,15,1113,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -352,13 +352,13 @@ BEGIN
BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus"
- VALUE "FileVersion", "2.15.1112"
+ VALUE "FileVersion", "2.15.1113"
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.15.1112"
+ VALUE "ProductVersion", "2.15.1113"
END
END
BLOCK "VarFileInfo"