From 3f0b584550f3a1898d279fb5f280536ce0c9761c Mon Sep 17 00:00:00 2001
From: Maximus5 <ConEmu.Maximus5@gmail.com>
Date: Sun, 12 Sep 2021 23:52:50 +0200
Subject: [PATCH] 210912 release files

---
 Deploy/Deploy_git.cmd                |  1 +
 PortableApps/App/AppInfo/appinfo.ini |  4 ++--
 Release/ConEmu/WhatsNew-ConEmu.txt   |  7 +++++++
 src/ConEmu/version.h                 |  4 ++--
 src/Setup/Setupper/VersionI.h        | 10 +++++-----
 src/Setup/Version.wxi                |  4 ++--
 6 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/Deploy/Deploy_git.cmd b/Deploy/Deploy_git.cmd
index c222fd2c99..0b64857df2 100644
--- a/Deploy/Deploy_git.cmd
+++ b/Deploy/Deploy_git.cmd
@@ -83,6 +83,7 @@ set ex7z_src=License.txt cmd_autorun.cmd About-ConEmu.txt FAQ-ConEmu.txt Setting
 set ex7z_src=%ex7z_src% -x!src\dosbox -x!src\*.plog -x!src\ConEmu_Org -x!\MinGW\ -x!src\_Profiler -x!src\_ToDo -x!*.diff -x!*.cab -x!src\Setup\setup_exe
 set ex7z_src=%ex7z_src% -x!src\ConEmuTh\Modules\mp3 -x!src\ConEmuTh\Modules\pe\ver_c0*.dll -x!src\ConEmuLn\x64 -x!src\ConEmuDW\Test\ConEmu
 set ex7z_src=%ex7z_src% -x!src\ConEmuDW\Test.std -x!src\ConEmuDW\95.mht -x!src\ConEmuDW\viewtopic.htm -x!src\ConEmuBg\x64 -x!_VCBUILD  -x!*.VC.db-*
+set ex7z_src=%ex7z_src% -x!coverage -x!far
 7z a -r "%ConEmu_Maximus5_src_7z%" src\* *.lng %ex7zlist% %ex7z_src%
 7z a -r "%ConEmu_Maximus5_src_7z%" PortableApps\*
 if errorlevel 1 goto err7z
diff --git a/PortableApps/App/AppInfo/appinfo.ini b/PortableApps/App/AppInfo/appinfo.ini
index 7cf710a90a..84503c5381 100644
--- a/PortableApps/App/AppInfo/appinfo.ini
+++ b/PortableApps/App/AppInfo/appinfo.ini
@@ -1,6 +1,6 @@
 [Version]
-PackageVersion=21.9.5.0
-DisplayVersion=210905
+PackageVersion=21.9.12.0
+DisplayVersion=210912
 
 [Format]
 Type=PortableApps.comFormat
diff --git a/Release/ConEmu/WhatsNew-ConEmu.txt b/Release/ConEmu/WhatsNew-ConEmu.txt
index 7652c58b58..5c4330ae92 100644
--- a/Release/ConEmu/WhatsNew-ConEmu.txt
+++ b/Release/ConEmu/WhatsNew-ConEmu.txt
@@ -20,6 +20,13 @@ https://conemu.github.io/en/Whats_New.html
 -------------------------------------------
 
 
+2021.9.12
+* gh-2363: Fix tasks file parser.
+* If temp file deletion fails register it to delete on reboot.
+* Default update channel for stable builds should be Stable.
+* l10n: translations were updated
+
+
 2021.9.5
 * Add hotkey to move focus from ConEmu to parent window during ConEmu Inside mode.
 * gh-2362: When ‘Process 'start'’ is enabled support starting .bat files from Far Manager by Shift+Enter in new tab automatically.
diff --git a/src/ConEmu/version.h b/src/ConEmu/version.h
index e3e1175fe1..4964be47a0 100644
--- a/src/ConEmu/version.h
+++ b/src/ConEmu/version.h
@@ -1,7 +1,7 @@
-// 210905
+// 210912
 #define MVV_1 21
 #define MVV_2 9
-#define MVV_3 5
+#define MVV_3 12
 #define MVV_4 0
 #define MVV_4a ""
 #undef MVV_git
diff --git a/src/Setup/Setupper/VersionI.h b/src/Setup/Setupper/VersionI.h
index a133ea9049..49a43c5ada 100644
--- a/src/Setup/Setupper/VersionI.h
+++ b/src/Setup/Setupper/VersionI.h
@@ -1,5 +1,5 @@
-#define CONEMUVERN 21,9,5,0
-#define CONEMUVERS "210905"
-#define CONEMUVERL L"210905"
-#define MSI86 "../ConEmu.210905.x86.msi"
-#define MSI64 "../ConEmu.210905.x64.msi"
+#define CONEMUVERN 21,9,12,0
+#define CONEMUVERS "210912"
+#define CONEMUVERL L"210912"
+#define MSI86 "../ConEmu.210912.x86.msi"
+#define MSI64 "../ConEmu.210912.x64.msi"
diff --git a/src/Setup/Version.wxi b/src/Setup/Version.wxi
index 68f3cf914e..c8418d5d37 100644
--- a/src/Setup/Version.wxi
+++ b/src/Setup/Version.wxi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
 
-  <?define Version = '$(var.MajorVersion).210.9050' ?>
-  <?define ConEmuVerS = '210905.$(var.Platform)' ?>
+  <?define Version = '$(var.MajorVersion).210.9120' ?>
+  <?define ConEmuVerS = '210912.$(var.Platform)' ?>
 
 </Include>
\ No newline at end of file