add support for .NET 8

Picovoice · Sep 11, 2024 · 8320dba · 8320dba
1 parent 0e0b1f6
commit 8320dba
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 17 deletions.
diff --git a/.github/workflows/dotnet-codestyle.yml b/.github/workflows/dotnet-codestyle.yml
@@ -24,15 +24,25 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up .NET 6.0
+    - name: Set up .NET 8.0
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
 
     - name: Run Binding Codestyle
       run: dotnet format --verify-no-changes
       working-directory: binding/dotnet
 
+      # ************** REMOVE AFTER RELEASE ********************
+    - name: Pack .NET SDK
+      run: dotnet pack -c Release
+      working-directory: binding/dotnet
+
+    - name: Add local NuGet package file
+      run: dotnet add package -s ../../../binding/dotnet/Porcupine/bin/Release Porcupine
+      working-directory: demo/dotnet/PorcupineDemo
+      # ********************************************************
+
     - name: Run Demo Codestyle
       run: dotnet format --verify-no-changes
       working-directory: demo/dotnet

diff --git a/.github/workflows/dotnet-demos.yml b/.github/workflows/dotnet-demos.yml
@@ -34,10 +34,20 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up .NET 6.0
+    - name: Set up .NET 8.0
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
+
+      # ************** REMOVE AFTER RELEASE ********************
+    - name: Pack .NET SDK
+      run: dotnet pack -c Release
+      working-directory: binding/dotnet
+
+    - name: Add local NuGet package file
+      continue-on-error: true
+      run: dotnet add package -s ../../../binding/dotnet/Porcupine/bin/Release Porcupine
+      # ********************************************************
 
     - name: Package restore
       run: dotnet restore
@@ -61,6 +71,16 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
+      # ************** REMOVE AFTER RELEASE ********************
+    - name: Pack .NET SDK
+      run: dotnet pack -c Release
+      working-directory: binding/dotnet
+
+    - name: Add local NuGet package file
+      continue-on-error: true
+      run: dotnet add package -s ../../../binding/dotnet/Porcupine/bin/Release Porcupine
+      # ********************************************************
+
     - name: Package restore
       run: dotnet restore
 
@@ -86,10 +106,20 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up .NET 6.0
+    - name: Set up .NET 8.0
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
+
+      # ************** REMOVE AFTER RELEASE ********************
+    - name: Pack .NET SDK
+      run: dotnet pack -c Release
+      working-directory: binding/dotnet
+
+    - name: Add local NuGet package file
+      continue-on-error: true
+      run: dotnet add package -s ../../../binding/dotnet/Porcupine/bin/Release Porcupine
+      # ********************************************************
 
     - name: Package restore
       run: dotnet restore

diff --git a/binding/dotnet/Porcupine/Porcupine.csproj b/binding/dotnet/Porcupine/Porcupine.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;netcoreapp3.0;netstandard2.0</TargetFrameworks>
-        <Version>3.0.3</Version>
+        <TargetFrameworks>net8.0;net6.0;netcoreapp3.0;netstandard2.0</TargetFrameworks>
+        <Version>3.0.4</Version>
         <Authors>Picovoice</Authors>
         <Company />
         <Product>Porcupine Wake Word Engine</Product>
@@ -39,6 +39,7 @@
             <PackagePath>
                 build/netcoreapp3.0/Porcupine.targets;
                 build/net6.0/Porcupine.targets;
+                build/net8.0/Porcupine.targets;
             </PackagePath>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
@@ -51,6 +52,7 @@
                 build/netstandard2.0/libpv_porcupine.dll;
                 build/netcoreapp3.0/lib/windows/amd64/libpv_porcupine.dll;
                 build/net6.0/lib/windows/amd64/libpv_porcupine.dll;
+                build/net8.0/lib/windows/amd64/libpv_porcupine.dll;
             </PackagePath>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <Link>lib\windows\amd64\libpv_porcupine.dll</Link>
@@ -61,6 +63,7 @@
                 build/netstandard2.0/libpv_porcupine.so;
                 build/netcoreapp3.0/lib/linux/x86_64/libpv_porcupine.so;
                 build/net6.0/lib/linux/x86_64/libpv_porcupine.so;
+                build/net8.0/lib/linux/x86_64/libpv_porcupine.so;
             </PackagePath>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <Link>lib\linux\x86_64\libpv_porcupine.so</Link>
@@ -71,6 +74,7 @@
                 build/netstandard2.0/libpv_porcupine.dylib;
                 build/netcoreapp3.0/lib/mac/x86_64/libpv_porcupine.dylib;
                 build/net6.0/lib/mac/x86_64/libpv_porcupine.dylib;
+                build/net8.0/lib/mac/x86_64/libpv_porcupine.dylib;
             </PackagePath>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <Link>lib\mac\x86_64\libpv_porcupine.dylib</Link>
@@ -84,6 +88,7 @@
             <PackagePath>
                 build/netcoreapp3.0/lib/raspberry-pi;
                 build/net6.0/lib/raspberry-pi;
+                build/net8.0/lib/raspberry-pi;
             </PackagePath>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <Link>lib\raspberry-pi\%(RecursiveDir)%(Filename)%(Extension)</Link>
@@ -96,6 +101,7 @@
         <Content Include="..\..\..\lib\mac\arm64\libpv_porcupine.dylib">
             <PackagePath>
                 build/net6.0/lib/mac/arm64/libpv_porcupine.dylib;
+                build/net8.0/lib/mac/arm64/libpv_porcupine.dylib;
             </PackagePath>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <Link>lib\mac\arm64\libpv_porcupine.dylib</Link>
@@ -123,6 +129,7 @@
                 build/netstandard2.0/resources/keyword_files/windows;
                 build/netcoreapp3.0/resources/keyword_files/windows;
                 build/net6.0/resources/keyword_files/windows;
+                build/net8.0/resources/keyword_files/windows;
             </PackagePath>
             <Link>resources\keyword_files\windows\%(Filename)%(Extension)</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -145,6 +152,7 @@
                 build/netstandard2.0/resources/keyword_files/mac;
                 build/netcoreapp3.0/resources/keyword_files/mac;
                 build/net6.0/resources/keyword_files/mac;
+                build/net8.0/resources/keyword_files/mac;
             </PackagePath>
             <Link>resources\keyword_files\mac\%(Filename)%(Extension)</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -167,6 +175,7 @@
                 build/netstandard2.0/resources/keyword_files/linux;
                 build/netcoreapp3.0/resources/keyword_files/linux;
                 build/net6.0/resources/keyword_files/linux;
+                build/net8.0/resources/keyword_files/linux;
             </PackagePath>
             <Link>resources\keyword_files\linux\%(Filename)%(Extension)</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -189,6 +198,7 @@
                 build/netstandard2.0/resources/keyword_files/raspberry-pi;
                 build/netcoreapp3.0/resources/keyword_files/raspberry-pi;
                 build/net6.0/resources/keyword_files/raspberry-pi;
+                build/net8.0/resources/keyword_files/raspberry-pi;
             </PackagePath>
             <Link>resources\keyword_files\raspberry-pi\%(Filename)%(Extension)</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -198,6 +208,7 @@
                 build/netstandard2.0/lib/common/porcupine_params.pv;
                 build/netcoreapp3.0/lib/common/porcupine_params.pv;
                 build/net6.0/lib/common/porcupine_params.pv;
+                build/net8.0/lib/common/porcupine_params.pv;
             </PackagePath>
             <Link>lib\common\porcupine_params.pv</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/binding/dotnet/Porcupine/Utils.cs b/binding/dotnet/Porcupine/Utils.cs
@@ -88,10 +88,8 @@ public static string PvLinuxMachine()
             switch (cpuPart)
             {
                 case "0xd03": return "cortex-a53" + archInfo;
-                case "0xd07": return "cortex-a57" + archInfo;
                 case "0xd08": return "cortex-a72" + archInfo;
                 case "0xd0b": return "cortex-a76" + archInfo;
-                case "0xc08": return "";
                 default:
                     throw new PlatformNotSupportedException($"This device (CPU part = {cpuPart}) is not supported by Picovoice.");
             }

diff --git a/binding/dotnet/PorcupineTest/PorcupineTest.csproj b/binding/dotnet/PorcupineTest/PorcupineTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp3.0;netcoreapp2.1;</TargetFrameworks>
+        <TargetFrameworks>net8.0;net6.0;net5.0;netcoreapp3.1;netcoreapp3.0;netcoreapp2.1;</TargetFrameworks>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 

diff --git a/binding/dotnet/README.md b/binding/dotnet/README.md
@@ -16,7 +16,7 @@ Porcupine is:
 
 ## Requirements
 
-- .NET 6.0
+- .NET 8.0
 
 ## Compatibility
 

diff --git a/demo/dotnet-vui/AvaloniaVUI/AvaloniaVUI.csproj b/demo/dotnet-vui/AvaloniaVUI/AvaloniaVUI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <AvaloniaResource Include="Assets\**" />
@@ -17,6 +17,6 @@
     <PackageReference Include="Avalonia.Desktop" Version="0.9.12" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="0.9.12" />
     <PackageReference Include="PvRecorder" Version="1.2.5" />
-    <PackageReference Include="Porcupine" Version="3.0.3" />
+    <PackageReference Include="Porcupine" Version="3.0.4" />
   </ItemGroup>
 </Project>
diff --git a/demo/dotnet/PorcupineDemo/PorcupineDemo.csproj b/demo/dotnet/PorcupineDemo/PorcupineDemo.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Configurations>FileDemo.Debug;FileDemo.Release;MicDemo.Debug;MicDemo.Release</Configurations>
     </PropertyGroup>
 
@@ -19,7 +19,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Porcupine" Version="3.0.3" />
+        <PackageReference Include="Porcupine" Version="3.0.4" />
         <PackageReference Include="PvRecorder" Version="1.2.5" />
     </ItemGroup>
 </Project>
diff --git a/demo/dotnet/README.md b/demo/dotnet/README.md
@@ -18,7 +18,7 @@ Porcupine is:
 
 ## Requirements
 
-- .NET 6.0
+- .NET 8.0
 
 ## Compatibility