asio getting closer to working on .net core -- naudio lib compiles; n…

…audiodemo doesn't
intelliBrain · Dec 30, 2019 · 0db3797 · 0db3797
1 parent de1ae58
commit 0db3797
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/NAudio/NAudio.csproj b/NAudio/NAudio.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;netstandard2.0;net35</TargetFrameworks>
     <Version>1.9.0</Version>
     <Authors>Mark Heath &amp; Contributors</Authors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -14,6 +14,10 @@
     <GenerateDocumentationFile Condition=" '$(Configuration)' == 'Release' ">true</GenerateDocumentationFile>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
+    <UseWindowsForms>true</UseWindowsForms>
+  </PropertyGroup>
+
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
@@ -40,6 +44,17 @@
     <Compile Remove="Wave\WaveOutputs\WaveFileWriterRT.cs" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
+    <Compile Remove="Wave\MmeInterop\WaveWindow.cs" />
+    <Compile Remove="Wave\MmeInterop\WaveCallbackInfo.cs" />
+    <Compile Remove="Wave\WaveInputs\WaveIn.cs" />
+    <Compile Remove="Wave\WaveOutputs\WaveOut.cs" />
+    <Compile Remove="Wave\WaveFormats\WaveFormatCustomMarshaler.cs" />
+    <Compile Remove="Wave\WaveOutputs\WasapiOutRT.cs" />
+    <Compile Remove="Wave\WaveInputs\WasapiCaptureRT.cs" />
+    <Compile Remove="Wave\WaveOutputs\WaveFileWriterRT.cs" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
     <Compile Remove="Utils\ProgressLog*.*" />
     <Compile Remove="Gui\*.*" />
@@ -73,4 +88,13 @@
     <Compile Remove="Dmo\Effect\*.cs" />
     <Compile Remove="Wave\WaveProviders\DmoEffectWaveProvider.cs" />
   </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
+    <PackageReference Include="Microsoft.Win32.Registry">
+      <Version>4.7.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Resources.Extensions">
+      <Version>4.7.0</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
diff --git a/NAudio/Wave/Asio/ASIODriver.cs b/NAudio/Wave/Asio/ASIODriver.cs
@@ -23,7 +23,7 @@ private AsioDriver()
         {
         }
 
-#if NET35
+#if NET35 || NETCOREAPP3_0
         /// <summary>
         /// Gets the ASIO driver names installed.
         /// </summary>

diff --git a/NAudioDemo/NAudioDemo.csproj b/NAudioDemo/NAudioDemo.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>net40-client</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <OutputType>WinExe</OutputType>
@@ -30,6 +30,7 @@
     <Product>NAudioDemo</Product>
     <Title>NAudioDemo</Title>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="NSpeex">

diff --git a/NAudioDemo/VolumeMixerDemo/VolumeMixerPanel.cs b/NAudioDemo/VolumeMixerDemo/VolumeMixerPanel.cs
@@ -4,7 +4,9 @@
 using System.Drawing;
 using System.Data;
 using System.Linq;
+#if NET35
 using System.Runtime.Remoting.Messaging;
+#endif
 using System.Text;
 using System.Windows.Forms;
 using NAudio.CoreAudioApi;