From 5fd541a3a80138d85dd93b9a4843434da7ea5985 Mon Sep 17 00:00:00 2001
From: ksgfk <1537100607@qq.com>
Date: Mon, 19 Feb 2024 11:16:57 +0800
Subject: [PATCH] update version
---
.github/workflows/test.yml | 20 +-------------------
EmbreeSharp.Test/EmbreeSharp.Test.csproj | 12 ++++++------
EmbreeSharp/EmbreeSharp.csproj | 6 +++---
EmbreeSharp/Native/GlobalFunctions.cs | 1 +
4 files changed, 11 insertions(+), 28 deletions(-)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2a9eff0..a6494f8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
test:
strategy:
matrix:
- os: [windows-latest, ubuntu-latest]
+ os: [windows-latest, ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
@@ -22,21 +22,3 @@ jobs:
run: dotnet build --configuration Release --no-restore
- name: Test
run: dotnet test --no-restore
- test-osx-x64:
- runs-on: macos-latest
- steps:
- - name: Install tbb
- run: |
- brew update
- brew install tbb
- - uses: actions/checkout@v3
- - name: Setup .NET
- uses: actions/setup-dotnet@v3
- with:
- dotnet-version: 8.x
- - name: Install dependencies
- run: dotnet restore
- - name: Build
- run: dotnet build --configuration Release --no-restore
- - name: Test
- run: dotnet test --no-restore
diff --git a/EmbreeSharp.Test/EmbreeSharp.Test.csproj b/EmbreeSharp.Test/EmbreeSharp.Test.csproj
index f3cfd2f..c06d7ac 100644
--- a/EmbreeSharp.Test/EmbreeSharp.Test.csproj
+++ b/EmbreeSharp.Test/EmbreeSharp.Test.csproj
@@ -11,17 +11,17 @@
-
-
-
+
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
-
-
+
+
+
diff --git a/EmbreeSharp/EmbreeSharp.csproj b/EmbreeSharp/EmbreeSharp.csproj
index 26ce7a7..83d2332 100644
--- a/EmbreeSharp/EmbreeSharp.csproj
+++ b/EmbreeSharp/EmbreeSharp.csproj
@@ -12,13 +12,13 @@
Embree C# Low-level binding
ksgfk
ksgfk
- Copyright (c) 2023 ksgfk
+ Copyright (c) 2024 ksgfk
README.md
https://github.com/ksgfk/EmbreeSharp
embree;wrapper
rewrite
MIT
- 0.4.0
+ 0.4.1
true
embedded
@@ -40,7 +40,7 @@
-
+
diff --git a/EmbreeSharp/Native/GlobalFunctions.cs b/EmbreeSharp/Native/GlobalFunctions.cs
index 50cb525..3dee0aa 100644
--- a/EmbreeSharp/Native/GlobalFunctions.cs
+++ b/EmbreeSharp/Native/GlobalFunctions.cs
@@ -38,6 +38,7 @@ static GlobalFunctions()
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
var nativeDir = Path.Combine(dir, "runtimes", $"osx-{GetRid()}", "native");
+ target = NativeLibrary.Load(Path.Combine(nativeDir, "libtbb.dylib"), assembly, searchPath);
target = NativeLibrary.Load(Path.Combine(nativeDir, "libembree4.dylib"), assembly, searchPath);
}
else