Refactor .Net example project (#1049)

Co-authored-by: 东风破 <birdfishs@163.com>
2024-06-24 10:10:13 +08:00
parent 6b7ced2317
commit 00de2bd00b
77 changed files with 526 additions and 651 deletions
--- a/.github/workflows/test-dot-net.yaml
+++ b/.github/workflows/test-dot-net.yaml
@@ -134,6 +134,7 @@ jobs:
      - name: Copy files
        shell: bash
        run: |
+          cp -v scripts/dotnet/examples/Common.csproj dotnet-examples/Common/
          cp -v scripts/dotnet/examples/offline-tts.csproj dotnet-examples/offline-tts/
          cp -v scripts/dotnet/examples/offline-decode-files.csproj dotnet-examples/offline-decode-files/
          cp -v scripts/dotnet/examples/online-decode-files.csproj dotnet-examples/online-decode-files/
--- a/dotnet-examples/.gitignore
+++ b/dotnet-examples/.gitignore
@@ -1,3 +1,6 @@
 bin
 obj
+v17
+.vs
 !*.sh
+*.vsidx
--- a/dotnet-examples/Common/Common.csproj
+++ b/dotnet-examples/Common/Common.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <RestoreSources>/tmp/packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="CommandLineParser" Version="2.9.1" />
+        <PackageReference Include="org.k2fsa.sherpa.onnx" Version="1.10.1" />
+    </ItemGroup>
+
+</Project>
--- a/dotnet-examples/online-decode-files/WaveReader.cs
+++ b/dotnet-examples/online-decode-files/WaveReader.cs
--- a/dotnet-examples/offline-decode-files/WaveReader.cs
+++ b/dotnet-examples/offline-decode-files/WaveReader.cs
@@ -1 +0,0 @@
-../online-decode-files/WaveReader.cs
--- a/dotnet-examples/offline-decode-files/offline-decode-files.csproj
+++ b/dotnet-examples/offline-decode-files/offline-decode-files.csproj
@@ -9,8 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="org.k2fsa.sherpa.onnx" Version="*" />
+    <ProjectReference Include="..\Common\Common.csproj" />
  </ItemGroup>

 </Project>
--- a/dotnet-examples/offline-punctuation/offline-punctuation.csproj
+++ b/dotnet-examples/offline-punctuation/offline-punctuation.csproj
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="org.k2fsa.sherpa.onnx" Version="*" />
+    <ProjectReference Include="..\Common\Common.csproj" />
  </ItemGroup>

 </Project>
--- a/dotnet-examples/offline-punctuation/run.sh
+++ b/dotnet-examples/offline-punctuation/run.sh
--- a/dotnet-examples/offline-tts-play/offline-tts-play.csproj
+++ b/dotnet-examples/offline-tts-play/offline-tts-play.csproj
@@ -9,9 +9,11 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="org.k2fsa.sherpa.onnx" Version="*" />
    <PackageReference Include="PortAudioSharp2" Version="*" />
  </ItemGroup>

+  <ItemGroup>
+    <ProjectReference Include="..\Common\Common.csproj" />
+  </ItemGroup>
+
 </Project>
--- a/dotnet-examples/offline-tts/offline-tts.csproj
+++ b/dotnet-examples/offline-tts/offline-tts.csproj
@@ -9,8 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="org.k2fsa.sherpa.onnx" Version="*" />
+    <ProjectReference Include="..\Common\Common.csproj" />
  </ItemGroup>

 </Project>
--- a/dotnet-examples/online-decode-files/online-decode-files.csproj
+++ b/dotnet-examples/online-decode-files/online-decode-files.csproj
@@ -9,8 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="org.k2fsa.sherpa.onnx" Version="*" />
+    <ProjectReference Include="..\Common\Common.csproj" />
  </ItemGroup>

 </Project>
--- a/dotnet-examples/sherpa-onnx.sln
+++ b/dotnet-examples/sherpa-onnx.sln
@@ -3,34 +3,33 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "online-decode-files", "online-decode-files\online-decode-files.csproj", "{45307474-BECB-4ABE-9388-D01D55A1A9BE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "online-decode-files", "online-decode-files\online-decode-files.csproj", "{45307474-BECB-4ABE-9388-D01D55A1A9BE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "offline-decode-files", "offline-decode-files\offline-decode-files.csproj", "{2DAB152C-9E24-47A0-9DB0-781297ECE458}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "offline-decode-files", "offline-decode-files\offline-decode-files.csproj", "{2DAB152C-9E24-47A0-9DB0-781297ECE458}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "speech-recognition-from-microphone", "speech-recognition-from-microphone\speech-recognition-from-microphone.csproj", "{FE4EA1FF-062A-46B3-B78D-C828FED7B82E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "speech-recognition-from-microphone", "speech-recognition-from-microphone\speech-recognition-from-microphone.csproj", "{FE4EA1FF-062A-46B3-B78D-C828FED7B82E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "offline-tts", "offline-tts\offline-tts.csproj", "{72196886-7143-4043-96E2-BCACEC6C79EB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "offline-tts", "offline-tts\offline-tts.csproj", "{72196886-7143-4043-96E2-BCACEC6C79EB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "offline-tts-play", "offline-tts-play\offline-tts-play.csproj", "{40781464-5948-462B-BA4B-98932711513F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "offline-tts-play", "offline-tts-play\offline-tts-play.csproj", "{40781464-5948-462B-BA4B-98932711513F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "spoken-language-identification", "spoken-language-identification\spoken-language-identification.csproj", "{3D7CF3D6-AC45-4D50-9619-5687B1443E94}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spoken-language-identification", "spoken-language-identification\spoken-language-identification.csproj", "{3D7CF3D6-AC45-4D50-9619-5687B1443E94}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "streaming-hlg-decoding", "streaming-hlg-decoding\streaming-hlg-decoding.csproj", "{C4A368A5-FCA0-419D-97C9-C8CE0B08EB99}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "streaming-hlg-decoding", "streaming-hlg-decoding\streaming-hlg-decoding.csproj", "{C4A368A5-FCA0-419D-97C9-C8CE0B08EB99}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "speaker-identification", "speaker-identification\speaker-identification.csproj", "{2B1B140E-A92F-426B-B0DF-5D916B67304F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "speaker-identification", "speaker-identification\speaker-identification.csproj", "{2B1B140E-A92F-426B-B0DF-5D916B67304F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "offline-punctuation", "offline-punctuation\offline-punctuation.csproj", "{42D85582-BB63-4259-A4EA-837D66AC078B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "offline-punctuation", "offline-punctuation\offline-punctuation.csproj", "{42D85582-BB63-4259-A4EA-837D66AC078B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vad-non-streaming-asr-paraformer", "vad-non-streaming-asr-paraformer\vad-non-streaming-asr-paraformer.csproj", "{8CD6B7E5-F59F-47B3-BB87-2B2E3678924D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vad-non-streaming-asr-paraformer", "vad-non-streaming-asr-paraformer\vad-non-streaming-asr-paraformer.csproj", "{8CD6B7E5-F59F-47B3-BB87-2B2E3678924D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Common\Common.csproj", "{401E963F-E25A-43CE-987D-8DB2D4715756}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{45307474-BECB-4ABE-9388-D01D55A1A9BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{45307474-BECB-4ABE-9388-D01D55A1A9BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -72,5 +71,15 @@ Global
 		{8CD6B7E5-F59F-47B3-BB87-2B2E3678924D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8CD6B7E5-F59F-47B3-BB87-2B2E3678924D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8CD6B7E5-F59F-47B3-BB87-2B2E3678924D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{401E963F-E25A-43CE-987D-8DB2D4715756}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{401E963F-E25A-43CE-987D-8DB2D4715756}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{401E963F-E25A-43CE-987D-8DB2D4715756}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{401E963F-E25A-43CE-987D-8DB2D4715756}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {07A6023C-0A37-4F82-A29F-896A3A338EAC}
 	EndGlobalSection
 EndGlobal
--- a/dotnet-examples/speaker-identification/WaveReader.cs
+++ b/dotnet-examples/speaker-identification/WaveReader.cs
@@ -1 +0,0 @@
-../offline-decode-files/WaveReader.cs
--- a/dotnet-examples/speaker-identification/speaker-identification.csproj
+++ b/dotnet-examples/speaker-identification/speaker-identification.csproj
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="org.k2fsa.sherpa.onnx" Version="*" />
+    <ProjectReference Include="..\Common\Common.csproj" />
  </ItemGroup>

 </Project>
--- a/dotnet-examples/speech-recognition-from-microphone/speech-recognition-from-microphone.csproj
+++ b/dotnet-examples/speech-recognition-from-microphone/speech-recognition-from-microphone.csproj
@@ -9,9 +9,11 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="org.k2fsa.sherpa.onnx" Version="*" />
    <PackageReference Include="PortAudioSharp2" Version="*" />
  </ItemGroup>

+  <ItemGroup>
+    <ProjectReference Include="..\Common\Common.csproj" />
+  </ItemGroup>
+
 </Project>
--- a/dotnet-examples/spoken-language-identification/WaveReader.cs
+++ b/dotnet-examples/spoken-language-identification/WaveReader.cs
@@ -1 +0,0 @@
-../offline-decode-files/WaveReader.cs
--- a/dotnet-examples/spoken-language-identification/spoken-language-identification.csproj
+++ b/dotnet-examples/spoken-language-identification/spoken-language-identification.csproj
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="org.k2fsa.sherpa.onnx" Version="*" />
+    <ProjectReference Include="..\Common\Common.csproj" />
  </ItemGroup>

 </Project>
--- a/dotnet-examples/streaming-hlg-decoding/WaveReader.cs
+++ b/dotnet-examples/streaming-hlg-decoding/WaveReader.cs
@@ -1 +0,0 @@
-../online-decode-files/WaveReader.cs
--- a/dotnet-examples/streaming-hlg-decoding/streaming-hlg-decoding.csproj
+++ b/dotnet-examples/streaming-hlg-decoding/streaming-hlg-decoding.csproj
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="org.k2fsa.sherpa.onnx" Version="*" />
+    <ProjectReference Include="..\Common\Common.csproj" />
  </ItemGroup>

 </Project>
--- a/dotnet-examples/vad-non-streaming-asr-paraformer/WaveReader.cs
+++ b/dotnet-examples/vad-non-streaming-asr-paraformer/WaveReader.cs
@@ -1 +0,0 @@
-../online-decode-files/WaveReader.cs
--- a/dotnet-examples/vad-non-streaming-asr-paraformer/run.sh
+++ b/dotnet-examples/vad-non-streaming-asr-paraformer/run.sh
--- a/dotnet-examples/vad-non-streaming-asr-paraformer/vad-non-streaming-asr-paraformer.csproj
+++ b/dotnet-examples/vad-non-streaming-asr-paraformer/vad-non-streaming-asr-paraformer.csproj
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="org.k2fsa.sherpa.onnx" Version="*" />
+    <ProjectReference Include="..\Common\Common.csproj" />
  </ItemGroup>

 </Project>
--- a/scripts/dotnet/CircularBuffer.cs
+++ b/scripts/dotnet/CircularBuffer.cs
@@ -1,10 +1,7 @@
-/// Copyright (c)  2024  Xiaomi Corporation (authors: Fangjun Kuang)
+/// Copyright (c)  2024  Xiaomi Corporation (authors: Fangjun Kuang)

-using System.Linq;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Text;
 using System;
+using System.Runtime.InteropServices;

 namespace SherpaOnnx
 {
--- a/scripts/dotnet/Dll.cs
+++ b/scripts/dotnet/Dll.cs
@@ -2,12 +2,6 @@
 /// Copyright (c)  2023 by manyeyes
 /// Copyright (c)  2024.5 by 东风破

-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System;
-
 namespace SherpaOnnx
 {
    internal static class Dll
--- a/scripts/dotnet/FeatureConfig.cs
+++ b/scripts/dotnet/FeatureConfig.cs
@@ -2,11 +2,7 @@
 /// Copyright (c)  2023 by manyeyes
 /// Copyright (c)  2024.5 by 东风破

-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
--- a/scripts/dotnet/OfflineLMConfig.cs
+++ b/scripts/dotnet/OfflineLMConfig.cs
@@ -1,13 +1,12 @@
+/// Copyright (c)  2023  Xiaomi Corporation (authors: Fangjun Kuang)
+/// Copyright (c)  2023 by manyeyes
 /// Copyright (c)  2024.5 by 东风破

-using System.Linq;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
+
    [StructLayout(LayoutKind.Sequential)]
    public struct OfflineLMConfig
    {
@@ -21,4 +20,5 @@ namespace SherpaOnnx

        public float Scale;
    }
+
 }
--- a/scripts/dotnet/OfflineModelConfig.cs
+++ b/scripts/dotnet/OfflineModelConfig.cs
@@ -1,13 +1,10 @@
 /// Copyright (c)  2024.5 by 东风破

-using System.Linq;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
+
    [StructLayout(LayoutKind.Sequential)]
    public struct OfflineModelConfig
    {
@@ -55,4 +52,6 @@ namespace SherpaOnnx
        [MarshalAs(UnmanagedType.LPStr)]
        public string TeleSpeechCtc;
    }
+
+
 }
--- a/scripts/dotnet/OfflineNemoEncDecCtcModelConfig.cs
+++ b/scripts/dotnet/OfflineNemoEncDecCtcModelConfig.cs
@@ -1,13 +1,12 @@
+/// Copyright (c)  2023  Xiaomi Corporation (authors: Fangjun Kuang)
+/// Copyright (c)  2023 by manyeyes
 /// Copyright (c)  2024.5 by 东风破

-using System.Linq;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
+
    [StructLayout(LayoutKind.Sequential)]
    public struct OfflineNemoEncDecCtcModelConfig
    {
--- a/scripts/dotnet/OfflineParaformerModelConfig.cs
+++ b/scripts/dotnet/OfflineParaformerModelConfig.cs
@@ -1,10 +1,6 @@
 /// Copyright (c)  2024.5 by 东风破

-using System.Linq;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
@@ -18,4 +14,5 @@ namespace SherpaOnnx
        [MarshalAs(UnmanagedType.LPStr)]
        public string Model;
    }
+
 }
--- a/scripts/dotnet/OfflinePunctuation.cs
+++ b/scripts/dotnet/OfflinePunctuation.cs
@@ -1,10 +1,8 @@
-/// Copyright (c)  2024  Xiaomi Corporation (authors: Fangjun Kuang)
-
-using System.Linq;
-using System.Collections.Generic;
+/// Copyright (c)  2024  Xiaomi Corporation (authors: Fangjun Kuang)
+using System;
 using System.Runtime.InteropServices;
 using System.Text;
-using System;
+

 namespace SherpaOnnx
 {
--- a/scripts/dotnet/OfflinePunctuationConfig.cs
+++ b/scripts/dotnet/OfflinePunctuationConfig.cs
@@ -1,10 +1,6 @@
 /// Copyright (c)  2024  Xiaomi Corporation (authors: Fangjun Kuang)

-using System.Linq;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
--- a/scripts/dotnet/OfflinePunctuationModelConfig.cs
+++ b/scripts/dotnet/OfflinePunctuationModelConfig.cs
@@ -1,10 +1,6 @@
 /// Copyright (c)  2024  Xiaomi Corporation (authors: Fangjun Kuang)

-using System.Linq;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
--- a/scripts/dotnet/OfflineRecognizer.cs
+++ b/scripts/dotnet/OfflineRecognizer.cs
@@ -1,10 +1,9 @@
-/// Copyright (c)  2024.5 by 东风破
+/// Copyright (c)  2024.5 by 东风破

-using System.Linq;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Text;
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;

 namespace SherpaOnnx
 {
@@ -72,4 +71,5 @@ namespace SherpaOnnx
        [DllImport(Dll.Filename, EntryPoint = "DecodeMultipleOfflineStreams")]
        private static extern void Decode(IntPtr handle, IntPtr[] streams, int n);
    }
+
 }
--- a/scripts/dotnet/OfflineRecognizerConfig.cs
+++ b/scripts/dotnet/OfflineRecognizerConfig.cs
@@ -1,13 +1,10 @@
 /// Copyright (c)  2024.5 by 东风破

-using System.Linq;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
+
    [StructLayout(LayoutKind.Sequential)]
    public struct OfflineRecognizerConfig
    {
@@ -44,4 +41,6 @@ namespace SherpaOnnx
        [MarshalAs(UnmanagedType.LPStr)]
        public string RuleFars;
    }
+
+
 }
--- a/scripts/dotnet/OfflineRecognizerResult.cs
+++ b/scripts/dotnet/OfflineRecognizerResult.cs
@@ -1,13 +1,12 @@
-/// Copyright (c)  2024.5 by 东风破
+/// Copyright (c)  2024.5 by 东风破

-using System.Linq;
-using System.Collections.Generic;
+using System;
 using System.Runtime.InteropServices;
 using System.Text;
-using System;

 namespace SherpaOnnx
 {
+
    public class OfflineRecognizerResult
    {
        public OfflineRecognizerResult(IntPtr handle)
@@ -43,4 +42,6 @@ namespace SherpaOnnx
        private String _text;
        public String Text => _text;
    }
+
+
 }
--- a/scripts/dotnet/OfflineStream.cs
+++ b/scripts/dotnet/OfflineStream.cs
@@ -1,13 +1,11 @@
-/// Copyright (c)  2024.5 by 东风破
+/// Copyright (c)  2024.5 by 东风破

-using System.Linq;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Text;
 using System;
+using System.Runtime.InteropServices;

 namespace SherpaOnnx
 {
+
    public class OfflineStream : IDisposable
    {
        public OfflineStream(IntPtr p)
@@ -67,4 +65,5 @@ namespace SherpaOnnx
        [DllImport(Dll.Filename, EntryPoint = "DestroyOfflineRecognizerResult")]
        private static extern void DestroyResult(IntPtr handle);
    }
+
 }
--- a/scripts/dotnet/OfflineTdnnModelConfig.cs
+++ b/scripts/dotnet/OfflineTdnnModelConfig.cs
@@ -1,10 +1,6 @@
 /// Copyright (c)  2024.5 by 东风破

-using System.Linq;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
@@ -18,4 +14,5 @@ namespace SherpaOnnx
        [MarshalAs(UnmanagedType.LPStr)]
        public string Model;
    }
+
 }
--- a/scripts/dotnet/OfflineTransducerModelConfig.cs
+++ b/scripts/dotnet/OfflineTransducerModelConfig.cs
@@ -1,10 +1,6 @@
 /// Copyright (c)  2024.5 by 东风破

-using System.Linq;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
@@ -26,4 +22,5 @@ namespace SherpaOnnx
        [MarshalAs(UnmanagedType.LPStr)]
        public string Joiner;
    }
+
 }
--- a/scripts/dotnet/OfflineTts.cs
+++ b/scripts/dotnet/OfflineTts.cs
@@ -1,10 +1,6 @@
-/// Copyright (c)  2024.5 by 东风破
-
-using System.Linq;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Text;
+/// Copyright (c)  2024.5 by 东风破
 using System;
+using System.Runtime.InteropServices;

 namespace SherpaOnnx
 {
--- a/scripts/dotnet/OfflineTtsConfig.cs
+++ b/scripts/dotnet/OfflineTtsConfig.cs
@@ -1,10 +1,6 @@
 /// Copyright (c)  2024.5 by 东风破

-using System.Linq;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
@@ -28,4 +24,5 @@ namespace SherpaOnnx
        [MarshalAs(UnmanagedType.LPStr)]
        public string RuleFars;
    }
+
 }
--- a/scripts/dotnet/OfflineTtsGeneratedAudio.cs
+++ b/scripts/dotnet/OfflineTtsGeneratedAudio.cs
@@ -1,10 +1,6 @@
-/// Copyright (c)  2024.5 by 东风破
-
-using System.Linq;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Text;
+/// Copyright (c)  2024.5 by 东风破
 using System;
+using System.Runtime.InteropServices;

 namespace SherpaOnnx
 {
--- a/scripts/dotnet/OfflineTtsModelConfig.cs
+++ b/scripts/dotnet/OfflineTtsModelConfig.cs
@@ -1,13 +1,10 @@
 /// Copyright (c)  2024.5 by 东风破

-using System.Linq;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
+
    [StructLayout(LayoutKind.Sequential)]
    public struct OfflineTtsModelConfig
    {
--- a/scripts/dotnet/OfflineTtsVitsModelConfig.cs
+++ b/scripts/dotnet/OfflineTtsVitsModelConfig.cs
@@ -1,10 +1,6 @@
 /// Copyright (c)  2024.5 by 东风破

-using System.Linq;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
--- a/scripts/dotnet/OfflineWhisperModelConfig.cs
+++ b/scripts/dotnet/OfflineWhisperModelConfig.cs
@@ -1,10 +1,6 @@
 /// Copyright (c)  2024.5 by 东风破

-using System.Linq;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
@@ -33,4 +29,5 @@ namespace SherpaOnnx

        public int TailPaddings;
    }
+
 }
--- a/scripts/dotnet/OnlineCtcFstDecoderConfig.cs
+++ b/scripts/dotnet/OnlineCtcFstDecoderConfig.cs
@@ -2,11 +2,7 @@
 /// Copyright (c)  2023 by manyeyes
 /// Copyright (c)  2024.5 by 东风破

-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
@@ -24,4 +20,5 @@ namespace SherpaOnnx

        public int MaxActive;
    }
+
 }
--- a/scripts/dotnet/OnlineModelConfig.cs
+++ b/scripts/dotnet/OnlineModelConfig.cs
@@ -2,14 +2,11 @@
 /// Copyright (c)  2023 by manyeyes
 /// Copyright (c)  2024.5 by 东风破

-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
+
    [StructLayout(LayoutKind.Sequential)]
    public struct OnlineModelConfig
    {
@@ -52,4 +49,5 @@ namespace SherpaOnnx
        [MarshalAs(UnmanagedType.LPStr)]
        public string BpeVocab;
    }
+
 }
--- a/scripts/dotnet/OnlineParaformerModelConfig.cs
+++ b/scripts/dotnet/OnlineParaformerModelConfig.cs
@@ -2,14 +2,11 @@
 /// Copyright (c)  2023 by manyeyes
 /// Copyright (c)  2024.5 by 东风破

-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
+
    [StructLayout(LayoutKind.Sequential)]
    public struct OnlineParaformerModelConfig
    {
@@ -25,4 +22,5 @@ namespace SherpaOnnx
        [MarshalAs(UnmanagedType.LPStr)]
        public string Decoder;
    }
+
 }
--- a/scripts/dotnet/OnlineRecognizer.cs
+++ b/scripts/dotnet/OnlineRecognizer.cs
@@ -1,12 +1,10 @@
-/// Copyright (c)  2023  Xiaomi Corporation (authors: Fangjun Kuang)
+/// Copyright (c)  2023  Xiaomi Corporation (authors: Fangjun Kuang)
 /// Copyright (c)  2023 by manyeyes
 /// Copyright (c)  2024.5 by 东风破
-
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
--- a/scripts/dotnet/OnlineRecognizerConfig.cs
+++ b/scripts/dotnet/OnlineRecognizerConfig.cs
@@ -2,14 +2,11 @@
 /// Copyright (c)  2023 by manyeyes
 /// Copyright (c)  2024.5 by 东风破

-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
+
    [StructLayout(LayoutKind.Sequential)]
    public struct OnlineRecognizerConfig
    {
@@ -73,4 +70,5 @@ namespace SherpaOnnx
        [MarshalAs(UnmanagedType.LPStr)]
        public string RuleFars;
    }
+
 }
--- a/scripts/dotnet/OnlineRecognizerResult.cs
+++ b/scripts/dotnet/OnlineRecognizerResult.cs
@@ -1,15 +1,13 @@
-/// Copyright (c)  2023  Xiaomi Corporation (authors: Fangjun Kuang)
+/// Copyright (c)  2023  Xiaomi Corporation (authors: Fangjun Kuang)
 /// Copyright (c)  2023 by manyeyes
 /// Copyright (c)  2024.5 by 东风破
-
-using System.Collections.Generic;
-using System.Linq;
+using System;
 using System.Runtime.InteropServices;
 using System.Text;
-using System;

 namespace SherpaOnnx
 {
+
    public class OnlineRecognizerResult
    {
        public OnlineRecognizerResult(IntPtr handle)
--- a/scripts/dotnet/OnlineStream.cs
+++ b/scripts/dotnet/OnlineStream.cs
@@ -1,15 +1,12 @@
-/// Copyright (c)  2023  Xiaomi Corporation (authors: Fangjun Kuang)
+/// Copyright (c)  2023  Xiaomi Corporation (authors: Fangjun Kuang)
 /// Copyright (c)  2023 by manyeyes
 /// Copyright (c)  2024.5 by 东风破
-
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
 using System;
+using System.Runtime.InteropServices;

 namespace SherpaOnnx
 {
+
    public class OnlineStream : IDisposable
    {
        public OnlineStream(IntPtr p)
@@ -60,4 +57,5 @@ namespace SherpaOnnx
        [DllImport(Dll.Filename)]
        private static extern void InputFinished(IntPtr handle);
    }
+
 }
--- a/scripts/dotnet/OnlineTransducerModelConfig.cs
+++ b/scripts/dotnet/OnlineTransducerModelConfig.cs
@@ -2,14 +2,11 @@
 /// Copyright (c)  2023 by manyeyes
 /// Copyright (c)  2024.5 by 东风破

-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
+
    [StructLayout(LayoutKind.Sequential)]
    public struct OnlineTransducerModelConfig
    {
@@ -29,4 +26,5 @@ namespace SherpaOnnx
        [MarshalAs(UnmanagedType.LPStr)]
        public string Joiner;
    }
+
 }
--- a/scripts/dotnet/OnlineZipformer2CtcModelConfig.cs
+++ b/scripts/dotnet/OnlineZipformer2CtcModelConfig.cs
@@ -2,11 +2,7 @@
 /// Copyright (c)  2023 by manyeyes
 /// Copyright (c)  2024.5 by 东风破

-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
--- a/scripts/dotnet/SileroVadModelConfig.cs
+++ b/scripts/dotnet/SileroVadModelConfig.cs
@@ -1,10 +1,6 @@
 /// Copyright (c)  2024  Xiaomi Corporation (authors: Fangjun Kuang)

-using System.Linq;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
--- a/scripts/dotnet/SpeakerEmbeddingExtractor.cs
+++ b/scripts/dotnet/SpeakerEmbeddingExtractor.cs
@@ -1,10 +1,6 @@
-/// Copyright (c)  2024.5 by 东风破
-
-using System.Linq;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Text;
+/// Copyright (c)  2024.5 by 东风破
 using System;
+using System.Runtime.InteropServices;

 namespace SherpaOnnx
 {
--- a/scripts/dotnet/SpeakerEmbeddingExtractorConfig.cs
+++ b/scripts/dotnet/SpeakerEmbeddingExtractorConfig.cs
@@ -1,10 +1,6 @@
 /// Copyright (c)  2024.5 by 东风破

-using System.Linq;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
--- a/scripts/dotnet/SpeakerEmbeddingManager.cs
+++ b/scripts/dotnet/SpeakerEmbeddingManager.cs
@@ -1,10 +1,8 @@
-/// Copyright (c)  2024.5 by 东风破
-
-using System.Linq;
+/// Copyright (c)  2024.5 by 东风破
+using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
-using System;

 namespace SherpaOnnx
 {
--- a/scripts/dotnet/SpeechSegment.cs
+++ b/scripts/dotnet/SpeechSegment.cs
@@ -1,10 +1,6 @@
-/// Copyright (c)  2024  Xiaomi Corporation (authors: Fangjun Kuang)
-
-using System.Linq;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Text;
+/// Copyright (c)  2024  Xiaomi Corporation (authors: Fangjun Kuang)
 using System;
+using System.Runtime.InteropServices;

 namespace SherpaOnnx
 {
--- a/scripts/dotnet/SpokenLanguageIdentification.cs
+++ b/scripts/dotnet/SpokenLanguageIdentification.cs
@@ -1,10 +1,6 @@
-/// Copyright (c)  2024.5 by 东风破
-
-using System.Linq;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Text;
+/// Copyright (c)  2024.5 by 东风破
 using System;
+using System.Runtime.InteropServices;

 namespace SherpaOnnx
 {
--- a/scripts/dotnet/SpokenLanguageIdentificationConfig.cs
+++ b/scripts/dotnet/SpokenLanguageIdentificationConfig.cs
@@ -1,10 +1,6 @@
 /// Copyright (c)  2024.5 by 东风破

-using System.Linq;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
--- a/scripts/dotnet/SpokenLanguageIdentificationResult.cs
+++ b/scripts/dotnet/SpokenLanguageIdentificationResult.cs
@@ -1,10 +1,7 @@
-/// Copyright (c)  2024.5 by 东风破
-
-using System.Linq;
-using System.Collections.Generic;
+/// Copyright (c)  2024.5 by 东风破
+using System;
 using System.Runtime.InteropServices;
 using System.Text;
-using System;

 namespace SherpaOnnx
 {
--- a/scripts/dotnet/SpokenLanguageIdentificationWhisperConfig.cs
+++ b/scripts/dotnet/SpokenLanguageIdentificationWhisperConfig.cs
@@ -1,10 +1,6 @@
 /// Copyright (c)  2024.5 by 东风破

-using System.Linq;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
--- a/scripts/dotnet/VadModelConfig.cs
+++ b/scripts/dotnet/VadModelConfig.cs
@@ -1,10 +1,6 @@
 /// Copyright (c)  2024  Xiaomi Corporation (authors: Fangjun Kuang)

-using System.Linq;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
-using System;

 namespace SherpaOnnx
 {
--- a/scripts/dotnet/VoiceActivityDetector.cs
+++ b/scripts/dotnet/VoiceActivityDetector.cs
@@ -1,10 +1,6 @@
-/// Copyright (c)  2024  Xiaomi Corporation (authors: Fangjun Kuang)
-
-using System.Linq;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Text;
+/// Copyright (c)  2024  Xiaomi Corporation (authors: Fangjun Kuang)
 using System;
+using System.Runtime.InteropServices;

 namespace SherpaOnnx
 {
@@ -112,4 +108,3 @@ namespace SherpaOnnx

    }
 }
-
--- a/scripts/dotnet/examples/Common.csproj
+++ b/scripts/dotnet/examples/Common.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>.net6</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
+    <PackageReference Include="org.k2fsa.sherpa.onnx" Version="1.10.1" />
+  </ItemGroup>
+
+</Project>
--- a/scripts/dotnet/examples/offline-decode-files.csproj
+++ b/scripts/dotnet/examples/offline-decode-files.csproj
@@ -8,13 +8,8 @@
    <Nullable>enable</Nullable>
  </PropertyGroup>

-  <PropertyGroup>
-    <RestoreSources>/tmp/packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
  <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="org.k2fsa.sherpa.onnx" Version="*" />
+    <ProjectReference Include="..\Common\Common.csproj" />
  </ItemGroup>

 </Project>
--- a/scripts/dotnet/examples/offline-punctuation.csproj
+++ b/scripts/dotnet/examples/offline-punctuation.csproj
@@ -8,12 +8,8 @@
    <Nullable>enable</Nullable>
  </PropertyGroup>

-  <PropertyGroup>
-    <RestoreSources>/tmp/packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
  <ItemGroup>
-    <PackageReference Include="org.k2fsa.sherpa.onnx" Version="*" />
+    <ProjectReference Include="..\Common\Common.csproj" />
  </ItemGroup>

 </Project>
--- a/scripts/dotnet/examples/offline-tts-play.csproj
+++ b/scripts/dotnet/examples/offline-tts-play.csproj
@@ -8,14 +8,12 @@
    <Nullable>enable</Nullable>
  </PropertyGroup>

-  <PropertyGroup>
-    <RestoreSources>/tmp/packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
  <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="org.k2fsa.sherpa.onnx" Version="*" />
    <PackageReference Include="PortAudioSharp2" Version="*" />
  </ItemGroup>

+  <ItemGroup>
+    <ProjectReference Include="..\Common\Common.csproj" />
+  </ItemGroup>
+
 </Project>
--- a/scripts/dotnet/examples/offline-tts.csproj
+++ b/scripts/dotnet/examples/offline-tts.csproj
@@ -8,13 +8,8 @@
    <Nullable>enable</Nullable>
  </PropertyGroup>

-  <PropertyGroup>
-    <RestoreSources>/tmp/packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
  <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="org.k2fsa.sherpa.onnx" Version="*" />
+    <ProjectReference Include="..\Common\Common.csproj" />
  </ItemGroup>

 </Project>
--- a/scripts/dotnet/examples/online-decode-files.csproj
+++ b/scripts/dotnet/examples/online-decode-files.csproj
@@ -8,14 +8,8 @@
    <Nullable>enable</Nullable>
  </PropertyGroup>

-
-  <PropertyGroup>
-    <RestoreSources>/tmp/packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
  <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="org.k2fsa.sherpa.onnx" Version="*" />
+    <ProjectReference Include="..\Common\Common.csproj" />
  </ItemGroup>

 </Project>
--- a/scripts/dotnet/examples/speaker-identification.csproj
+++ b/scripts/dotnet/examples/speaker-identification.csproj
@@ -8,12 +8,8 @@
    <Nullable>enable</Nullable>
  </PropertyGroup>

-  <PropertyGroup>
-    <RestoreSources>/tmp/packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
  <ItemGroup>
-    <PackageReference Include="org.k2fsa.sherpa.onnx" Version="*" />
+    <ProjectReference Include="..\Common\Common.csproj" />
  </ItemGroup>

 </Project>
--- a/scripts/dotnet/examples/speech-recognition-from-microphone.csproj
+++ b/scripts/dotnet/examples/speech-recognition-from-microphone.csproj
@@ -8,14 +8,12 @@
    <Nullable>enable</Nullable>
  </PropertyGroup>

-  <PropertyGroup>
-    <RestoreSources>/tmp/packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
  <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="org.k2fsa.sherpa.onnx" Version="*" />
    <PackageReference Include="PortAudioSharp2" Version="*" />
  </ItemGroup>

+  <ItemGroup>
+    <ProjectReference Include="..\Common\Common.csproj" />
+  </ItemGroup>
+
 </Project>
--- a/scripts/dotnet/examples/spoken-language-identification.csproj
+++ b/scripts/dotnet/examples/spoken-language-identification.csproj
@@ -8,12 +8,8 @@
    <Nullable>enable</Nullable>
  </PropertyGroup>

-  <PropertyGroup>
-    <RestoreSources>/tmp/packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
  <ItemGroup>
-    <PackageReference Include="org.k2fsa.sherpa.onnx" Version="*" />
+    <ProjectReference Include="..\Common\Common.csproj" />
  </ItemGroup>

 </Project>
--- a/scripts/dotnet/examples/streaming-hlg-decoding.csproj
+++ b/scripts/dotnet/examples/streaming-hlg-decoding.csproj
@@ -8,12 +8,8 @@
    <Nullable>enable</Nullable>
  </PropertyGroup>

-  <PropertyGroup>
-    <RestoreSources>/tmp/packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
  <ItemGroup>
-    <PackageReference Include="org.k2fsa.sherpa.onnx" Version="*" />
+    <ProjectReference Include="..\Common\Common.csproj" />
  </ItemGroup>

 </Project>
--- a/scripts/dotnet/examples/vad-non-streaming-asr-paraformer.csproj
+++ b/scripts/dotnet/examples/vad-non-streaming-asr-paraformer.csproj
@@ -8,12 +8,8 @@
    <Nullable>enable</Nullable>
  </PropertyGroup>

-  <PropertyGroup>
-    <RestoreSources>/tmp/packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-  </PropertyGroup>
-
  <ItemGroup>
-    <PackageReference Include="org.k2fsa.sherpa.onnx" Version="*" />
+    <ProjectReference Include="..\Common\Common.csproj" />
  </ItemGroup>

 </Project>