SET PATH=E:\builds\release-1911\bin;E:\builds\release-1911\bin\curl;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\bin\HostX86\x86;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft SDKs\TypeScript\3.1;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\bin\Roslyn;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\\MSBuild\15.0\bin;C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\ActiveTcl\bin;C:\Perl64\site\bin;C:\Perl64\bin;C:\Program Files\Microsoft MPI\Bin\;E:\app\szekeres\product\11.2.0\dbhome_1\bin;C:\ProgramData\Oracle\Java\javapath;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\PrivateAssemblies\;C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET Web Pages\v1.0\;C:\WINDOWS\system32\config\systemprofile\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0\;C:\Program Files\nodejs\;C:\Program Files (x86)\Microsoft Team Foundation Server 2015 Power Tools\;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Microsoft Network Monitor 3\;C:\Program Files\dotnet\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\TortoiseGit\bin;C:\Program Files\Microsoft SQL Server\110\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\110\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\DTS\Binn\;;C:\Program Files\7-Zip;C:\Program Files (x86)\Certum\proCertum CardManager;C:\Program Files (x86)\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\dotnet\;C:\Program Files\Microsoft\Web Platform Installer\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\DTS\Binn\;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Git\cmd;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Users\szekeres\AppData\Roaming\npm;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;C:\Users\szekeres\AppData\Local\Programs\Fiddler;C:\Users\szekeres\.dotnet\tools;C:\Users\szekeres\.dotnet\tools;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja if exist E:\builds\release-1911\bin\curl\curl.exe E:\builds\release-1911\bin\curl\curl.exe -o E:\builds\release-1911\bin\curl\curl-ca-bundle.crt "https://curl.haxx.se/ca/cacert.pem" set TERM=msys set "PATH=E:\Git\bin;%PATH%" cd ..\sdk\vc15\mapserver-7-6 git reset --hard HEAD HEAD is now at 74ae370a update for 7.6.1 release git pull origin Updating 74ae370a..dac7adc6 Fast-forward .github/workflows/check-crlf.yml | 20 + .travis.yml | 3 - CMakeLists.txt | 2 +- HISTORY.TXT | 5 + INSTALL.CMAKE | 5 +- MIGRATION_GUIDE.txt | 7 +- README.rst | 12 +- cmake/FindOracle.cmake | 2 +- cmake/FindProj.cmake | 80 +- fontcache.c | 20 + mapcontour.c | 19 +- mapgdal.c | 18 +- mapgdal.h | 46 + mapproject.c | 10 + mapscript/csharp/Makefile.vc | 2 +- mapscript/csharp/examples/drawmapDirect.cs | 200 +- mapscript/csharp/examples/drawmapDirectPrint.cs | 232 +- mapscript/csharp/examples/inline.cs | 270 +- maptemplate.c | 5 + maptile.h | 2 - mapwcs11.c | 5 +- mapwcs20.c | 4 +- mapwmslayer.c | 5 +- msautotest/README | 4 +- msautotest/gdal/wmsclient.map | 2 +- msautotest/gdal/wmsclient_3543.map | 2 +- msautotest/misc/expected/mode_tile_output.png | Bin 0 -> 3412 bytes msautotest/misc/mode_tile.map | 36 + msautotest/misc/ogr_direct.map | 58 +- msautotest/mssql/create_mssql_db.bat | 14 +- msautotest/mssql/include/bdry_counpy2_mssql.map | 26 +- msautotest/mssql/include/cities_mssql.map | 12 +- msautotest/renderers/wmsclient.map | 2 +- msautotest/wxs/wms_client_111.map | 2 +- msautotest/wxs/wms_client_111_axis_fail.map | 2 +- msautotest/wxs/wms_client_130.map | 2 +- msautotest/wxs/wms_client_130_axis_fail.map | 2 +- renderers/agg/include/agg_conv_clipper.h | 598 +- renderers/agg/include/agg_rendering_buffer.h | 4 +- renderers/agg/include/clipper.hpp | 604 +-- renderers/agg/src/clipper.cpp | 6604 +++++++++++------------ version.rc.in | 104 +- 42 files changed, 4605 insertions(+), 4447 deletions(-) create mode 100644 .github/workflows/check-crlf.yml create mode 100644 mapgdal.h create mode 100644 msautotest/misc/expected/mode_tile_output.png create mode 100644 msautotest/misc/mode_tile.map git reset --hard HEAD HEAD is now at dac7adc6 Merge pull request #6199 from MapServer-backport-bot/backport-6198-to-branch-7-6 git log --pretty=format:%H -n 1 > E:\builds\release-1911\doc\ms_revision.txt type E:\builds\release-1911\doc\ms_revision.txt dac7adc6c6cc1f92febb78d15accf71ca8dbadf9 cd E:\builds cd ..\sdk\vc15\gdal-3.2\gdal git reset --hard HEAD HEAD is now at 60a1589730 Sign csharp assemblies as part of the netcore build process, verify signature during tests (#1368) (#3332) git pull origin