Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions .github/workflows/Check-Cyz2Json.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,27 +77,13 @@ jobs:
-r ${{ steps.set-rid.outputs.rid }} \
-p:OutputPath=./bin/${{ steps.set-rid.outputs.rid }}/

- name: Create symlink for OpenCvSharpExtern.dylib
if: matrix.os == 'macos-latest'
shell: bash
run: |
publish_dir="Cyz2Json/bin/${{ steps.set-rid.outputs.rid }}/publish"
cd $publish_dir/
# Create symlink to redirect calls to OpenCvSharpExtern.dylib to libOpenCvSharpExtern.dylib (the file actually created)
ln -sf libOpenCvSharpExtern.dylib OpenCvSharpExtern.dylib
cd ../../..

- name: Run executable
shell: bash
run: |
exmpl_path="examples/data/"
file="$exmpl_path/SeineMO_Microphoto_station02_flr26_2ul_8min 2024-05-04 07h54_SubSet.cyz"
dll_path="Cyz2Json/bin/${{ steps.set-rid.outputs.rid }}/publish/Cyz2Json.dll"
bn=$(basename "$file")
# if macOS, use env var to look for native dependencies inside publish dir (or else it will throw an error)
if [ "${{ matrix.os }}" == "macos-latest" ]; then
export DYLD_FALLBACK_LIBRARY_PATH=$(dirname $dll_path)
fi
dotnet $dll_path --version
echo "Conversion ..."
dotnet $dll_path "$file" --imaging-set-information --image-processing --output $exmpl_path/"$bn".json
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/Release-Cyz2Json.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,6 @@ jobs:
publish_dir="Cyz2Json/bin/${{ steps.set-rid.outputs.rid }}/publish"
cp LICENSE.txt "$publish_dir/"

- name: Create symlink for OpenCvSharpExtern.dylib
if: matrix.os == 'macos-latest'
shell: bash
run: |
publish_dir="Cyz2Json/bin/${{ steps.set-rid.outputs.rid }}/publish"
cd $publish_dir/
# Create symlink to redirect calls to OpenCvSharpExtern.dylib to libOpenCvSharpExtern.dylib (the file actually created)
ln -sf libOpenCvSharpExtern.dylib OpenCvSharpExtern.dylib

- name: Create Release Archive
shell: pwsh
run: |
Expand Down
6 changes: 3 additions & 3 deletions Cyz2Json/Cyz2Json.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
<Version>1.0.6</Version>
<Version>1.0.7</Version>
<AssemblyInformationalVersion>$(InformationalVersion)</AssemblyInformationalVersion>
</PropertyGroup>

Expand All @@ -23,8 +23,8 @@
<PackageReference Include="OpenCvSharp4" Version="4.*" />
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.*" />
<PackageReference Include="OpenCvSharp4.official.runtime.linux-x64" Version="4.*" />
<PackageReference Include="OpenCvSharp4.runtime.osx.10.15-x64" Version="4.*" />
<PackageReference Include="OpenCvSharp4.runtime.osx_arm64" Version="4.*" />
<PackageReference Include="OpenCvSharp4.runtime.osx.x64" Version="4.*" />
<PackageReference Include="OpenCvSharp4.runtime.osx.arm64" Version="4.*" />
</ItemGroup>

<ItemGroup>
Expand Down