Skip to content

Commit 5c4a7ae

Browse files
teo-tsirpanisteo-tsirpanis
authored
[release/5.2] Update native binaries to 2.12.2. (#163)
* Add a NuGet package icon and set the `.nuspec` file as a project property. (#102) * Add a NuGet package icon. It is the same icon the GitHub organization has. * Set the nuspec file in project properties, avoiding passing it on pack. * Update native binaries to 2.12.2. * Bump version to 5.2.5. And remove it from the example projects; they don't need it. * Enable CI on `release/*` branches.
1 parent 8aafede commit 5c4a7ae

File tree

12 files changed

+34
-23
lines changed

12 files changed

+34
-23
lines changed

‎.github/scripts/download_tiledb.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
set -e -x
2-
TAG=2.11.3
3-
ID=a55a910
2+
TAG=2.12.2
3+
ID=a9d60c8
44

55
RELEASE=x86_64-$TAG-$ID
66
wget https://github.com/TileDB-Inc/TileDB/releases/download/$TAG/tiledb-windows-$RELEASE.zip

‎.github/workflows/tiledb-csharp.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: TileDB-CSharp
33
on:
44
push:
55
tags: [ '*' ]
6-
branches: [ main ]
6+
branches: [ main, 'release/*' ]
77
pull_request:
8-
branches: [ main ]
8+
branches: [ main, 'release/*' ]
99
workflow_dispatch:
1010

1111
jobs:
@@ -89,7 +89,7 @@ jobs:
8989
# DotNet pack
9090
- name: Dotnet pack for TileDB.CSharp
9191
run: |
92-
dotnet pack ./sources/TileDB.CSharp/TileDB.CSharp.csproj /p:NuspecFile=TileDB.CSharp.nuspec -c Release
92+
dotnet pack ./sources/TileDB.CSharp/TileDB.CSharp.csproj -c Release
9393
9494
- name: Archive nuget artifact
9595
uses: actions/upload-artifact@v3

‎art/logo.png‎

1.02 KB
Loading

‎cpp/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# setup
66
cmake_minimum_required(VERSION 3.16)
77

8-
set(TILEDB_VERSION "2.11.3" CACHE STRING "TileDB version")
8+
set(TILEDB_VERSION "2.12.2" CACHE STRING "TileDB version")
99
set(TILEDB_GIT_TAG "dev" CACHE STRING "git branch")
1010

1111
project(TileDB-CSharp)

‎cpp/cmake/TileDB.cmake‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,18 @@ message(STATUS "start to set tiledb for version:${TILEDB_VERSION}")
99
if(${TILEDB_VERSION} MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$")
1010
message(STATUS "start to set TILEDB_DOWNLOAD_URL and TILEDB_DOWNLOAD_SHA1")
1111

12-
if(${TILEDB_VERSION} STREQUAL "2.11.3")
12+
if(${TILEDB_VERSION} STREQUAL "2.12.2")
13+
if (WIN32) # Windows
14+
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.12.2/tiledb-windows-x86_64-2.12.2-a9d60c8.zip")
15+
SET(TILEDB_DOWNLOAD_SHA1 "30fd2a26e744a2f496b040733187d33869e37458")
16+
elseif(APPLE) # OSX
17+
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.12.2/tiledb-macos-x86_64-2.12.2-a9d60c8.tar.gz")
18+
SET(TILEDB_DOWNLOAD_SHA1 "505abc35181c0b0dba55928c3ac4bea57806d7a2")
19+
else() # Linux
20+
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.12.2/tiledb-linux-x86_64-2.12.2-a9d60c8.tar.gz")
21+
SET(TILEDB_DOWNLOAD_SHA1 "47f1a64db038f31c40d38fcac10a3316f7295881")
22+
endif()
23+
elseif(${TILEDB_VERSION} STREQUAL "2.11.3")
1324
if (WIN32) # Windows
1425
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.11.3/tiledb-windows-x86_64-2.11.3-a55a910.zip")
1526
SET(TILEDB_DOWNLOAD_SHA1 "0bd042b1c56da9fc1c20b2156e942c23ba1865ac")
@@ -418,14 +429,14 @@ elseif(${TILEDB_VERSION} STREQUAL "2.0.7")
418429
endif()
419430
else()
420431
if (WIN32) # Windows
421-
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.11.3/tiledb-windows-x86_64-2.11.3-a55a910.zip")
422-
SET(TILEDB_DOWNLOAD_SHA1 "0bd042b1c56da9fc1c20b2156e942c23ba1865ac")
432+
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.12.2/tiledb-windows-x86_64-2.12.2-a9d60c8.zip")
433+
SET(TILEDB_DOWNLOAD_SHA1 "30fd2a26e744a2f496b040733187d33869e37458")
423434
elseif(APPLE) # OSX
424-
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.11.3/tiledb-macos-x86_64-2.11.3-a55a910.tar.gz")
425-
SET(TILEDB_DOWNLOAD_SHA1 "f0f091f8401cb1b4060fb3068fe7fc4afdc262b7")
435+
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.12.2/tiledb-macos-x86_64-2.12.2-a9d60c8.tar.gz")
436+
SET(TILEDB_DOWNLOAD_SHA1 "505abc35181c0b0dba55928c3ac4bea57806d7a2")
426437
else() # Linux
427-
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.11.3/tiledb-linux-x86_64-2.11.3-a55a910.tar.gz")
428-
SET(TILEDB_DOWNLOAD_SHA1 "5c2f44d9ca9b34e61230fd0f0a763f0fffa04702")
438+
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.12.2/tiledb-linux-x86_64-2.12.2-a9d60c8.tar.gz")
439+
SET(TILEDB_DOWNLOAD_SHA1 "47f1a64db038f31c40d38fcac10a3316f7295881")
429440
endif()
430441
endif()
431442

‎examples/TileDB.CSharp.Example/TileDB.CSharp.Example.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<RollForward>Major</RollForward>
77
<RootNamespace>TileDB.CSharp.Examples</RootNamespace>
88
<TargetFramework>net5.0</TargetFramework>
9-
<Version>5.2.4</Version>
109
</PropertyGroup>
1110

1211
<ItemGroup>

‎examples/bindings/quickstart_sparse_string/quickstart_sparse_string.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<OutputType>Exe</OutputType>
66
<RollForward>Major</RollForward>
77
<TargetFramework>net5.0</TargetFramework>
8-
<Version>5.2.4</Version>
98
</PropertyGroup>
109

1110
<ItemGroup>

‎scripts/generate/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ source ~/.zshrc
8181
Install specific version of TileDB in `/usr/local`
8282

8383
```bash
84-
git clone https://github.com/TileDB-Inc/TileDB.git -b 2.11.3
85-
mv TileDB TileDB_2.11.3
86-
cd TileDB_2.11.3
84+
git clone https://github.com/TileDB-Inc/TileDB.git -b 2.12.2
85+
mv TileDB TileDB_2.12.2
86+
cd TileDB_2.12.2
8787
mkdir build && cd build
8888
#cmake 3.22.2
8989
cmake -DTILEDB_VERBOSE=OFF -DTILEDB_S3=ON -DTILEDB_SERIALIZATION=ON -DTILEDB_AZURE=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr/local ..

‎sources/TileDB.CSharp/TileDB.CSharp.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
<RollForward>Major</RollForward>
77
<RootNamespace>TileDB.CSharp</RootNamespace>
88
<TargetFramework>net5.0</TargetFramework>
9-
<Version>5.2.4</Version>
9+
<NuspecFile>TileDB.CSharp.nuspec</NuspecFile>
10+
<Version>5.2.5</Version>
1011
</PropertyGroup>
1112

1213
<ItemGroup>

‎sources/TileDB.CSharp/TileDB.CSharp.nuspec‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,23 @@
22
<package >
33
<metadata>
44
<id>TileDB.CSharp</id>
5-
<version>5.2.4</version>
5+
<version>5.2.5</version>
66
<title>$title$</title>
77
<authors>TileDB Inc</authors>
88
<requireLicenseAcceptance>false</requireLicenseAcceptance>
99
<license type="expression">MIT</license>
10+
<icon>logo.png</icon>
1011
<projectUrl>https://github.com/TileDB-Inc/TileDB-CSharp</projectUrl>
1112
<description>CSharp wrapper of TileDB universal data engine</description>
12-
<releaseNotes>This package is the csharp wrapper of TileDB 2.11.3.</releaseNotes>
13+
<releaseNotes>This package is the csharp wrapper of TileDB 2.12.2.</releaseNotes>
1314
<copyright>$copyright$</copyright>
1415
<tags>tiledb</tags>
1516
<dependencies>
1617
<group targetFramework="net5.0"></group>
1718
</dependencies>
1819
</metadata>
1920
<files>
21+
<file src="../../art/logo.png" target=""/>
2022
<!-- binding libraries -->
2123
<file src="lib/net5.0/TileDB.CSharp.dll" target="lib/net5.0"/>
2224
<file src="lib/net5.0/TileDB.Interop.dll" target="lib/net5.0"/>

0 commit comments

Comments
 (0)