diff --git a/.github/workflows/Check-Cyz2Json.yml b/.github/workflows/Check-Cyz2Json.yml index 6e71745..0436611 100644 --- a/.github/workflows/Check-Cyz2Json.yml +++ b/.github/workflows/Check-Cyz2Json.yml @@ -77,16 +77,6 @@ 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: | @@ -94,10 +84,6 @@ jobs: 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 diff --git a/.github/workflows/Release-Cyz2Json.yml b/.github/workflows/Release-Cyz2Json.yml index e42fff3..52a6dea 100644 --- a/.github/workflows/Release-Cyz2Json.yml +++ b/.github/workflows/Release-Cyz2Json.yml @@ -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: | diff --git a/Cyz2Json/Cyz2Json.csproj b/Cyz2Json/Cyz2Json.csproj index cb91d25..9f1e0b2 100644 --- a/Cyz2Json/Cyz2Json.csproj +++ b/Cyz2Json/Cyz2Json.csproj @@ -13,7 +13,7 @@ enable enable true - 1.0.6 + 1.0.7 $(InformationalVersion) @@ -23,8 +23,8 @@ - - + +