Index: ext/googletest/gmock-dynamic-crt.vcxproj =================================================================== diff -u -N -r45a7e805257e38e2158afdfae64ead288e9d945b -r2dea2d82eb5c11d9e92d42e47f876e58c4505c4b --- ext/googletest/gmock-dynamic-crt.vcxproj (.../gmock-dynamic-crt.vcxproj) (revision 45a7e805257e38e2158afdfae64ead288e9d945b) +++ ext/googletest/gmock-dynamic-crt.vcxproj (.../gmock-dynamic-crt.vcxproj) (revision 2dea2d82eb5c11d9e92d42e47f876e58c4505c4b) @@ -43,7 +43,7 @@ gmock-dynamic-crt Win32Proj gmock-dynamic-crt - 10.0 + 10.0.19041.0 Index: ext/googletest/gmock-static-crt.vcxproj =================================================================== diff -u -N -r45a7e805257e38e2158afdfae64ead288e9d945b -r2dea2d82eb5c11d9e92d42e47f876e58c4505c4b --- ext/googletest/gmock-static-crt.vcxproj (.../gmock-static-crt.vcxproj) (revision 45a7e805257e38e2158afdfae64ead288e9d945b) +++ ext/googletest/gmock-static-crt.vcxproj (.../gmock-static-crt.vcxproj) (revision 2dea2d82eb5c11d9e92d42e47f876e58c4505c4b) @@ -43,7 +43,7 @@ gmock-static-crt Win32Proj gmock-static-crt - 10.0 + 10.0.19041.0 Index: ext/sqlite3/sqlite3.vc140.vcxproj =================================================================== diff -u -N -r49869c22052117465b59dc527b3393ab771d50f6 -r2dea2d82eb5c11d9e92d42e47f876e58c4505c4b --- ext/sqlite3/sqlite3.vc140.vcxproj (.../sqlite3.vc140.vcxproj) (revision 49869c22052117465b59dc527b3393ab771d50f6) +++ ext/sqlite3/sqlite3.vc140.vcxproj (.../sqlite3.vc140.vcxproj) (revision 2dea2d82eb5c11d9e92d42e47f876e58c4505c4b) @@ -39,7 +39,7 @@ sqlite3 Win32Proj sqlite3 - 10.0 + 10.0.19041.0 Index: scripts/jenkins/prepare-portable-package.bat =================================================================== diff -u -N -r1c366a50e84393bce67e50dcccc4fc5ff147db27 -r2dea2d82eb5c11d9e92d42e47f876e58c4505c4b --- scripts/jenkins/prepare-portable-package.bat (.../prepare-portable-package.bat) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) +++ scripts/jenkins/prepare-portable-package.bat (.../prepare-portable-package.bat) (revision 2dea2d82eb5c11d9e92d42e47f876e58c4505c4b) @@ -21,10 +21,10 @@ xcopy "%WORKSPACE%\bin\release\ictranslate.exe" "%TmpDir%\32bit\" || exit /B 1 xcopy "%WORKSPACE%\bin\release\sqlite3_32.dll" "%TmpDir%\32bit\" || exit /B 1 xcopy "%WORKSPACE%\scripts\portable_config\ch.xml" "%TmpDir%\32bit\" || exit /B 1 -xcopy "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x86\Microsoft.VC141.CRT\*" "%TmpDir%\32bit\" || exit /B 1 -xcopy "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x86\Microsoft.VC141.MFC\*" "%TmpDir%\32bit\" || exit /B 1 -xcopy "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x86\dbghelp.dll" "%TmpDir%\32bit\" || exit /B 1 -xcopy "C:\Program Files (x86)\Windows Kits\10\Redist\10.0.17763.0\ucrt\DLLs\x86\*" "%TmpDir%\32bit\" || exit /B 1 +xcopy "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.27.29016\x86\Microsoft.VC142.CRT\*" "%TmpDir%\32bit\" || exit /B 1 +xcopy "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.27.29016\x86\Microsoft.VC142.MFC\*" "%TmpDir%\32bit\" || exit /B 1 +xcopy "C:\Program Files (x86)\Windows Kits\10\Debuggers\x86\dbghelp.dll" "%TmpDir%\32bit\" || exit /B 1 +xcopy "C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x86\*" "%TmpDir%\32bit\" || exit /B 1 xcopy /E /I "%WORKSPACE%\bin\release\langs" "%TmpDir%\32bit\langs" || exit /B 1 rem Prepare 64bit build @@ -41,10 +41,10 @@ xcopy "%WORKSPACE%\bin\release\ictranslate64.exe" "%TmpDir%\64bit\" || exit /B 1 xcopy "%WORKSPACE%\bin\release\sqlite3_64.dll" "%TmpDir%\64bit\" || exit /B 1 xcopy "%WORKSPACE%\scripts\portable_config\ch.xml" "%TmpDir%\64bit\" || exit /B 1 -xcopy "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\*" "%TmpDir%\64bit\" || exit /B 1 -xcopy "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.MFC\*" "%TmpDir%\64bit\" || exit /B 1 -xcopy "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64\dbghelp.dll" "%TmpDir%\64bit\" || exit /B 1 -xcopy "C:\Program Files (x86)\Windows Kits\10\Redist\10.0.17763.0\ucrt\DLLs\x64\*" "%TmpDir%\64bit\" || exit /B 1 +xcopy "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.27.29016\x64\Microsoft.VC142.CRT\*" "%TmpDir%\64bit\" || exit /B 1 +xcopy "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.27.29016\x64\Microsoft.VC142.MFC\*" "%TmpDir%\64bit\" || exit /B 1 +xcopy "C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\dbghelp.dll" "%TmpDir%\64bit\" || exit /B 1 +xcopy "C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64\*" "%TmpDir%\64bit\" || exit /B 1 xcopy /E /I "%WORKSPACE%\bin\release\langs" "%TmpDir%\64bit\langs" || exit /B 1 rem Prepare 32bit shell extension for 64bit build @@ -56,10 +56,10 @@ xcopy "%WORKSPACE%\bin\release\liblogger32u.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1 xcopy "%WORKSPACE%\bin\release\sqlite3_32.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1 -xcopy "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x86\Microsoft.VC141.CRT\*" "%TmpDir%\64bit\ShellExt32\" || exit /B 1 -xcopy "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x86\Microsoft.VC141.MFC\*" "%TmpDir%\64bit\ShellExt32\" || exit /B 1 -xcopy "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x86\dbghelp.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1 -xcopy "C:\Program Files (x86)\Windows Kits\10\Redist\10.0.17763.0\ucrt\DLLs\x86\*" "%TmpDir%\64bit\ShellExt32\" || exit /B 1 +xcopy "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.27.29016\x86\Microsoft.VC142.CRT\*" "%TmpDir%\64bit\ShellExt32\" || exit /B 1 +xcopy "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.27.29016\x86\Microsoft.VC142.MFC\*" "%TmpDir%\64bit\ShellExt32\" || exit /B 1 +xcopy "C:\Program Files (x86)\Windows Kits\10\Debuggers\x86\dbghelp.dll" "%TmpDir%\64bit\ShellExt32\" || exit /B 1 +xcopy "C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x86\*" "%TmpDir%\64bit\ShellExt32\" || exit /B 1 cd %TmpDir% "C:\Program Files\7-Zip\7z.exe" a -tzip "%OutDir%\ch-portable-%CHTextVersion%.zip" 32bit 64bit Index: scripts/setup.iss =================================================================== diff -u -N -r1c366a50e84393bce67e50dcccc4fc5ff147db27 -r2dea2d82eb5c11d9e92d42e47f876e58c4505c4b --- scripts/setup.iss (.../setup.iss) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) +++ scripts/setup.iss (.../setup.iss) (revision 2dea2d82eb5c11d9e92d42e47f876e58c4505c4b) @@ -38,12 +38,12 @@ #define RegCHExtFilename32 "regchext.exe" #define RegCHExtFilename64 "regchext64.exe" -#define MSRedistDir32 "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x86" -#define MSRedistDir64 "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64" -#define DbgHelp32 "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x86" -#define DbgHelp64 "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64" -#define UCrtDir32 "C:\Program Files (x86)\Windows Kits\10\Redist\10.0.17763.0\ucrt\DLLs\x86" -#define UCrtDir64 "C:\Program Files (x86)\Windows Kits\10\Redist\10.0.17763.0\ucrt\DLLs\x64" +#define MSRedistDir32 "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.27.29016\x86" +#define MSRedistDir64 "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.27.29016\x64" +#define DbgHelp32 "C:\Program Files (x86)\Windows Kits\10\Debuggers\x86" +#define DbgHelp64 "C:\Program Files (x86)\Windows Kits\10\Debuggers\x64" +#define UCrtDir32 "C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x86" +#define UCrtDir64 "C:\Program Files (x86)\Windows Kits\10\Redist\10.0.19041.0\ucrt\DLLs\x64" [Setup] AppName={#MyAppName} @@ -117,8 +117,8 @@ Source: "..\bin\release\{#ICTranslateFilename32}"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: not Is64BitInstallMode Source: "..\bin\release\{#SQLite32}"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: not Is64BitInstallMode -Source: "{#MSRedistDir32}\Microsoft.VC141.CRT\*"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: not Is64BitInstallMode -Source: "{#MSRedistDir32}\Microsoft.VC141.MFC\*"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: not Is64BitInstallMode +Source: "{#MSRedistDir32}\Microsoft.VC142.CRT\*"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: not Is64BitInstallMode +Source: "{#MSRedistDir32}\Microsoft.VC142.MFC\*"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: not Is64BitInstallMode Source: "{#UCrtDir32}\*"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: not Is64BitInstallMode Source: "{#DbgHelp32}\dbghelp.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: not Is64BitInstallMode @@ -135,8 +135,8 @@ Source: "..\bin\release\{#ICTranslateFilename64}"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: Is64BitInstallMode Source: "..\bin\release\{#SQLite64}"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: Is64BitInstallMode -Source: "{#MSRedistDir64}\Microsoft.VC141.CRT\*"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: Is64BitInstallMode -Source: "{#MSRedistDir64}\Microsoft.VC141.MFC\*"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: Is64BitInstallMode +Source: "{#MSRedistDir64}\Microsoft.VC142.CRT\*"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: Is64BitInstallMode +Source: "{#MSRedistDir64}\Microsoft.VC142.MFC\*"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: Is64BitInstallMode Source: "{#UCrtDir64}\*"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: Is64BitInstallMode Source: "{#DbgHelp64}\dbghelp.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: Is64BitInstallMode @@ -148,8 +148,8 @@ Source: "..\bin\release\{#LibStringFilename32}"; DestDir: "{app}\ShellExt32"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: Is64BitInstallMode Source: "..\bin\release\{#LibLoggerFilename32}"; DestDir: "{app}\ShellExt32"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: Is64BitInstallMode Source: "..\bin\release\{#SQLite32}"; DestDir: "{app}\ShellExt32"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: Is64BitInstallMode -Source: "{#MSRedistDir32}\Microsoft.VC141.CRT\*"; DestDir: "{app}\ShellExt32"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: Is64BitInstallMode -Source: "{#MSRedistDir32}\Microsoft.VC141.MFC\*"; DestDir: "{app}\ShellExt32"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: Is64BitInstallMode +Source: "{#MSRedistDir32}\Microsoft.VC142.CRT\*"; DestDir: "{app}\ShellExt32"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: Is64BitInstallMode +Source: "{#MSRedistDir32}\Microsoft.VC142.MFC\*"; DestDir: "{app}\ShellExt32"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: Is64BitInstallMode Source: "{#UCrtDir32}\*"; DestDir: "{app}\ShellExt32"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: Is64BitInstallMode Source: "{#DbgHelp32}\dbghelp.dll"; DestDir: "{app}\ShellExt32"; Flags: ignoreversion restartreplace uninsrestartdelete; Check: Is64BitInstallMode Index: src/ch/ch.vc140.vcxproj =================================================================== diff -u -N -r1c366a50e84393bce67e50dcccc4fc5ff147db27 -r2dea2d82eb5c11d9e92d42e47f876e58c4505c4b --- src/ch/ch.vc140.vcxproj (.../ch.vc140.vcxproj) (revision 1c366a50e84393bce67e50dcccc4fc5ff147db27) +++ src/ch/ch.vc140.vcxproj (.../ch.vc140.vcxproj) (revision 2dea2d82eb5c11d9e92d42e47f876e58c4505c4b) @@ -39,7 +39,7 @@ {4B215B9A-58CA-4987-AC95-7DFC3043E100} ch MFCProj - 10.0 + 10.0.19041.0 Index: src/chext/chext.vc140.vcxproj =================================================================== diff -u -N -r49869c22052117465b59dc527b3393ab771d50f6 -r2dea2d82eb5c11d9e92d42e47f876e58c4505c4b --- src/chext/chext.vc140.vcxproj (.../chext.vc140.vcxproj) (revision 49869c22052117465b59dc527b3393ab771d50f6) +++ src/chext/chext.vc140.vcxproj (.../chext.vc140.vcxproj) (revision 2dea2d82eb5c11d9e92d42e47f876e58c4505c4b) @@ -39,7 +39,7 @@ {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69} chext AtlProj - 10.0 + 10.0.19041.0 Index: src/ictranslate/ictranslate.vc140.vcxproj =================================================================== diff -u -N -r49869c22052117465b59dc527b3393ab771d50f6 -r2dea2d82eb5c11d9e92d42e47f876e58c4505c4b --- src/ictranslate/ictranslate.vc140.vcxproj (.../ictranslate.vc140.vcxproj) (revision 49869c22052117465b59dc527b3393ab771d50f6) +++ src/ictranslate/ictranslate.vc140.vcxproj (.../ictranslate.vc140.vcxproj) (revision 2dea2d82eb5c11d9e92d42e47f876e58c4505c4b) @@ -39,7 +39,7 @@ {B0292250-B70C-4395-9859-F181FB113DA8} ictranslate MFCProj - 10.0 + 10.0.19041.0 Index: src/libchcore/libchcore.vc140.vcxproj =================================================================== diff -u -N -r49869c22052117465b59dc527b3393ab771d50f6 -r2dea2d82eb5c11d9e92d42e47f876e58c4505c4b --- src/libchcore/libchcore.vc140.vcxproj (.../libchcore.vc140.vcxproj) (revision 49869c22052117465b59dc527b3393ab771d50f6) +++ src/libchcore/libchcore.vc140.vcxproj (.../libchcore.vc140.vcxproj) (revision 2dea2d82eb5c11d9e92d42e47f876e58c4505c4b) @@ -39,7 +39,7 @@ {CBBF380B-7B16-4A1E-8194-758DAD7D8011} libchcore Win32Proj - 10.0 + 10.0.19041.0 Index: src/libchengine/libchengine.vcxproj =================================================================== diff -u -N -r49869c22052117465b59dc527b3393ab771d50f6 -r2dea2d82eb5c11d9e92d42e47f876e58c4505c4b --- src/libchengine/libchengine.vcxproj (.../libchengine.vcxproj) (revision 49869c22052117465b59dc527b3393ab771d50f6) +++ src/libchengine/libchengine.vcxproj (.../libchengine.vcxproj) (revision 2dea2d82eb5c11d9e92d42e47f876e58c4505c4b) @@ -39,7 +39,7 @@ {6840F785-917F-46EE-BD56-C296C7A5B9E9} libchengine Win32Proj - 10.0 + 10.0.19041.0 Index: src/libictranslate/libictranslate.vc140.vcxproj =================================================================== diff -u -N -r49869c22052117465b59dc527b3393ab771d50f6 -r2dea2d82eb5c11d9e92d42e47f876e58c4505c4b --- src/libictranslate/libictranslate.vc140.vcxproj (.../libictranslate.vc140.vcxproj) (revision 49869c22052117465b59dc527b3393ab771d50f6) +++ src/libictranslate/libictranslate.vc140.vcxproj (.../libictranslate.vc140.vcxproj) (revision 2dea2d82eb5c11d9e92d42e47f876e58c4505c4b) @@ -39,7 +39,7 @@ {DD1F3242-7EE4-4F41-8B8D-D833300C445F} libictranslate MFCDLLProj - 10.0 + 10.0.19041.0 Index: src/liblogger/liblogger.vc140.vcxproj =================================================================== diff -u -N -r49869c22052117465b59dc527b3393ab771d50f6 -r2dea2d82eb5c11d9e92d42e47f876e58c4505c4b --- src/liblogger/liblogger.vc140.vcxproj (.../liblogger.vc140.vcxproj) (revision 49869c22052117465b59dc527b3393ab771d50f6) +++ src/liblogger/liblogger.vc140.vcxproj (.../liblogger.vc140.vcxproj) (revision 2dea2d82eb5c11d9e92d42e47f876e58c4505c4b) @@ -39,7 +39,7 @@ {DF9957D4-3D95-4AC3-AD3F-DCBEA058F79D} liblogger Win32Proj - 10.0 + 10.0.19041.0 Index: src/libserializer/libserializer.vcxproj =================================================================== diff -u -N -r49869c22052117465b59dc527b3393ab771d50f6 -r2dea2d82eb5c11d9e92d42e47f876e58c4505c4b --- src/libserializer/libserializer.vcxproj (.../libserializer.vcxproj) (revision 49869c22052117465b59dc527b3393ab771d50f6) +++ src/libserializer/libserializer.vcxproj (.../libserializer.vcxproj) (revision 2dea2d82eb5c11d9e92d42e47f876e58c4505c4b) @@ -39,7 +39,7 @@ {9490EC08-9CAB-4F99-99D8-0297E5BF6EA7} libserializer Win32Proj - 10.0 + 10.0.19041.0 Index: src/libstring/libstring.vcxproj =================================================================== diff -u -N -r49869c22052117465b59dc527b3393ab771d50f6 -r2dea2d82eb5c11d9e92d42e47f876e58c4505c4b --- src/libstring/libstring.vcxproj (.../libstring.vcxproj) (revision 49869c22052117465b59dc527b3393ab771d50f6) +++ src/libstring/libstring.vcxproj (.../libstring.vcxproj) (revision 2dea2d82eb5c11d9e92d42e47f876e58c4505c4b) @@ -39,7 +39,7 @@ {5BD38175-9F48-417D-8E5B-7093B1873CE5} libstring Win32Proj - 10.0 + 10.0.19041.0 Index: src/regchext/regchext.vcxproj =================================================================== diff -u -N -r49869c22052117465b59dc527b3393ab771d50f6 -r2dea2d82eb5c11d9e92d42e47f876e58c4505c4b --- src/regchext/regchext.vcxproj (.../regchext.vcxproj) (revision 49869c22052117465b59dc527b3393ab771d50f6) +++ src/regchext/regchext.vcxproj (.../regchext.vcxproj) (revision 2dea2d82eb5c11d9e92d42e47f876e58c4505c4b) @@ -39,7 +39,7 @@ {767D21BE-A123-46CD-B5D6-E01714E2A981} regchext MFCProj - 10.0 + 10.0.19041.0