From 938ae2d4dd7fa5fb190a82e375aba823a91b1765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Pokorn=C3=BD?= Date: Tue, 14 Nov 2023 15:57:14 +0100 Subject: [PATCH 1/3] Fix NuGet package name Removed an underscore from the package name of the Ubuntu 20.04 NuGet. --- .github/workflows/ubuntu20.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ubuntu20.yml b/.github/workflows/ubuntu20.yml index 30b7d2812..aee1a5848 100644 --- a/.github/workflows/ubuntu20.yml +++ b/.github/workflows/ubuntu20.yml @@ -152,9 +152,9 @@ jobs: cd ${GITHUB_WORKSPACE}/opencvsharp sed -E --in-place=.bak \ "s/[0-9]\.[0-9]{1,2}\.[0-9]{1,2}.[0-9]{8}(-beta[0-9]*)?<\/version>/${OPENCV_VERSION}.${yyyymmdd}${BETA}<\/version>/" \ - nuget/OpenCvSharp4_.runtime.ubuntu.20.04-x64.nuspec - cat nuget/OpenCvSharp4_.runtime.ubuntu.20.04-x64.nuspec - dotnet pack nuget/OpenCvSharp4_.runtime.ubuntu.20.04-x64.csproj -o ${GITHUB_WORKSPACE}/artifacts_ubuntu + nuget/OpenCvSharp4.runtime.ubuntu.20.04-x64.nuspec + cat nuget/OpenCvSharp4.runtime.ubuntu.20.04-x64.nuspec + dotnet pack nuget/OpenCvSharp4.runtime.ubuntu.20.04-x64.csproj -o ${GITHUB_WORKSPACE}/artifacts_ubuntu ls ${GITHUB_WORKSPACE}/artifacts_ubuntu - uses: actions/upload-artifact@v3 From 7e6739d3d3ecc9e2fcb2b82e77da5fefec435906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Pokorn=C3=BD?= Date: Wed, 15 Nov 2023 10:10:19 +0100 Subject: [PATCH 2/3] Rename nuspec and project for ubuntu Renamed the `.nuspec` and `.csproj` files for the OpenCvSharp Ubuntu runtime. --- ...04-x64.csproj => OpenCvSharp4.runtime.ubuntu.20.04-x64.csproj} | 0 ...04-x64.nuspec => OpenCvSharp4.runtime.ubuntu.20.04-x64.nuspec} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename nuget/{OpenCvSharp4_.runtime.ubuntu.20.04-x64.csproj => OpenCvSharp4.runtime.ubuntu.20.04-x64.csproj} (100%) rename nuget/{OpenCvSharp4_.runtime.ubuntu.20.04-x64.nuspec => OpenCvSharp4.runtime.ubuntu.20.04-x64.nuspec} (100%) diff --git a/nuget/OpenCvSharp4_.runtime.ubuntu.20.04-x64.csproj b/nuget/OpenCvSharp4.runtime.ubuntu.20.04-x64.csproj similarity index 100% rename from nuget/OpenCvSharp4_.runtime.ubuntu.20.04-x64.csproj rename to nuget/OpenCvSharp4.runtime.ubuntu.20.04-x64.csproj diff --git a/nuget/OpenCvSharp4_.runtime.ubuntu.20.04-x64.nuspec b/nuget/OpenCvSharp4.runtime.ubuntu.20.04-x64.nuspec similarity index 100% rename from nuget/OpenCvSharp4_.runtime.ubuntu.20.04-x64.nuspec rename to nuget/OpenCvSharp4.runtime.ubuntu.20.04-x64.nuspec From 599ac362149688d91e824a7aeabeb5c44f714cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Pokorn=C3=BD?= Date: Wed, 15 Nov 2023 14:08:51 +0100 Subject: [PATCH 3/3] Fix more underscores Fixed a few more places where OpenCvSharp was suffixed with an underscore for the Ubuntu runtime package. --- README.md | 2 +- nuget/OpenCvSharp4.runtime.ubuntu.20.04-x64.csproj | 2 +- nuget/OpenCvSharp4.runtime.ubuntu.20.04-x64.nuspec | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index db349abf1..d2e67864d 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Old versions of OpenCvSharp are stored in [opencvsharp_2410](https://github.com/ |---------|-------------|------| |**OpenCvSharp4.runtime.win**| Native bindings for Windows x64/x86 (except UWP) | [![NuGet version](https://badge.fury.io/nu/OpenCvSharp4.runtime.win.svg)](https://badge.fury.io/nu/OpenCvSharp4.runtime.win) | |**OpenCvSharp4.runtime.uwp**| Native bindings for UWP (Universal Windows Platform) x64/x86/ARM | [![NuGet version](https://badge.fury.io/nu/OpenCvSharp4.runtime.uwp.svg)](https://badge.fury.io/nu/OpenCvSharp4.runtime.uwp) | -|**OpenCvSharp4.runtime.ubuntu.20.04-x64**| Native bindings for Ubuntu 20.04 x64 | [![NuGet version](https://badge.fury.io/nu/OpenCvSharp4_.runtime.ubuntu.20.04-x64.svg)](https://badge.fury.io/nu/OpenCvSharp4_.runtime.ubuntu.20.04-x64) | +|**OpenCvSharp4.runtime.ubuntu.20.04-x64**| Native bindings for Ubuntu 20.04 x64 | [![NuGet version](https://badge.fury.io/nu/OpenCvSharp4.runtime.ubuntu.20.04-x64.svg)](https://badge.fury.io/nu/OpenCvSharp4.runtime.ubuntu.20.04-x64) | |**OpenCvSharp4.runtime.linux-arm**| Native bindings for Linux Arm | [![NuGet version](https://badge.fury.io/nu/OpenCvSharp4.runtime.linux-arm.svg)](https://www.nuget.org/packages/OpenCvSharp4.runtime.linux-arm/) | |**OpenCvSharp4.runtime.wasm**| Native bindings for WebAssembly | [![NuGet version](https://badge.fury.io/nu/OpenCvSharp4.runtime.wasm.svg)](https://www.nuget.org/packages/OpenCvSharp4.runtime.wasm/) | diff --git a/nuget/OpenCvSharp4.runtime.ubuntu.20.04-x64.csproj b/nuget/OpenCvSharp4.runtime.ubuntu.20.04-x64.csproj index 1cbfd649f..f4e960bdb 100644 --- a/nuget/OpenCvSharp4.runtime.ubuntu.20.04-x64.csproj +++ b/nuget/OpenCvSharp4.runtime.ubuntu.20.04-x64.csproj @@ -3,7 +3,7 @@ netstandard2.0;netstandard2.1;netcoreapp2.1; true false - OpenCvSharp4_.runtime.ubuntu.20.04-x64.nuspec + OpenCvSharp4.runtime.ubuntu.20.04-x64.nuspec