From c55143d282388a6719d7817580b462705755116c Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Fri, 31 Jul 2020 16:54:46 +0200 Subject: [PATCH] Fix #3198: Do not rely on examples repo for building .Net --- native_client/dotnet/DeepSpeechWPF/.gitignore | 330 ++++++++++++++ native_client/dotnet/DeepSpeechWPF/App.config | 6 + native_client/dotnet/DeepSpeechWPF/App.xaml | 8 + .../dotnet/DeepSpeechWPF/App.xaml.cs | 42 ++ .../DeepSpeechWPF/DeepSpeech.WPF.csproj | 140 ++++++ .../dotnet/DeepSpeechWPF/DeepSpeech.WPF.sln | 31 ++ .../dotnet/DeepSpeechWPF/MainWindow.xaml | 102 +++++ .../dotnet/DeepSpeechWPF/MainWindow.xaml.cs | 17 + .../DeepSpeechWPF/Properties/AssemblyInfo.cs | 55 +++ .../Properties/Resources.Designer.cs | 63 +++ .../DeepSpeechWPF/Properties/Resources.resx | 117 +++++ .../Properties/Settings.Designer.cs | 26 ++ .../Properties/Settings.settings | 7 + .../DeepSpeechWPF/ViewModels/BindableBase.cs | 49 ++ .../ViewModels/MainWindowViewModel.cs | 425 ++++++++++++++++++ .../dotnet/DeepSpeechWPF/packages.config | 9 + taskcluster/tc-build-utils.sh | 4 +- taskcluster/win-build.sh | 2 +- 18 files changed, 1430 insertions(+), 3 deletions(-) create mode 100644 native_client/dotnet/DeepSpeechWPF/.gitignore create mode 100644 native_client/dotnet/DeepSpeechWPF/App.config create mode 100644 native_client/dotnet/DeepSpeechWPF/App.xaml create mode 100644 native_client/dotnet/DeepSpeechWPF/App.xaml.cs create mode 100644 native_client/dotnet/DeepSpeechWPF/DeepSpeech.WPF.csproj create mode 100644 native_client/dotnet/DeepSpeechWPF/DeepSpeech.WPF.sln create mode 100644 native_client/dotnet/DeepSpeechWPF/MainWindow.xaml create mode 100644 native_client/dotnet/DeepSpeechWPF/MainWindow.xaml.cs create mode 100644 native_client/dotnet/DeepSpeechWPF/Properties/AssemblyInfo.cs create mode 100644 native_client/dotnet/DeepSpeechWPF/Properties/Resources.Designer.cs create mode 100644 native_client/dotnet/DeepSpeechWPF/Properties/Resources.resx create mode 100644 native_client/dotnet/DeepSpeechWPF/Properties/Settings.Designer.cs create mode 100644 native_client/dotnet/DeepSpeechWPF/Properties/Settings.settings create mode 100644 native_client/dotnet/DeepSpeechWPF/ViewModels/BindableBase.cs create mode 100644 native_client/dotnet/DeepSpeechWPF/ViewModels/MainWindowViewModel.cs create mode 100644 native_client/dotnet/DeepSpeechWPF/packages.config diff --git a/native_client/dotnet/DeepSpeechWPF/.gitignore b/native_client/dotnet/DeepSpeechWPF/.gitignore new file mode 100644 index 00000000..3e759b75 --- /dev/null +++ b/native_client/dotnet/DeepSpeechWPF/.gitignore @@ -0,0 +1,330 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ +**/Properties/launchSettings.json + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ diff --git a/native_client/dotnet/DeepSpeechWPF/App.config b/native_client/dotnet/DeepSpeechWPF/App.config new file mode 100644 index 00000000..b50c74f3 --- /dev/null +++ b/native_client/dotnet/DeepSpeechWPF/App.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/native_client/dotnet/DeepSpeechWPF/App.xaml b/native_client/dotnet/DeepSpeechWPF/App.xaml new file mode 100644 index 00000000..16ebb0d4 --- /dev/null +++ b/native_client/dotnet/DeepSpeechWPF/App.xaml @@ -0,0 +1,8 @@ + + + diff --git a/native_client/dotnet/DeepSpeechWPF/App.xaml.cs b/native_client/dotnet/DeepSpeechWPF/App.xaml.cs new file mode 100644 index 00000000..d4b87d6e --- /dev/null +++ b/native_client/dotnet/DeepSpeechWPF/App.xaml.cs @@ -0,0 +1,42 @@ +using CommonServiceLocator; +using DeepSpeech.WPF.ViewModels; +using DeepSpeechClient.Interfaces; +using GalaSoft.MvvmLight.Ioc; +using System.Windows; + +namespace DeepSpeechWPF +{ + /// + /// Interaction logic for App.xaml + /// + public partial class App : Application + { + protected override void OnStartup(StartupEventArgs e) + { + base.OnStartup(e); + ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default); + + try + { + //Register instance of DeepSpeech + DeepSpeechClient.DeepSpeech deepSpeechClient = + new DeepSpeechClient.DeepSpeech("deepspeech-0.8.0-models.pbmm"); + + SimpleIoc.Default.Register(() => deepSpeechClient); + SimpleIoc.Default.Register(); + } + catch (System.Exception ex) + { + MessageBox.Show(ex.Message); + Current.Shutdown(); + } + } + + protected override void OnExit(ExitEventArgs e) + { + base.OnExit(e); + //Dispose instance of DeepSpeech + ServiceLocator.Current.GetInstance()?.Dispose(); + } + } +} diff --git a/native_client/dotnet/DeepSpeechWPF/DeepSpeech.WPF.csproj b/native_client/dotnet/DeepSpeechWPF/DeepSpeech.WPF.csproj new file mode 100644 index 00000000..7f46a31e --- /dev/null +++ b/native_client/dotnet/DeepSpeechWPF/DeepSpeech.WPF.csproj @@ -0,0 +1,140 @@ + + + + + Debug + AnyCPU + {54BFD766-4305-4F4C-BA59-AF45505DF3C1} + WinExe + DeepSpeech.WPF + DeepSpeech.WPF + v4.6.2 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + true + true + + + + + true + bin\x64\Debug\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + true + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + true + true + + + + packages\AsyncAwaitBestPractices.3.1.0\lib\netstandard1.0\AsyncAwaitBestPractices.dll + + + packages\AsyncAwaitBestPractices.MVVM.3.1.0\lib\netstandard1.0\AsyncAwaitBestPractices.MVVM.dll + + + packages\CommonServiceLocator.2.0.2\lib\net45\CommonServiceLocator.dll + + + packages\CSCore.1.2.1.2\lib\net35-client\CSCore.dll + + + packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll + + + packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll + + + packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll + + + packages\NAudio.1.9.0\lib\net35\NAudio.dll + + + + + + packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll + + + + + + + + + 4.0 + + + + + + + + MSBuild:Compile + Designer + + + + MSBuild:Compile + Designer + + + App.xaml + Code + + + + MainWindow.xaml + Code + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + + + {56de4091-bbbe-47e4-852d-7268b33b971f} + DeepSpeechClient + + + + diff --git a/native_client/dotnet/DeepSpeechWPF/DeepSpeech.WPF.sln b/native_client/dotnet/DeepSpeechWPF/DeepSpeech.WPF.sln new file mode 100644 index 00000000..cd29025e --- /dev/null +++ b/native_client/dotnet/DeepSpeechWPF/DeepSpeech.WPF.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.421 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeepSpeech.WPF", "DeepSpeech.WPF.csproj", "{54BFD766-4305-4F4C-BA59-AF45505DF3C1}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeepSpeechClient", "..\DeepSpeechClient\DeepSpeechClient.csproj", "{56DE4091-BBBE-47E4-852D-7268B33B971F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {54BFD766-4305-4F4C-BA59-AF45505DF3C1}.Debug|x64.ActiveCfg = Debug|x64 + {54BFD766-4305-4F4C-BA59-AF45505DF3C1}.Debug|x64.Build.0 = Debug|x64 + {54BFD766-4305-4F4C-BA59-AF45505DF3C1}.Release|x64.ActiveCfg = Release|x64 + {54BFD766-4305-4F4C-BA59-AF45505DF3C1}.Release|x64.Build.0 = Release|x64 + {56DE4091-BBBE-47E4-852D-7268B33B971F}.Debug|x64.ActiveCfg = Debug|x64 + {56DE4091-BBBE-47E4-852D-7268B33B971F}.Debug|x64.Build.0 = Debug|x64 + {56DE4091-BBBE-47E4-852D-7268B33B971F}.Release|x64.ActiveCfg = Release|x64 + {56DE4091-BBBE-47E4-852D-7268B33B971F}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {19C58802-CCEC-4FD1-8D17-A6EB766116F7} + EndGlobalSection +EndGlobal diff --git a/native_client/dotnet/DeepSpeechWPF/MainWindow.xaml b/native_client/dotnet/DeepSpeechWPF/MainWindow.xaml new file mode 100644 index 00000000..4fbe5e72 --- /dev/null +++ b/native_client/dotnet/DeepSpeechWPF/MainWindow.xaml @@ -0,0 +1,102 @@ + + + + + + + +