SET PATH=E:\builds\release-1911-x64\bin;E:\builds\release-1911-x64\bin\curl;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\bin\HostX64\x64;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\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\\x64;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\x64\;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\x64;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\\MSBuild\15.0\bin;C:\WINDOWS\Microsoft.NET\Framework64\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:\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-x64\bin\curl\curl.exe E:\builds\release-1911-x64\bin\curl\curl.exe -o E:\builds\release-1911-x64\bin\curl\curl-ca-bundle.crt "https://curl.haxx.se/ca/cacert.pem" set TERM=msys set "PATH=E:\Git\bin;%PATH%" cd ..\sdk\vc15x64\mapserver-7-6 git reset --hard HEAD HEAD is now at 74ae370a update for 7.6.1 release git pull origin Updating 74ae370a..7aba93dd Fast-forward maptemplate.c | 2 ++ 1 file changed, 2 insertions(+) git reset --hard HEAD HEAD is now at 7aba93dd Merge pull request #6129 from MapServer-backport-bot/backport-6128-to-branch-7-6 git log --pretty=format:%H -n 1 > E:\builds\release-1911-x64\doc\ms_revision.txt type E:\builds\release-1911-x64\doc\ms_revision.txt 7aba93dd04a2388fb56803620b260680b6fc1d86 cd E:\builds cd ..\sdk\vc15x64\gdal-3.1\gdal git reset --hard HEAD HEAD is now at 1fc8b45880 Prepare for GDAL 3.1.2 release git pull origin Updating 1fc8b45880..dfd53495b4 Fast-forward autotest/cpp/test_osr_set_proj_search_paths.cpp | 12 ++ autotest/gcore/hdf4multidim.py | 7 + autotest/gdrivers/envi.py | 21 +++ autotest/gdrivers/gpkg.py | 12 +- autotest/gdrivers/hdf5multidim.py | 10 ++ autotest/gdrivers/netcdf_multidim.py | 10 ++ autotest/gdrivers/rl2.py | 1 - autotest/ogr/ogr_geojson.py | 34 +++++ autotest/ogr/ogr_mitab.py | 6 +- autotest/osr/osr_ct_proj.py | 9 +- autotest/utilities/test_ogr2ogr_lib.py | 14 ++ autotest/utilities/test_ogrinfo.py | 2 +- gdal/GNUmakefile | 5 +- gdal/alg/gdalwarpoperation.cpp | 26 ++-- gdal/alg/polygonize.cpp | 15 +- gdal/apps/ogr2ogr_lib.cpp | 34 ++++- gdal/apps/ogrinfo.cpp | 34 ++++- gdal/configure | 4 +- gdal/configure.ac | 4 +- gdal/frmts/fits/fitsdataset.cpp | 6 + gdal/frmts/gtiff/gt_wkt_srs.cpp | 6 + gdal/frmts/gtiff/libgeotiff/geo_normalize.c | 3 + gdal/frmts/hdf4/hdf4multidim.cpp | 36 ++++- gdal/frmts/hdf5/bagdataset.cpp | 5 +- gdal/frmts/hdf5/hdf5multidim.cpp | 6 +- gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp | 10 ++ gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 4 +- gdal/frmts/netcdf/netcdfmultidim.cpp | 10 +- gdal/frmts/pds/vicardataset.cpp | 2 +- gdal/frmts/raw/envidataset.cpp | 20 ++- gdal/frmts/raw/iscedataset.cpp | 6 + gdal/frmts/tsx/tsxdataset.cpp | 8 +- gdal/frmts/vrt/vrtmultidim.cpp | 8 +- gdal/frmts/vrt/vrtsources.cpp | 2 +- gdal/ogr/ogr_proj_p.cpp | 5 + gdal/ogr/ogrgeometryfactory.cpp | 8 +- gdal/ogr/ogrsf_frmts/dwg/ogrteigha.cpp | 2 +- gdal/ogr/ogrsf_frmts/flatgeobuf/packedrtree.cpp | 3 +- gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.cpp | 4 +- .../ogrsf_frmts/geomedia/ogrgeomediadatasource.cpp | 2 +- .../ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp | 100 +++----------- gdal/ogr/ogrsf_frmts/mitab/mitab_spatialref.cpp | 17 +-- gdal/ogr/ogrsf_frmts/mvt/ogrmvtdataset.cpp | 152 +++++++++++---------- gdal/ogr/ogrsf_frmts/odbc/ogrodbcdatasource.cpp | 4 +- gdal/ogr/ogrsf_frmts/pgeo/ogrpgeodatasource.cpp | 4 +- gdal/ogr/ogrsf_frmts/pgeo/ogrpgeodriver.cpp | 2 + gdal/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp | 27 ++++ gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitedriver.cpp | 2 - gdal/ogr/ogrsf_frmts/sqlite/rasterlite2.cpp | 5 - gdal/ogr/ogrsf_frmts/walk/ogrwalkdatasource.cpp | 2 +- gdal/ogr/ogrspatialreference.cpp | 40 +----- gdal/port/cpl_odbc.cpp | 48 +++++-- gdal/swig/csharp/GNUmakefile | 2 +- gdal/swig/csharp/apps/GDALInfo.cs | 13 +- gdal/swig/csharp/apps/GDALWarp.cs | 98 +++++++++++++ gdal/swig/csharp/apps/GetCRSInfo.cs | 83 +++++++++++ gdal/swig/csharp/makefile.vc | 8 +- gdal/swig/include/Dataset.i | 4 - gdal/swig/include/csharp/gdal_csharp.i | 43 ++++++ gdal/swig/include/csharp/osr_csharp.i | 38 ++++++ gdal/swig/include/gdal.i | 2 +- gdal/swig/include/osr.i | 5 +- gdal/swig/perl/t/alg.t | 4 +- gdal/swig/python/scripts/gdal2tiles.py | 6 +- gdal/swig/python/scripts/gdal_merge.py | 4 +- 65 files changed, 813 insertions(+), 316 deletions(-) create mode 100644 gdal/swig/csharp/apps/GDALWarp.cs create mode 100644 gdal/swig/csharp/apps/GetCRSInfo.cs git reset --hard HEAD HEAD is now at dfd53495b4 Make OSRGetPROJSearchPaths() return the value set by OSRSetPROJSearchPaths() git log --pretty=format:%H -n 1 > E:\builds\release-1911-x64\doc\gdal_revision.txt type E:\builds\release-1911-x64\doc\gdal_revision.txt dfd53495b4bb7ab09b44013115f687961bf59182 cd E:\builds