Skip to content

Commit

Permalink
200713 release files
Browse files Browse the repository at this point in the history
  • Loading branch information
Maximus5 committed Jul 13, 2020
1 parent 7d492b3 commit d59e47e
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 14 deletions.
4 changes: 2 additions & 2 deletions PortableApps/App/AppInfo/appinfo.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Version]
PackageVersion=20.6.15.0
DisplayVersion=200615
PackageVersion=20.7.13.0
DisplayVersion=200713

[Format]
Type=PortableApps.comFormat
Expand Down
14 changes: 14 additions & 0 deletions Release/ConEmu/WhatsNew-ConEmu.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,20 @@ https://conemu.github.io/en/Whats_New.html
-------------------------------------------


2020.7.13
* gh-2009: Autoload font files from ConEmuDir/ConEmuBaseDir (fix).
* gh-2130: Use v141_xp toolset to build Release|x86.
* Fix 'Settings/Debug/Exec' monitoring: files weren't loaded after '@'.
* Button 'Register ConEmu autorun' didn't work in some cases.
* Fix console lags and size during ConEmu cmd autoattach initialization.
* gh-2145: Fix crash (read access violation).
* l10n: translations were updated
* gh-468: Fix for environment reload from registry (expand variables in PATH).
The problem was with `PATH` variable, it contains substitutes `%SystemRoot%`,
but they were not expanded during environment refresh.
* Code refactoring.


2020.6.15
* gh-2127: Fix broken `-FontDir` command line option.
* gh-2087: Fix unbalanced CoUninitialize call in ConEmu Panel Views plugin.
Expand Down
6 changes: 3 additions & 3 deletions src/ConEmu/version.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// 200615
// 200713
#define MVV_1 20
#define MVV_2 6
#define MVV_3 15
#define MVV_2 7
#define MVV_3 13
#define MVV_4 0
#define MVV_4a ""
#undef MVV_git
Expand Down
10 changes: 5 additions & 5 deletions src/Setup/Setupper/VersionI.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define CONEMUVERN 20,6,15,0
#define CONEMUVERS "200615"
#define CONEMUVERL L"200615"
#define MSI86 "../ConEmu.200615.x86.msi"
#define MSI64 "../ConEmu.200615.x64.msi"
#define CONEMUVERN 20,7,13,0
#define CONEMUVERS "200713"
#define CONEMUVERL L"200713"
#define MSI86 "../ConEmu.200713.x86.msi"
#define MSI64 "../ConEmu.200713.x64.msi"
4 changes: 2 additions & 2 deletions src/Setup/Version.wxi
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Include>

<?define Version = '$(var.MajorVersion).200.6150' ?>
<?define ConEmuVerS = '200615.$(var.Platform)' ?>
<?define Version = '$(var.MajorVersion).200.7130' ?>
<?define ConEmuVerS = '200713.$(var.Platform)' ?>

</Include>
6 changes: 4 additions & 2 deletions src/UnitTests/run-tests.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,17 @@ goto :EOF

:gtests
call cecho /yellow " Tests_Release_Win32.exe"
..\..\Release\Tests_Release_Win32.exe 1> nul
..\..\Release\Tests_Release_Win32.exe 1>> unittests.log
if errorlevel 1 (
echo/ Tests_Release_Win32.exe exitcode=%errorlevel%
echo Tests_Release_Win32.exe failed > tests.fail
) else (
call cecho /green " Tests_Release_Win32.exe succeeded as expected"
)
call cecho /yellow " Tests_Release_x64.exe"
..\..\Release\Tests_Release_x64.exe 1> nul
..\..\Release\Tests_Release_x64.exe 1>> unittests.log
if errorlevel 1 (
echo/ Tests_Release_x64.exe exitcode=%errorlevel%
echo Tests_Release_x64.exe failed > tests.fail
) else (
call cecho /green " Tests_Release_x64.exe succeeded as expected"
Expand Down

0 comments on commit d59e47e

Please sign in to comment.