Merge branch 'main' of github.com:Yellow-Dog-Man/Compressonator.NET

Yellow-Dog-Man · Feb 6, 2025 · 994fbfd · 994fbfd
2 parents aae45bd + 6d21414
commit 994fbfd
Show file tree

Hide file tree

Showing 19 changed files with 63 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,10 +14,21 @@ on:
 
 jobs:
   build:
-    runs-on: windows-latest
+    name: build-and-test-${{matrix.os}}
+    runs-on: ${{ matrix.os }}
+    env:
+      BUILD_RUNTIME: ${{ matrix.os == 'ubuntu-latest' && 'linux-x64' || 'windows-x64' }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
     steps:
     - uses: actions/checkout@v4
+    - uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 9.x
     - name: Install dependencies
       run: dotnet restore
     - name: Build
       run: dotnet build --configuration Release --no-restore
+    - name: Test
+      run: dotnet test --no-restore --configuration Release
diff --git a/Compressonator.NET.Samples/Compressonator.NET.Samples.csproj b/Compressonator.NET.Samples/Compressonator.NET.Samples.csproj
@@ -2,11 +2,10 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Compressonator.NET.Tests/Compressonator.NET.Tests.csproj b/Compressonator.NET.Tests/Compressonator.NET.Tests.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="MSTest" Version="3.6.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Compressonator.NET\Compressonator.NET.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
+  </ItemGroup>
+
+</Project>
diff --git a/Compressonator.NET.Tests/MSTestSettings.cs b/Compressonator.NET.Tests/MSTestSettings.cs
@@ -0,0 +1 @@
+[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
diff --git a/Compressonator.NET.Tests/NativeTests.cs b/Compressonator.NET.Tests/NativeTests.cs
@@ -0,0 +1,17 @@
+namespace Compressonator.NET.Tests;
+
+[TestClass]
+public sealed class NativeTests
+{
+    [TestMethod]
+    public void TestSDKNative()
+    {
+        Assert.IsTrue(SDK_NativeMethods.IsSupported, "SDK Native methods should be supported");
+    }
+
+    [TestMethod]
+    public void TestFrameworkNative()
+    {
+        Assert.IsTrue(FrameworkNativeMethods.IsSupported, "Framework Native Methods should be supported.");
+    }
+}
diff --git a/Compressonator.NET.sln b/Compressonator.NET.sln
@@ -7,6 +7,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compressonator.NET", "Compr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compressonator.NET.Samples", "Compressonator.NET.Samples\Compressonator.NET.Samples.csproj", "{A6A2F93F-7A66-4792-A4C2-2913C7071B24}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compressonator.NET.Tests", "Compressonator.NET.Tests\Compressonator.NET.Tests.csproj", "{5C813410-F2AB-4948-909A-463E308E4D23}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,6 +23,10 @@ Global
 		{A6A2F93F-7A66-4792-A4C2-2913C7071B24}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A6A2F93F-7A66-4792-A4C2-2913C7071B24}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A6A2F93F-7A66-4792-A4C2-2913C7071B24}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5C813410-F2AB-4948-909A-463E308E4D23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C813410-F2AB-4948-909A-463E308E4D23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5C813410-F2AB-4948-909A-463E308E4D23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5C813410-F2AB-4948-909A-463E308E4D23}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Compressonator.NET/Compressonator.NET.csproj b/Compressonator.NET/Compressonator.NET.csproj
@@ -21,9 +21,6 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-
-    <!--Default runtime identifier-->
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
   </PropertyGroup>
 
   <ItemGroup>
@@ -32,7 +29,7 @@
   </ItemGroup>
 
   <!-- WINDOWS -->
-  <ItemGroup Condition="'$(RuntimeIdentifier)' == 'win-x64'">
+  <ItemGroup>
     <ContentWithTargetPath Include="Native\win-x64\*.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToPublishDirectory>Always</CopyToPublishDirectory>
@@ -41,11 +38,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="Native\win-x64\*.dll" Pack="True" PackagePath="runtimes\win-x64\native\"></None>
+    <None Include="Native\win-x64\*.dll" Pack="True" PackagePath="runtimes\win-x64\native\" ></None>
   </ItemGroup>
 
   <!-- LINUX -->
-  <ItemGroup Condition="'$(RuntimeIdentifier)' == 'linux-x64'">
+  <ItemGroup>
     <ContentWithTargetPath Include="Native\linux-x64\*.so">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToPublishDirectory>Always</CopyToPublishDirectory>

diff --git a/Compressonator.NET/Native/linux-x64/libCMP_Common.so b/Compressonator.NET/Native/linux-x64/libCMP_Common.so
diff --git a/Compressonator.NET/Native/linux-x64/libCMP_Compressonator.so b/Compressonator.NET/Native/linux-x64/libCMP_Compressonator.so
diff --git a/Compressonator.NET/Native/linux-x64/libCMP_Core.so b/Compressonator.NET/Native/linux-x64/libCMP_Core.so
diff --git a/Compressonator.NET/Native/linux-x64/libCMP_Core_AVX.so b/Compressonator.NET/Native/linux-x64/libCMP_Core_AVX.so
diff --git a/Compressonator.NET/Native/linux-x64/libCMP_Core_AVX512.so b/Compressonator.NET/Native/linux-x64/libCMP_Core_AVX512.so
diff --git a/Compressonator.NET/Native/linux-x64/libCMP_Core_SSE.so b/Compressonator.NET/Native/linux-x64/libCMP_Core_SSE.so
diff --git a/Compressonator.NET/Native/linux-x64/libCMP_Framework.so b/Compressonator.NET/Native/linux-x64/libCMP_Framework.so
diff --git a/Compressonator.NET/Native/linux-x64/libCMP_GpuDecode.so b/Compressonator.NET/Native/linux-x64/libCMP_GpuDecode.so
diff --git a/Compressonator.NET/Native/linux-x64/libImage_DDS.so b/Compressonator.NET/Native/linux-x64/libImage_DDS.so
diff --git a/Compressonator.NET/Native/linux-x64/libImage_EXR.so b/Compressonator.NET/Native/linux-x64/libImage_EXR.so
diff --git a/Compressonator.NET/Native/linux-x64/libImage_KTX.so b/Compressonator.NET/Native/linux-x64/libImage_KTX.so
diff --git a/Compressonator.NET/Native/linux-x64/libImage_TGA.so b/Compressonator.NET/Native/linux-x64/libImage_TGA.so
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]