From feb2b57b01fc93ea8313d4816ac961fce5043399 Mon Sep 17 00:00:00 2001
From: Ian Lavery <ian@picovoice.ai>
Date: Tue, 22 Aug 2023 17:20:28 -0700
Subject: [PATCH] .NET 2.1 testing fix (#1078)

---
 .github/workflows/dotnet.yml                  | 10 ++--
 binding/dotnet/PorcupineTest/MainTest.cs      |  1 -
 .../dotnet/PorcupineTest/PorcupineTest.csproj | 57 ++++++++++++-------
 3 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index df1c8988c5..cb4a193283 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -58,11 +58,11 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        dotnet-version: [2.0.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]
         include:
-          - dotnet-version: 2.0.x
+          - dotnet-version: 2.1.x
             binding-framework: netstandard2.0
-            test-framework: netcoreapp2.0
+            test-framework: netcoreapp2.1
           - dotnet-version: 3.0.x
             binding-framework: netcoreapp3.0
             test-framework: netcoreapp3.0
@@ -88,7 +88,7 @@ jobs:
       run: dotnet build Porcupine/Porcupine.csproj --framework ${{ matrix.binding-framework }}
 
     - name: Test
-      run: dotnet test --framework ${{ matrix.test-framework }} -v d
+      run: dotnet test --framework ${{ matrix.test-framework }} -v n
 
   build-self-hosted:
     runs-on: ${{ matrix.machine }}
@@ -106,4 +106,4 @@ jobs:
       run: dotnet build Porcupine/Porcupine.csproj --framework net6.0
 
     - name: Test
-      run: dotnet test --framework net6.0 -v d
+      run: dotnet test --framework net6.0 -v n
diff --git a/binding/dotnet/PorcupineTest/MainTest.cs b/binding/dotnet/PorcupineTest/MainTest.cs
index cb7cf7ab48..3b6f718410 100644
--- a/binding/dotnet/PorcupineTest/MainTest.cs
+++ b/binding/dotnet/PorcupineTest/MainTest.cs
@@ -18,7 +18,6 @@ specific language governing permissions and limitations under the License.
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 using Pv;
diff --git a/binding/dotnet/PorcupineTest/PorcupineTest.csproj b/binding/dotnet/PorcupineTest/PorcupineTest.csproj
index 93545c57ec..54c3549913 100644
--- a/binding/dotnet/PorcupineTest/PorcupineTest.csproj
+++ b/binding/dotnet/PorcupineTest/PorcupineTest.csproj
@@ -1,25 +1,42 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp3.0;netcoreapp2.0;</TargetFrameworks>
-    <IsPackable>false</IsPackable>    
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp3.0;netcoreapp2.1;</TargetFrameworks>
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
-    <PackageReference Include="coverlet.collector" Version="1.2.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+        <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
+        <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
+        <PackageReference Include="coverlet.collector" Version="3.1.2" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Porcupine\Porcupine.csproj" />
-  </ItemGroup>
-	<ItemGroup>
-		<Content Include="..\..\..\resources\audio_samples\*">
-			<Link>resources\audio_samples\%(Filename)%(Extension)</Link>
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Porcupine\Porcupine.csproj" />
+    </ItemGroup>
+    <ItemGroup>
+        <Content Include="..\..\..\resources\audio_samples\*">
+            <Link>resources\audio_samples\%(Filename)%(Extension)</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+    </ItemGroup>
+    <ItemGroup>
+        <Content Include="..\..\..\lib\windows\amd64\libpv_porcupine.dll">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Link>libpv_porcupine.dll</Link>
+            <Visible>false</Visible>
+        </Content>
+        <Content Include="..\..\..\lib\linux\x86_64\libpv_porcupine.so">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Link>libpv_porcupine.so</Link>
+            <Visible>false</Visible>
+        </Content>
+        <Content Include="..\..\..\lib\mac\x86_64\libpv_porcupine.dylib">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Link>libpv_porcupine.dylib</Link>
+            <Visible>false</Visible>
+        </Content>
+    </ItemGroup>
 </Project>