update version

ksgfk · Feb 19, 2024 · 5fd541a · 5fd541a
1 parent 063cc4e
commit 5fd541a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 28 deletions.
diff --git 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
@@ -11,17 +11,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
 
-    <PackageReference Include="embree-win-x64" Version="4.3.0" />
-    <PackageReference Include="embree-linux-x64" Version="4.3.0" />
-    <PackageReference Include="embree-osx-x64" Version="4.3.0-fix" />
+    <PackageReference Include="embree-win-x64" Version="4.3.1" />
+    <PackageReference Include="embree-linux-x64" Version="4.3.1" />
+    <PackageReference Include="embree-osx-x64" Version="4.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/EmbreeSharp/EmbreeSharp.csproj b/EmbreeSharp/EmbreeSharp.csproj
@@ -12,13 +12,13 @@
     <Description>Embree C# Low-level binding</Description>
     <Company>ksgfk</Company>
     <Authors>ksgfk</Authors>
-    <Copyright>Copyright (c) 2023 ksgfk</Copyright>
+    <Copyright>Copyright (c) 2024 ksgfk</Copyright>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <RepositoryUrl>https://github.com/ksgfk/EmbreeSharp</RepositoryUrl>
     <PackageTags>embree;wrapper</PackageTags>
     <PackageReleaseNotes>rewrite</PackageReleaseNotes>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Version>0.4.0</Version>
+    <Version>0.4.1</Version>
 
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <DebugType>embedded</DebugType>
@@ -40,7 +40,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git 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