Release 3.6.3 (#99)

* Upgrade to GDAL 3.6.3 * Compiled Linux build * Remove package references * Update workflow
MaxRev-Dev · May 2, 2023 · 9362124 · 9362124
1 parent 2a6cd94
commit 9362124
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 31 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -36,6 +36,11 @@ jobs:
           dotnet nuget update source nuget.org --store-password-in-clear-text -u ${{ secrets.API_USER_NUGET }} -p ${{ secrets.API_KEY_NUGET }}
 
       - name: Run tests from nuget packages
+        env: 
+          TEST_PROJECT: tests/MaxRev.Gdal.Core.Tests.XUnit/MaxRev.Gdal.Core.Tests.XUnit.csproj  
         run: |
-          dotnet restore --ignore-failed-sources tests/MaxRev.Gdal.Core.Tests.XUnit/MaxRev.Gdal.Core.Tests.XUnit.csproj  
-          dotnet test --no-restore tests/MaxRev.Gdal.Core.Tests.XUnit/MaxRev.Gdal.Core.Tests.XUnit.csproj 
+          dotnet restore --ignore-failed-sources ${{ env.TEST_PROJECT }}
+          dotnet add ${{ env.TEST_PROJECT }} package MaxRev.Gdal.Core
+          dotnet add ${{ env.TEST_PROJECT }} package MaxRev.Gdal.LinuxRuntime.Minimal
+          dotnet add ${{ env.TEST_PROJECT }} package MaxRev.Gdal.WindowsRuntime.Minimal
+          dotnet test --no-restore ${{ env.TEST_PROJECT }}
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # gdal.netcore [![Mentioned in Awesome Geospatial](https://awesome.re/mentioned-badge.svg)](https://github.com/sacridini/Awesome-Geospatial) ![Packages CI](https://github.com/MaxRev-Dev/gdal.netcore/workflows/CI/badge.svg?branch=master)
 
-A simple (as is) build engine of [GDAL](https://gdal.org/) 3.6.2 library for [.NET](https://dotnet.microsoft.com/download). 
+A simple (as is) build engine of [GDAL](https://gdal.org/) 3.6.3 library for [.NET](https://dotnet.microsoft.com/download). 
 
 ## Packages
 
@@ -93,7 +93,7 @@ Detailed guide is here - [unix](unix/).
 
 ## About build configuration
 
-The current version targets **GDAL 3.6.2** with **minimal drivers**. What stands for 'minimal' - drivers that require no additional dependencies (mainly boost). For example, `MySQL` driver is not included, because it requires 15+ boost deps. Same goes for `Poppler` driver. They can be packaged upon request.
+The current version targets **GDAL 3.6.3** with **minimal drivers**. What stands for 'minimal' - drivers that require no additional dependencies (mainly boost). For example, `MySQL` driver is not included, because it requires 15+ boost deps. Same goes for `Poppler` driver. They can be packaged upon request.
 
 Drivers included PROJ(9.2.0), GEOS(3.11.1), and more than 200 other drivers.
 To view full list of drivers, To view the complete list of drivers, you can view the full list with GDAL's API or see property `DriversInCurrentVersion` [here](tests/MaxRev.Gdal.Core.Tests.XUnit/CommonTests.cs).
@@ -102,7 +102,7 @@ To view full list of drivers, To view the complete list of drivers, you can view
 
 ## Building runtime libraries
 
-Current version is targeting **GDAL 3.6.2** version. Each runtime has to be build separately, but this can be done concurrently as they are using different contexts (build folders). Primary operating bindings (in gdal.core package) are build from **windows**.
+Current version is targeting **GDAL 3.6.3** version. Each runtime has to be build separately, but this can be done concurrently as they are using different contexts (build folders). Primary operating bindings (in gdal.core package) are build from **windows**.
 
 To make everything work smoothly, each configuration targets the same drivers and their versions, respectively.
 

diff --git a/gdalcore.linuxruntime.csproj b/gdalcore.linuxruntime.csproj
@@ -13,15 +13,15 @@
     <RepositoryType>git</RepositoryType>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <RepositoryUrl>https://github.com/MaxRev-Dev/gdal.netcore</RepositoryUrl>
-    <Version>3.6.2.200</Version>
-    <Description>GDAL (3.6.2) minimal libraries package. 
+    <Version>3.6.3.100</Version>
+    <Description>GDAL (3.6.3) minimal libraries package. 
 Drivers included PROJ (9.2.0), GEOS (3.11.1), SQLITE3, CURL, JPEG, PNG, HDF4, HDF5
 Targets linux-x64 runtime. Target Frameworks: netstandard[2.1|2.0], netcoreapp[2.1,3.1], net6.0, net7.0
 </Description>
     <AssemblyName>MaxRev.Gdal.LinuxRuntime.Minimal</AssemblyName>
     <PackageReleaseNotes>
 - Bug fix release.
-- GDAL 3.6.2
+- GDAL 3.6.3
 - targets .NET6 LTS, .NET7 
 - PROJ 9.2.0</PackageReleaseNotes>
   </PropertyGroup>

diff --git a/gdalcore.loader.csproj b/gdalcore.loader.csproj
@@ -16,16 +16,16 @@
     <RepositoryType>git</RepositoryType>
     <LangVersion>10.0</LangVersion>
     <RepositoryUrl>https://github.com/MaxRev-Dev/gdal.netcore</RepositoryUrl>
-    <Version>3.6.2.200</Version>
+    <Version>3.6.3.100</Version>
     <Description>
-      GDAL (3.6.2) bindings for dotnet core (now linux-x64 and win-x64).
+      GDAL (3.6.3) bindings for dotnet core (now linux-x64 and win-x64).
       Bridge between gdal and netcore.
       Use dependency package for target runtime to get drivers.
       Works in docker containers without pkg installations!!
       Just call - GdalBase.ConfigureAll()
     </Description>
     <PackageReleaseNotes>
-      - GDAL Version 3.6.2
+      - GDAL Version 3.6.3
       - Built with VCPKG
     </PackageReleaseNotes>
   </PropertyGroup>

diff --git a/gdalcore.windowsruntime.csproj b/gdalcore.windowsruntime.csproj
@@ -13,14 +13,14 @@
     <RepositoryType>git</RepositoryType>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <RepositoryUrl>https://github.com/MaxRev-Dev/gdal.netcore</RepositoryUrl>
-    <Version>3.6.2.200</Version>
-    <Description>GDAL (3.6.2) minimal libraries package. 
+    <Version>3.6.3.100</Version>
+    <Description>GDAL (3.6.3) minimal libraries package. 
 Drivers included PROJ (9.2.0), GEOS (3.11.1), SQLITE3, CURL, JPEG, PNG, HDF4, HDF5
 Targets win-x64 runtime. Target Frameworks: netstandard[2.1|2.0], netcoreapp[2.1,3.1], net6.0, net7.0
 </Description>
     <AssemblyName>MaxRev.Gdal.WindowsRuntime.Minimal</AssemblyName> 
     <PackageReleaseNotes>
-- GDAL 3.6.2
+- GDAL 3.6.3
 - targets .NET6 LTS, .NET7
 - PROJ 9.2.0
 </PackageReleaseNotes>

diff --git a/nuget.config b/nuget.config
@@ -3,7 +3,6 @@
     <packageSources>
     	<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
         <add key="github" value="https://nuget.pkg.github.com/MaxRev-Dev/index.json" />
-        <add key="local" value="nuget" />
     </packageSources>
     <packageSourceCredentials>
         <github>

diff --git a/shared/GdalCore.opt b/shared/GdalCore.opt
@@ -10,7 +10,7 @@ BUILD_ROOT=$(ROOTDIR_)/build-$(BASE_RUNTIME_RID)
 
 GDAL_ROOT=$(BUILD_ROOT)/gdal-source
 GDAL_REPO=https://github.com/OSGeo/gdal.git
-GDAL_COMMIT_VER=tags/v3.6.2 # Jan 2, 2023
+GDAL_COMMIT_VER=tags/v3.6.3 # Apr 21, 2023
 
 PROJ_ROOT=$(BUILD_ROOT)/proj-source
 PROJ_REPO=https://github.com/OSGeo/PROJ.git

diff --git a/tests/MaxRev.Gdal.Core.Tests.AzureFunctions/MaxRev.Gdal.Core.Tests.AzureFunctions.csproj b/tests/MaxRev.Gdal.Core.Tests.AzureFunctions/MaxRev.Gdal.Core.Tests.AzureFunctions.csproj
@@ -7,9 +7,7 @@
     <_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MaxRev.Gdal.Core" Version="3.6.2.*" />
-    <PackageReference Include="MaxRev.Gdal.LinuxRuntime.Minimal" Version="3.6.2.*" />
-    <PackageReference Include="MaxRev.Gdal.WindowsRuntime.Minimal" Version="3.6.1.*" />
+    <PackageReference Include="MaxRev.Gdal.Core" Version="3.6.3.*" />
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/MaxRev.Gdal.Core.Tests.XUnit/MaxRev.Gdal.Core.Tests.XUnit.csproj b/tests/MaxRev.Gdal.Core.Tests.XUnit/MaxRev.Gdal.Core.Tests.XUnit.csproj
@@ -8,8 +8,9 @@
     <Platforms>x64</Platforms>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MaxRev.Gdal.Core" Version="3.6.2.*" />
-    <PackageReference Include="MaxRev.Gdal.LinuxRuntime.Minimal" Version="3.6.2.100" /> 
+    <PackageReference Include="MaxRev.Gdal.Core" Version="3.6.3.*" />
+    <PackageReference Include="MaxRev.Gdal.LinuxRuntime.Minimal" Version="3.6.3.*" />
+    <PackageReference Include="MaxRev.Gdal.WindowsRuntime.Minimal" Version="3.6.3.*" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

diff --git a/tests/MaxRev.Gdal.Core.Tests/MaxRev.Gdal.Core.Tests.csproj b/tests/MaxRev.Gdal.Core.Tests/MaxRev.Gdal.Core.Tests.csproj
@@ -9,9 +9,7 @@
     <RootNamespace>MaxRev.Gdal.Core.Tests</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MaxRev.Gdal.Core" Version="3.6.2.*" />
-    <PackageReference Include="MaxRev.Gdal.LinuxRuntime.Minimal" Version="3.6.2.*" />
-    <PackageReference Include="MaxRev.Gdal.WindowsRuntime.Minimal" Version="3.6.1.*" />
+    <PackageReference Include="MaxRev.Gdal.Core" Version="3.6.3.*" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
   </ItemGroup>
 </Project>
diff --git a/unix/GNUmakefile b/unix/GNUmakefile
@@ -6,7 +6,7 @@ all:
 	@$(MAKE) -f vcpkg-makefile || exit 1
 
 #	install main libraries (proj,gdal)
-	@$(MAKE) -f gdal-makefile || exit 1
+	@$(MAKE) -f gdal-makefile proj-force gdal-force || exit 1
 
 #	collect dynamic libraries 
 	@$(MAKE) -f collect-deps-makefile || exit 1

diff --git a/unix/gdal-makefile b/unix/gdal-makefile
@@ -94,6 +94,10 @@ configure_gdal:
 		-DGDAL_USE_DEFLATE=OFF \
 		-DGDAL_USE_ZLIB_INTERNAL=ON \
 		-DBUILD_APPS=OFF \
+		-DGDAL_CSHARP_APPS=OFF \
+		-DGDAL_CSHARP_TESTS=OFF \
+		-DGDAL_CSHARP_BUILD_NUPKG=OFF \
+		-DBUILD_PYTHON_BINDINGS=OFF \
 		-DBUILD_CSHARP_BINDINGS=ON \
 		-DBUILD_JAVA_BINDINGS=OFF \
 		-DBUILD_SHARED_LIBS=ON \

diff --git a/unix/test-makefile b/unix/test-makefile
@@ -15,12 +15,18 @@ TEST_TARGET=$(TEST_DIR_APP)
 APP_RUN_TARGET=dotnet run
 endif
 
+MISSING_PACKAGES=MaxRev.Gdal.OsxRuntime.Minimal MaxRev.Gdal.WindowsRuntime.Minimal 
+
 all: test
 
 ###	Testing linux libraries (from nuget build output)
 test-restore:
-	-@cd $(TEST_TARGET) && dotnet remove package "MaxRev.Gdal.WindowsRuntime.Minimal"
-	-@cd $(TEST_TARGET) && dotnet remove package "MaxRev.Gdal.OsxRuntime.Minimal"
+# 	remove other packages as they don't exist in the local source
+	-@for v in $(MISSING_PACKAGES); do \
+		cd "$(TEST_DIR)/../MaxRev.Gdal.Core.Tests.AzureFunctions" && dotnet remove package $$v &> /dev/null; \
+		cd "$(TEST_DIR)/../MaxRev.Gdal.Core.Tests" && dotnet remove package $$v &> /dev/null;  \
+	done;
+
 	-@cd $(TEST_TARGET) && \
 		dotnet restore --force -s "$(NUGET_)" -s "https://api.nuget.org/v3/index.json" --ignore-failed-sources
 

diff --git a/win/test-makefile.vc b/win/test-makefile.vc
@@ -15,18 +15,20 @@ all: test
 
 test-restore:
 	-cd $(TEST_DIR)
-	dotnet restore -s "https://api.nuget.org/v3/index.json" -s $(NUGET_) 
+	-cd "$(TEST_DIR)/../MaxRev.Gdal.Core.Tests.AzureFunctions" && dotnet remove package MaxRev.Gdal.LinuxRuntime.Minimal 
+	-cd "$(TEST_DIR)/../MaxRev.Gdal.Core.Tests" && dotnet remove package MaxRev.Gdal.LinuxRuntime.Minimal  
+	-dotnet restore -s "https://api.nuget.org/v3/index.json" -s $(NUGET_) --ignore-failed-sources
 	-cd $(MAKEDIR)
 
 test-update:
 	-cd $(TEST_DIR)
-	dotnet add package MaxRev.Gdal.WindowsRuntime.Minimal -s $(NUGET_) $(PRE_RELEASE_ARG)
-	dotnet add package MaxRev.Gdal.Core -s $(NUGET_) $(PRE_RELEASE_ARG)
+	-dotnet add package MaxRev.Gdal.WindowsRuntime.Minimal -s $(NUGET_) $(PRE_RELEASE_ARG)
+	-dotnet add package MaxRev.Gdal.Core -s $(NUGET_) $(PRE_RELEASE_ARG)
 	-cd $(MAKEDIR)
 
 test-only: test-restore
 	-cd $(TEST_DIR)
-	dotnet test
+	dotnet test --no-restore
 	-cd $(MAKEDIR)
 
 test: test-restore test-update test-only