Skip to content

Commit

Permalink
Merge pull request #1683 from shimat/ubuntu_rid
Browse files Browse the repository at this point in the history
Add linux-x64 nuget package
  • Loading branch information
shimat authored Jul 17, 2024
2 parents 728293a + a275a56 commit 58029ad
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ubuntu22.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,9 @@ jobs:
cd ${GITHUB_WORKSPACE}/opencvsharp
sed -E --in-place=.bak \
"s/<version>[0-9]\.[0-9]{1,2}\.[0-9]{1,2}.[0-9]{8}(-beta[0-9]*)?<\/version>/<version>${OPENCV_VERSION}.${yyyymmdd}${BETA}<\/version>/" \
nuget/OpenCvSharp4_.runtime.ubuntu.22.04-x64.nuspec
cat nuget/OpenCvSharp4_.runtime.ubuntu.22.04-x64.nuspec
dotnet pack nuget/OpenCvSharp4_.runtime.ubuntu.22.04-x64.csproj -o ${GITHUB_WORKSPACE}/artifacts_ubuntu
nuget/OpenCvSharp4.runtime.linux-x64.nuspec
cat nuget/OpenCvSharp4.runtime.linux-x64.nuspec
dotnet pack nuget/OpenCvSharp4.runtime.linux-x64.csproj -o ${GITHUB_WORKSPACE}/artifacts_ubuntu
ls ${GITHUB_WORKSPACE}/artifacts_ubuntu
- uses: actions/upload-artifact@v4
Expand All @@ -168,4 +168,4 @@ jobs:
cp ${GITHUB_WORKSPACE}/opencvsharp/nuget/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/opencvsharp/test/OpenCvSharp.Tests/bin/Release/net8.0/
cp ${GITHUB_WORKSPACE}/opencvsharp/nuget/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/opencvsharp/test/OpenCvSharp.Tests/
sudo cp ${GITHUB_WORKSPACE}/opencvsharp/nuget/libOpenCvSharpExtern.so /usr/lib/
LD_LIBRARY_PATH=. dotnet test OpenCvSharp.Tests.csproj -c Release -f net8.0 --runtime ubuntu.22.04-x64 --logger "trx;LogFileName=test-results.trx" < /dev/null
LD_LIBRARY_PATH=. dotnet test OpenCvSharp.Tests.csproj -c Release -f net8.0 --runtime linux-x64 --logger "trx;LogFileName=test-results.trx" < /dev/null
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;</TargetFrameworks>
<NoBuild>true</NoBuild>
<IncludeBuildOutput>false</IncludeBuildOutput>
<NuspecFile>OpenCvSharp4_.runtime.ubuntu.22.04-x64.nuspec</NuspecFile>
<NuspecFile>OpenCvSharp4.runtime.linux-x64.nuspec</NuspecFile>
<NuspecProperties></NuspecProperties>
<NuspecBasePath></NuspecBasePath>
<!--<IncludeSymbols>true</IncludeSymbols>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>OpenCvSharp4_.runtime.ubuntu.20.04-x64</id>
<id>OpenCvSharp4.runtime.linux-x64</id>
<version>4.6.0.20220608</version>
<title>OpenCvSharp native bindings for ubuntu.20.04-x64</title>
<title>OpenCvSharp native bindings for Linux-x64</title>
<authors>shimat</authors>
<license type="expression">Apache-2.0</license>
<!--<licenseUrl>https://opensource.org/licenses/BSD-3-Clause</licenseUrl>-->
<projectUrl>https://github.com/shimat/opencvsharp</projectUrl>
<iconUrl>https://raw.githubusercontent.com/shimat/opencvsharp/master/nuget/icon/opencvsharp.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Internal implementation package for OpenCvSharp to work on Ubuntu 20.04</description>
<summary>Internal implementation package for OpenCvSharp to work on Ubuntu 20.04</summary>
<description>Internal implementation package for OpenCvSharp to work on Linux</description>
<summary>Internal implementation package for OpenCvSharp to work on Linux</summary>
<releaseNotes></releaseNotes>
<copyright>Copyright 2008-2019</copyright>
<tags>Image Processing OpenCV Wrapper FFI opencvsharp</tags>
Expand All @@ -25,6 +25,6 @@
</frameworkAssemblies>
</metadata>
<files>
<file src="libOpenCvSharpExtern.so" target="runtimes/ubuntu.22.04-x64/native" />
<file src="libOpenCvSharpExtern.so" target="runtimes/linux-x64/native" />
</files>
</package>
Binary file removed nuget/nuget.exe
Binary file not shown.

0 comments on commit 58029ad

Please sign in to comment.