Skip to content

Commit

Permalink
add support for .NET 8 (#860)
Browse files Browse the repository at this point in the history
  • Loading branch information
albho authored Sep 18, 2024
1 parent 22aeecc commit f70010f
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/dotnet-codestyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Setup .NET 6.0
- name: Setup .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 --no-restore
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dotnet-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ jobs:
with:
submodules: recursive

- 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: Dotnet build micdemo
run: dotnet build -c MicDemo.Release -v n
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, macos-13, windows-latest]
dotnet-version: [2.1.x, 3.0.x, 3.1.x, 5.0.x, 6.0.x]
dotnet-version: [2.1.x, 3.0.x, 3.1.x, 5.0.x, 6.0.x, 8.0.x]
include:
- dotnet-version: 2.1.x
binding-framework: netstandard2.0
Expand All @@ -53,6 +53,9 @@ jobs:
- dotnet-version: 6.0.x
binding-framework: net6.0
test-framework: net6.0
- dotnet-version: 8.0.x
binding-framework: net8.0
test-framework: net8.0
- os: ubuntu-latest
nuget-path: ~/.nuget/NuGet/local-nuget
- os: macos-latest
Expand All @@ -68,8 +71,10 @@ jobs:
dotnet-version: 3.1.x
- os: macos-latest
dotnet-version: 5.0.x
- os: macos-13
- os: macos-latest
dotnet-version: 6.0.x
- os: macos-13
dotnet-version: 8.0.x

steps:
- name: Checkout repository and submodules
Expand Down Expand Up @@ -104,7 +109,7 @@ jobs:
submodules: recursive

- name: Build binding
run: dotnet build Picovoice/Picovoice.csproj --framework net6.0 -v n
run: dotnet build Picovoice/Picovoice.csproj --framework net8.0 -v n

- name: Test
run: dotnet test --framework net6.0 -v n
run: dotnet test --framework net8.0 -v n
6 changes: 3 additions & 3 deletions demo/dotnet/PicovoiceDemo/PicovoiceDemo.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Configurations>FileDemo.Debug;FileDemo.Release;MicDemo.Debug;MicDemo.Release</Configurations>
</PropertyGroup>

Expand All @@ -18,7 +18,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="PvRecorder" Version="1.2.5" />
<PackageReference Include="Picovoice" Version="3.0.3" />
<PackageReference Include="PvRecorder" Version="1.2.6" />
<PackageReference Include="Picovoice" Version="3.0.4" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion demo/dotnet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ similar to Alexa and Google. But it entirely runs 100% on-device. Picovoice is

## Requirements

- .NET 6.0
- .NET 8.0

## Compatibility

Expand Down
1 change: 1 addition & 0 deletions resources/.lint/spell-check/.cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"**/*.keystore",
"**/BUCK",
"**/build_defs.bzl",
"**/sdk/go/go.sum",
"**/sdk/react-native/test-app/**/*.xml",
"**/sdk/react-native/test-app/**/*.mm",
"**/Cargo.toml",
Expand Down
8 changes: 4 additions & 4 deletions sdk/dotnet/Picovoice/Picovoice.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<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>Picovoice End-to-End Platform</Product>
Expand Down Expand Up @@ -35,10 +35,10 @@
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Porcupine" Version="3.0.3">
<PackageReference Include="Porcupine" Version="3.0.4">
<PrivateAssets>analyzers</PrivateAssets>
</PackageReference>
<PackageReference Include="Rhino" Version="3.0.3">
<PackageReference Include="Rhino" Version="3.0.4">
<PrivateAssets>analyzers</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/PicovoiceTest/PicovoiceTest.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<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>

Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ similar to Alexa and Google. But it entirely runs 100% on-device. Picovoice is

## Requirements

- .NET 6.0
- .NET 8.0

## Compatibility

Expand Down

0 comments on commit f70010f

Please sign in to comment.