From bf2f25300c262c26d0042fb3d26236aab87ebe17 Mon Sep 17 00:00:00 2001 From: Maximus5 Date: Mon, 24 Jul 2023 01:57:30 +0200 Subject: [PATCH 1/3] Internal. Fix deploy script --- Deploy/.gitignore | 2 ++ Deploy/Deploy_git.cmd | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Deploy/.gitignore b/Deploy/.gitignore index 6ce98c2440..e88a8bc7c9 100644 --- a/Deploy/.gitignore +++ b/Deploy/.gitignore @@ -19,3 +19,5 @@ user_env.cmd downloads-*.txt downloads-*.json + +.idea diff --git a/Deploy/Deploy_git.cmd b/Deploy/Deploy_git.cmd index 0b9ef1b2b2..da74604409 100644 --- a/Deploy/Deploy_git.cmd +++ b/Deploy/Deploy_git.cmd @@ -9,7 +9,9 @@ if exist "%~dp0user_env.cmd" ( ) set ex7zlist=-x!*.7z -x!*.aps -x!*.bak -x!*.bdf -x!*.cache -x!*.cod -x!.codeblocks -x!*.exp -x!*.gz -x!*.hab -x!*.ilk -x!*.ipch -x!*.lib -x!*.log -x!*.msi -x!*.ncb -x!*.new -x!*.obj -x!*.opt -x!*.pdb -x!*.plg -x!*.plog -x!*.psess -x!*.pvd -x!*.sln.cache -x!*.suo -x!*.tgz -x!*.ttf -x!*.user -x!*.vsp -x!*.zip -x!*684.* -x!*sdf -x!.gitignore -x!.svn -x!curl-7.21.4 -x!Debug -x!enc_temp_folder -x!enc_temp_folder -x!gcc -x!kl_parts_gcc.* -x!makefile_lt_vc -x!MouseWheelTilt.reg -x!rebar.bmp -x!Thumbs.db -x!time2.exe -x!toolbar -x!VTune -x!WhatsNew-ConEmu-Portable.txt -x!PortableApps_Installer -x!UnitTests.cmd -x!.svnignore -x!*.o -x!!*.txt -x!*.VC.db -set ex7zpack=-x!ConEmu.Gui.map -x!ConEmu64.Gui.map -x!ConEmu\*.map -x!ConEmu\ConEmu.Addons -x!ConEmu\Portable -x!UnitTests -x!Logs -x!*.VC.db -x!far + +set ex7zpack=-x!ConEmu.Gui.map -x!ConEmu64.Gui.map -x!ConEmu\*.map -x!ConEmu\ConEmu.Addons -x!ConEmu\Portable -x!UnitTests -x!Logs -x!Descript.ion -x!*.VC.db -x!Tests_*.exe -x!far +rem ex7zpack changes should be placed in deploy.cmd and Deploy_git.cmd setlocal set ConEmuHooks=OFF @@ -71,7 +73,9 @@ rem if exist ConEmu.map ( rem if exist ConEmu1.map del ConEmu1.map rem ren ConEmu.map ConEmu1.map rem ) +echo on 7z a -r -mx=9 -ms=255f64m "%ConEmuPack_7z%" ConEmu*.exe ConEmu*.map ConEmu\* plugins\* %ex7zlist% %ex7zpack% +@echo off if errorlevel 1 goto err7z rem if exist ConEmu1.map ren ConEmu1.map ConEmu.map cd .. From bd4489e48bd534c5dcc03f33ac67d6ff66d5c33c Mon Sep 17 00:00:00 2001 From: Maximus5 Date: Mon, 24 Jul 2023 02:03:33 +0200 Subject: [PATCH 2/3] 230724 Chocolatey and Nuget --- nuget/chocolatey/tools/chocolateyInstall.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nuget/chocolatey/tools/chocolateyInstall.ps1 b/nuget/chocolatey/tools/chocolateyInstall.ps1 index 321a3d9830..8420441d7e 100644 --- a/nuget/chocolatey/tools/chocolateyInstall.ps1 +++ b/nuget/chocolatey/tools/chocolateyInstall.ps1 @@ -1,6 +1,6 @@ $package = 'ConEmu' $version = '23.07.24' -$sha256 = '0262DC69871B0270147173847619FC2DC9A0188754474C7BA1E0BBDDBD4E4974' +$sha256 = '2A56EDD5515DDD916410DE3D84E00069CE07566B2F81C612A4241A8B109D7F4C' $isSytem32Bit = (($Env:PROCESSOR_ARCHITECTURE -eq 'x86') -and ` ($Env:PROCESSOR_ARCHITEW6432 -eq $null)) From 90f76807d5e1862f670a65273f8d5ffc6693b4d3 Mon Sep 17 00:00:00 2001 From: Maximus5 Date: Mon, 24 Jul 2023 02:03:35 +0200 Subject: [PATCH 3/3] 230724 release files --- PortableApps/App/AppInfo/appinfo.ini | 4 ++-- Release/ConEmu/WhatsNew-ConEmu.txt | 5 +++++ src/ConEmu/version.h | 4 ++-- src/Setup/Setupper/VersionI.h | 10 +++++----- src/Setup/Version.wxi | 4 ++-- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/PortableApps/App/AppInfo/appinfo.ini b/PortableApps/App/AppInfo/appinfo.ini index 0583d124a3..288f90243c 100644 --- a/PortableApps/App/AppInfo/appinfo.ini +++ b/PortableApps/App/AppInfo/appinfo.ini @@ -1,6 +1,6 @@ [Version] -PackageVersion=23.7.23.0 -DisplayVersion=230723 +PackageVersion=23.7.24.0 +DisplayVersion=230724 [Format] Type=PortableApps.comFormat diff --git a/Release/ConEmu/WhatsNew-ConEmu.txt b/Release/ConEmu/WhatsNew-ConEmu.txt index 2c78391bf7..2fc78213b0 100644 --- a/Release/ConEmu/WhatsNew-ConEmu.txt +++ b/Release/ConEmu/WhatsNew-ConEmu.txt @@ -20,6 +20,11 @@ https://conemu.github.io/en/Whats_New.html ------------------------------------------- +2023.7.24 +* gh-2536: Do not emit control characters in title reports (capability fix). +* l10n: translations were updated + + 2023.7.23 * gh-2536: Do not emit control characters in title reports. diff --git a/src/ConEmu/version.h b/src/ConEmu/version.h index 03903f8352..9e663501cd 100644 --- a/src/ConEmu/version.h +++ b/src/ConEmu/version.h @@ -1,7 +1,7 @@ -// 230723 +// 230724 #define MVV_1 23 #define MVV_2 7 -#define MVV_3 23 +#define MVV_3 24 #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 f3fb827a4c..3b330a286c 100644 --- a/src/Setup/Setupper/VersionI.h +++ b/src/Setup/Setupper/VersionI.h @@ -1,5 +1,5 @@ -#define CONEMUVERN 23,7,23,0 -#define CONEMUVERS "230723" -#define CONEMUVERL L"230723" -#define MSI86 "../ConEmu.230723.x86.msi" -#define MSI64 "../ConEmu.230723.x64.msi" +#define CONEMUVERN 23,7,24,0 +#define CONEMUVERS "230724" +#define CONEMUVERL L"230724" +#define MSI86 "../ConEmu.230724.x86.msi" +#define MSI64 "../ConEmu.230724.x64.msi" diff --git a/src/Setup/Version.wxi b/src/Setup/Version.wxi index 1520170715..0c532a018c 100644 --- a/src/Setup/Version.wxi +++ b/src/Setup/Version.wxi @@ -1,7 +1,7 @@ - - + + \ No newline at end of file