Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add support for .NET 8 #732

Merged
merged 4 commits into from
Sep 17, 2024
Merged

add support for .NET 8 #732

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a92c5a
add support for .NET 8
albho Sep 16, 2024
a738ebb
bump pvrecorder
albho Sep 16, 2024
c587866
.NET release
albho Sep 17, 2024
4d65ede
spellcheck ignore .sum files (go)
albho Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions .github/workflows/dotnet-codestyle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,26 @@ 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
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
continue-on-error: true
run: dotnet add package -s ../../../binding/dotnet/Rhino/bin/Release Rhino
working-directory: demo/dotnet/RhinoDemo
# ********************************************************

- name: Run Demo Codestyle
run: dotnet format --verify-no-changes
working-directory: demo/dotnet
24 changes: 22 additions & 2 deletions .github/workflows/dotnet-demos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,20 @@ 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

# ************** 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/Rhino/bin/Release Rhino
# ********************************************************

- name: Package restore
run: dotnet restore
Expand Down Expand Up @@ -75,6 +85,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/Rhino/bin/Release Rhino
# ********************************************************

- name: Package restore
run: dotnet restore

Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,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 @@ -67,6 +67,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
exclude:
- os: macos-latest
dotnet-version: 2.1.x
Expand All @@ -76,13 +79,15 @@ 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:
- uses: actions/checkout@v3

- name: Setup .NET 6.0
- name: Setup .NET 8.0
uses: actions/setup-dotnet@v3
with:
dotnet-version: ${{ matrix.dotnet-version }}
Expand All @@ -106,7 +111,7 @@ jobs:
- uses: actions/checkout@v3

- name: Build binding
run: dotnet build Rhino/Rhino.csproj --framework net6.0
run: dotnet build Rhino/Rhino.csproj --framework net8.0

- name: Test
run: dotnet test --framework net6.0 -v n
run: dotnet test --framework net8.0 -v n
2 changes: 1 addition & 1 deletion binding/dotnet/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Rhino is:

## Requirements

- .NET 6.0
- .NET 8.0

## Compatibility

Expand Down
11 changes: 9 additions & 2 deletions binding/dotnet/Rhino/Rhino.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>Rhino Speech-to-Intent Engine</Product>
Expand Down Expand Up @@ -43,6 +43,7 @@
<PackagePath>
build/netcoreapp3.0/Rhino.targets;
build/net6.0/Rhino.targets;
build/net8.0/Rhino.targets;
</PackagePath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand All @@ -55,6 +56,7 @@
build/netstandard2.0/libpv_rhino.dll;
build/netcoreapp3.0/lib/windows/amd64/libpv_rhino.dll;
build/net6.0/lib/windows/amd64/libpv_rhino.dll;
build/net8.0/lib/windows/amd64/libpv_rhino.dll;
</PackagePath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>lib\windows\amd64\libpv_rhino.dll</Link>
Expand All @@ -65,6 +67,7 @@
build/netstandard2.0/libpv_rhino.so;
build/netcoreapp3.0/lib/linux/x86_64/libpv_rhino.so;
build/net6.0/lib/linux/x86_64/libpv_rhino.so;
build/net8.0/lib/linux/x86_64/libpv_rhino.so;
</PackagePath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>lib\linux\x86_64\libpv_rhino.so</Link>
Expand All @@ -75,6 +78,7 @@
build/netstandard2.0/libpv_rhino.dylib;
build/netcoreapp3.0/lib/mac/x86_64/libpv_rhino.dylib;
build/net6.0/lib/mac/x86_64/libpv_rhino.dylib;
build/net8.0/lib/mac/x86_64/libpv_rhino.dylib;
</PackagePath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>lib\mac\x86_64\libpv_rhino.dylib</Link>
Expand All @@ -88,6 +92,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>
Expand All @@ -100,6 +105,7 @@
<Content Include="..\..\..\lib\mac\arm64\libpv_rhino.dylib">
<PackagePath>
build/net6.0/lib/mac/arm64/libpv_rhino.dylib;
build/net8.0/lib/mac/arm64/libpv_rhino.dylib;
</PackagePath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>lib\mac\arm64\libpv_rhino.dylib</Link>
Expand All @@ -114,6 +120,7 @@
build/netstandard2.0/lib/common/rhino_params.pv;
build/netcoreapp3.0/lib/common/rhino_params.pv;
build/net6.0/lib/common/rhino_params.pv;
build/net8.0/lib/common/rhino_params.pv;
</PackagePath>
<Link>lib\common\rhino_params.pv</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
2 changes: 1 addition & 1 deletion binding/dotnet/RhinoTest/RhinoTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion demo/dotnet/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Rhino is:

## Requirements

- .NET 6.0
- .NET 8.0

## Compatibility

Expand Down
6 changes: 3 additions & 3 deletions demo/dotnet/RhinoDemo/RhinoDemo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

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

<ItemGroup>
<PackageReference Include="PvRecorder" Version="1.2.5" />
<PackageReference Include="Rhino" Version="3.0.3" />
<PackageReference Include="PvRecorder" Version="1.2.6" />
<PackageReference Include="Rhino" Version="3.0.4" />
</ItemGroup>
</Project>
Loading