Fix #3540: Move to NAudio 2.0.0 dep

mozilla · Mar 3, 2021 · c60edc5 · c60edc5
1 parent 8c8b80d
commit c60edc5
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/native_client/dotnet/DeepSpeechConsole/DeepSpeechConsole.csproj b/native_client/dotnet/DeepSpeechConsole/DeepSpeechConsole.csproj
@@ -35,8 +35,8 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NAudio, Version=1.8.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NAudio.1.8.5\lib\net35\NAudio.dll</HintPath>
+    <Reference Include="NAudio, Version=2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NAudio.2.0.0\lib\netstandard2.0\NAudio.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -67,4 +67,4 @@
     </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
diff --git a/native_client/dotnet/DeepSpeechConsole/packages.config b/native_client/dotnet/DeepSpeechConsole/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NAudio" version="1.8.5" targetFramework="net462" />
-</packages>
+  <package id="NAudio" version="2.0.0" targetFramework="net462" />
+</packages>
diff --git a/native_client/dotnet/DeepSpeechWPF/DeepSpeech.WPF.csproj b/native_client/dotnet/DeepSpeechWPF/DeepSpeech.WPF.csproj
@@ -61,8 +61,8 @@
     <Reference Include="GalaSoft.MvvmLight.Platform, Version=5.4.1.0, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
       <HintPath>packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
     </Reference>
-    <Reference Include="NAudio, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\NAudio.1.9.0\lib\net35\NAudio.dll</HintPath>
+    <Reference Include="NAudio, Version=2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\NAudio.2.0.0\lib\netstandard2.0\NAudio.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

diff --git a/native_client/dotnet/DeepSpeechWPF/packages.config b/native_client/dotnet/DeepSpeechWPF/packages.config
@@ -5,5 +5,5 @@
   <package id="CommonServiceLocator" version="2.0.2" targetFramework="net462" />
   <package id="CSCore" version="1.2.1.2" targetFramework="net462" />
   <package id="MvvmLightLibs" version="5.4.1.1" targetFramework="net462" />
-  <package id="NAudio" version="1.9.0" targetFramework="net462" />
-</packages>
+  <package id="NAudio" version="2.0.0" targetFramework="net462" />
+</packages>
diff --git a/taskcluster/tc-build-utils.sh b/taskcluster/tc-build-utils.sh
@@ -244,6 +244,8 @@ do_deepspeech_netframework_build()
   # Setup dependencies
   nuget restore DeepSpeech.sln
 
+  find . | grep NAudio
+
   MSBUILD="$(cygpath 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe')"
 
   # We need MSYS2_ARG_CONV_EXCL='/' otherwise the '/' of CLI parameters gets mangled and disappears

diff --git a/taskcluster/tc-dotnet-utils.sh b/taskcluster/tc-dotnet-utils.sh
@@ -34,8 +34,8 @@ install_nuget()
 
   ls -halR "${PROJECT_NAME}.${DS_VERSION}"
 
-  nuget install NAudio -Version 1.10.0
-  cp NAudio*/lib/net35/NAudio.dll ${TASKCLUSTER_TMP_DIR}/ds/
+  nuget install NAudio -Version 2.0.0
+  cp NAudio*/lib/netstandard2.0/NAudio.dll ${TASKCLUSTER_TMP_DIR}/ds/
   cp ${PROJECT_NAME}.${DS_VERSION}/build/libdeepspeech.so ${TASKCLUSTER_TMP_DIR}/ds/
   cp ${PROJECT_NAME}.${DS_VERSION}/lib/net46/DeepSpeechClient.dll ${TASKCLUSTER_TMP_DIR}/ds/