Skip to content
This repository was archived by the owner on Jun 19, 2025. It is now read-only.

Commit 56bc5cc

Browse files
author
Alexandre Lissy
committed
Fix #3540: Move to NAudio 2.0.0 dep
1 parent 2bb42d4 commit 56bc5cc

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

native_client/dotnet/DeepSpeechConsole/DeepSpeechConsole.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="NAudio, Version=1.8.5.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\NAudio.1.8.5\lib\net35\NAudio.dll</HintPath>
38+
<Reference Include="NAudio, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\NAudio.2.0.0\lib\netstandard2.0\NAudio.dll</HintPath>
4040
</Reference>
4141
<Reference Include="System" />
4242
<Reference Include="System.Core" />
@@ -67,4 +67,4 @@
6767
</Content>
6868
</ItemGroup>
6969
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
70-
</Project>
70+
</Project>

native_client/dotnet/DeepSpeechConsole/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ static void Main(string[] args)
8181
}
8282

8383
string audioFile = audio ?? "arctic_a0024.wav";
84-
var waveBuffer = new WaveBuffer(File.ReadAllBytes(audioFile));
85-
using (var waveInfo = new WaveFileReader(audioFile))
84+
var waveBuffer = new NAudio.Wave.WaveBuffer(File.ReadAllBytes(audioFile));
85+
using (var waveInfo = new NAudio.Wave.WaveFileReader(audioFile))
8686
{
8787
Console.WriteLine("Running inference....");
8888

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NAudio" version="1.8.5" targetFramework="net462" />
4-
</packages>
3+
<package id="NAudio" version="2.0.0" targetFramework="net462" />
4+
</packages>

native_client/dotnet/DeepSpeechWPF/DeepSpeech.WPF.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<Reference Include="GalaSoft.MvvmLight.Platform, Version=5.4.1.0, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
6262
<HintPath>packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
6363
</Reference>
64-
<Reference Include="NAudio, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
65-
<HintPath>packages\NAudio.1.9.0\lib\net35\NAudio.dll</HintPath>
64+
<Reference Include="NAudio, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
65+
<HintPath>packages\NAudio.2.0.0\lib\netstandard2.0\NAudio.dll</HintPath>
6666
</Reference>
6767
<Reference Include="System" />
6868
<Reference Include="System.Data" />

native_client/dotnet/DeepSpeechWPF/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
<package id="CommonServiceLocator" version="2.0.2" targetFramework="net462" />
66
<package id="CSCore" version="1.2.1.2" targetFramework="net462" />
77
<package id="MvvmLightLibs" version="5.4.1.1" targetFramework="net462" />
8-
<package id="NAudio" version="1.9.0" targetFramework="net462" />
9-
</packages>
8+
<package id="NAudio" version="2.0.0" targetFramework="net462" />
9+
</packages>

taskcluster/tc-dotnet-utils.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ install_nuget()
3434

3535
ls -halR "${PROJECT_NAME}.${DS_VERSION}"
3636

37-
nuget install NAudio -Version 1.10.0
38-
cp NAudio*/lib/net35/NAudio.dll ${TASKCLUSTER_TMP_DIR}/ds/
37+
nuget install NAudio -Version 2.0.0
38+
cp NAudio*/lib/netstandard2.0/NAudio.dll ${TASKCLUSTER_TMP_DIR}/ds/
3939
cp ${PROJECT_NAME}.${DS_VERSION}/build/libdeepspeech.so ${TASKCLUSTER_TMP_DIR}/ds/
4040
cp ${PROJECT_NAME}.${DS_VERSION}/lib/net46/DeepSpeechClient.dll ${TASKCLUSTER_TMP_DIR}/ds/
4141

0 commit comments

Comments
 (0)