From 1a92c5a175d9a9154fdb3e7094cce940b8d9b157 Mon Sep 17 00:00:00 2001 From: Albert Ho Date: Mon, 16 Sep 2024 13:41:24 -0700 Subject: [PATCH 1/4] add support for .NET 8 --- .github/workflows/dotnet-codestyle.yml | 15 ++++++++++++-- .github/workflows/dotnet-demos.yml | 24 +++++++++++++++++++++-- .github/workflows/dotnet.yml | 15 +++++++++----- binding/dotnet/README.md | 2 +- binding/dotnet/Rhino/Rhino.csproj | 11 +++++++++-- binding/dotnet/RhinoTest/RhinoTest.csproj | 2 +- demo/dotnet/README.md | 2 +- demo/dotnet/RhinoDemo/RhinoDemo.csproj | 4 ++-- 8 files changed, 59 insertions(+), 16 deletions(-) diff --git a/.github/workflows/dotnet-codestyle.yml b/.github/workflows/dotnet-codestyle.yml index d5b11d165..6268ead14 100644 --- a/.github/workflows/dotnet-codestyle.yml +++ b/.github/workflows/dotnet-codestyle.yml @@ -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 diff --git a/.github/workflows/dotnet-demos.yml b/.github/workflows/dotnet-demos.yml index 195658df7..002ac4743 100644 --- a/.github/workflows/dotnet-demos.yml +++ b/.github/workflows/dotnet-demos.yml @@ -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 @@ -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 diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 72a30a464..d51161723 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -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 @@ -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 @@ -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 }} @@ -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 diff --git a/binding/dotnet/README.md b/binding/dotnet/README.md index 5e5f2f2c1..1ff1c6d9d 100644 --- a/binding/dotnet/README.md +++ b/binding/dotnet/README.md @@ -23,7 +23,7 @@ Rhino is: ## Requirements -- .NET 6.0 +- .NET 8.0 ## Compatibility diff --git a/binding/dotnet/Rhino/Rhino.csproj b/binding/dotnet/Rhino/Rhino.csproj index 8dabec86d..ef3a5cad0 100644 --- a/binding/dotnet/Rhino/Rhino.csproj +++ b/binding/dotnet/Rhino/Rhino.csproj @@ -1,8 +1,8 @@  - net6.0;netcoreapp3.0;netstandard2.0 - 3.0.3 + net8.0;net6.0;netcoreapp3.0;netstandard2.0 + 3.0.4 Picovoice Rhino Speech-to-Intent Engine @@ -43,6 +43,7 @@ build/netcoreapp3.0/Rhino.targets; build/net6.0/Rhino.targets; + build/net8.0/Rhino.targets; PreserveNewest @@ -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; PreserveNewest lib\windows\amd64\libpv_rhino.dll @@ -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; PreserveNewest lib\linux\x86_64\libpv_rhino.so @@ -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; PreserveNewest lib\mac\x86_64\libpv_rhino.dylib @@ -88,6 +92,7 @@ build/netcoreapp3.0/lib/raspberry-pi; build/net6.0/lib/raspberry-pi; + build/net8.0/lib/raspberry-pi; PreserveNewest lib\raspberry-pi\%(RecursiveDir)%(Filename)%(Extension) @@ -100,6 +105,7 @@ build/net6.0/lib/mac/arm64/libpv_rhino.dylib; + build/net8.0/lib/mac/arm64/libpv_rhino.dylib; PreserveNewest lib\mac\arm64\libpv_rhino.dylib @@ -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; lib\common\rhino_params.pv PreserveNewest diff --git a/binding/dotnet/RhinoTest/RhinoTest.csproj b/binding/dotnet/RhinoTest/RhinoTest.csproj index 50c31040f..7cde74099 100644 --- a/binding/dotnet/RhinoTest/RhinoTest.csproj +++ b/binding/dotnet/RhinoTest/RhinoTest.csproj @@ -1,7 +1,7 @@  - net6.0;net5.0;netcoreapp3.1;netcoreapp3.0;netcoreapp2.1; + net8.0;net6.0;net5.0;netcoreapp3.1;netcoreapp3.0;netcoreapp2.1; false diff --git a/demo/dotnet/README.md b/demo/dotnet/README.md index cdf3f9484..11d441d50 100644 --- a/demo/dotnet/README.md +++ b/demo/dotnet/README.md @@ -33,7 +33,7 @@ Rhino is: ## Requirements -- .NET 6.0 +- .NET 8.0 ## Compatibility diff --git a/demo/dotnet/RhinoDemo/RhinoDemo.csproj b/demo/dotnet/RhinoDemo/RhinoDemo.csproj index be478de80..43ee77e2c 100644 --- a/demo/dotnet/RhinoDemo/RhinoDemo.csproj +++ b/demo/dotnet/RhinoDemo/RhinoDemo.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 FileDemo.Debug;FileDemo.Release;MicDemo.Debug;MicDemo.Release @@ -20,6 +20,6 @@ - + From a738ebbb838197e40c7add501d5924b4389dd75e Mon Sep 17 00:00:00 2001 From: Albert Ho Date: Mon, 16 Sep 2024 14:02:29 -0700 Subject: [PATCH 2/4] bump pvrecorder --- demo/dotnet/RhinoDemo/RhinoDemo.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/dotnet/RhinoDemo/RhinoDemo.csproj b/demo/dotnet/RhinoDemo/RhinoDemo.csproj index 43ee77e2c..69678ee64 100644 --- a/demo/dotnet/RhinoDemo/RhinoDemo.csproj +++ b/demo/dotnet/RhinoDemo/RhinoDemo.csproj @@ -19,7 +19,7 @@ - + From c587866ccaae5fb017c5676ccc13e3cbe6ff31af Mon Sep 17 00:00:00 2001 From: Albert Ho Date: Tue, 17 Sep 2024 13:30:58 -0700 Subject: [PATCH 3/4] .NET release --- .github/workflows/dotnet-codestyle.yml | 11 ----------- .github/workflows/dotnet-demos.yml | 20 -------------------- 2 files changed, 31 deletions(-) diff --git a/.github/workflows/dotnet-codestyle.yml b/.github/workflows/dotnet-codestyle.yml index 6268ead14..eca240af5 100644 --- a/.github/workflows/dotnet-codestyle.yml +++ b/.github/workflows/dotnet-codestyle.yml @@ -31,17 +31,6 @@ jobs: 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 diff --git a/.github/workflows/dotnet-demos.yml b/.github/workflows/dotnet-demos.yml index 002ac4743..6fa287eda 100644 --- a/.github/workflows/dotnet-demos.yml +++ b/.github/workflows/dotnet-demos.yml @@ -42,16 +42,6 @@ jobs: with: 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 @@ -85,16 +75,6 @@ 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 From 4d65ede0d82b30b12a5903671284a587c4ff344f Mon Sep 17 00:00:00 2001 From: Albert Ho Date: Tue, 17 Sep 2024 13:49:16 -0700 Subject: [PATCH 4/4] spellcheck ignore .sum files (go) --- resources/.lint/spell-check/.cspell.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/.lint/spell-check/.cspell.json b/resources/.lint/spell-check/.cspell.json index 6c1e273af..a591509c2 100644 --- a/resources/.lint/spell-check/.cspell.json +++ b/resources/.lint/spell-check/.cspell.json @@ -33,8 +33,7 @@ "**/*.meta", "../../../binding/unity/Packages/**/*", "../../../binding/unity/ProjectSettings/**/*", - - + "**/*.csproj", "**/*.targets", @@ -69,6 +68,8 @@ "**/binding/react-native/test-app/**/*.xml", "**/binding/react-native/test-app/**/*.mm", + "**/*.sum", + "**/Cargo.toml" ] }