GH-318: Adding support for targetting .NET Standard 2.0.

accord-net · 4780e21e41cc70e35b659267c77128d2df1c0c33 · cesarsouza committed Jun 1, 2017 · Jun 1, 2017 · 4780e21
1 parent f99af2a
commit 4780e21e41cc70e35b659267c77128d2df1c0c33
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 bin
 obj
 
+.vs
 *.user
 *.pidb
 *.suo
diff --git a/Setup/Accord.Setup (NETStandard).csproj b/Setup/Accord.Setup (NETStandard).csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>Accord.Setup</AssemblyName>
+    <RootNamespace>Accord.Setup</RootNamespace>
+    <Configurations>Debug</Configurations>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NETSTANDARD2_0</DefineConstants>
+  </PropertyGroup>
+
+</Project>
diff --git a/Setup/Scripts/UpdateVersion.cs b/Setup/Scripts/UpdateVersion.cs
@@ -37,8 +37,6 @@ public static string GetVersionText(string major, string minor, string rev, stri
 
         public static void Replace(string frameworkRootPath)
         {
-
-
             string version = File.ReadAllText(Path.Combine(frameworkRootPath, "Version.txt"));
             string[] parts;
             parts = version.Split('-');
@@ -52,6 +50,7 @@ public static void Replace(string frameworkRootPath)
             Console.WriteLine("Updating source files with version number {0}.{1}.{2}.{3}{4}", major, minor, rev, build, tag);
 
             replaceAssemblyInfo(frameworkRootPath, tag, major, minor, rev, build);
+            replaceNetStandardTargets(frameworkRootPath, tag, major, minor, rev, build);
             replaceDocumentation(frameworkRootPath, major, minor, rev);
         }
 
@@ -79,5 +78,24 @@ private static void replaceAssemblyInfo(string frameworkRootPath, string tag, st
                 File.WriteAllText(file.FullName, contents);
             }
         }
+
+        private static void replaceNetStandardTargets(string frameworkRootPath, string tag, string major, string minor, string rev, string build)
+        {
+            string targetsFile = Path.Combine(frameworkRootPath, "Sources", "Version.targets");
+
+            var sb = new StringBuilder();
+
+            sb.AppendLine("<Project>");
+            sb.AppendLine("  <PropertyGroup>");
+            sb.AppendLine(string.Format("    <Copyright>Copyright (c) Accord.NET authors, 2009-{0}</Copyright>", DateTime.Now.Year));
+            sb.AppendLine("    <Version>3.5.0</Version>");
+            sb.AppendLine(string.Format("    <AssemblyVersion>{0}.{1}.{2}</AssemblyVersion>", major, minor, rev));
+            sb.AppendLine(string.Format("    <AssemblyInformationalVersion>{0}.{1}.{2}{3}</AssemblyInformationalVersion>", major, minor, rev, tag));
+            sb.AppendLine(string.Format("    <FileVersion>{0}.{1}.{2}.{3}</FileVersion>", major, minor, rev, build));
+            sb.AppendLine("  </PropertyGroup>");
+            sb.AppendLine("</Project>");
+            
+            File.WriteAllText(targetsFile, sb.ToString());
+        }
     }
 }
diff --git a/Sources/Accord.Audio.DirectSound/Accord.Audio.DirectSound (NETStandard).csproj b/Sources/Accord.Audio.DirectSound/Accord.Audio.DirectSound (NETStandard).csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk"> 
+
+  <PropertyGroup>
+    <AssemblyName>Accord.Audio.DirectSound</AssemblyName>
+    <RootNamespace>Accord.Audio.DirectSound</RootNamespace>
+  </PropertyGroup>
+
+  <Import Project="$(SolutionDir)Accord.NET (NETStandard).targets" />
+
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NETSTANDARD2_0</DefineConstants>
+	<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <OutputPath>$(SolutionDir)..\Debug\</OutputPath>
+    <DocumentationFile></DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard|AnyCPU'">
+    <DefineConstants>TRACE;RELEASE;NETSTANDARD2_0</DefineConstants>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="SharpDX" Version="4.0.1" />
+    <PackageReference Include="SharpDX.DirectSound" Version="4.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Accord.Audio\Accord.Audio (NETStandard).csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/Sources/Accord.Audio/Accord.Audio (NETStandard).csproj b/Sources/Accord.Audio/Accord.Audio (NETStandard).csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk"> 
+
+  <PropertyGroup>
+    <AssemblyName>Accord.DataSets</AssemblyName>
+    <RootNamespace>Accord.DataSets</RootNamespace>
+  </PropertyGroup>
+
+  <Import Project="$(SolutionDir)Accord.NET (NETStandard).targets" />
+
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NETSTANDARD2_0</DefineConstants>
+	<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <OutputPath>$(SolutionDir)..\Debug\</OutputPath>
+    <DocumentationFile></DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard|AnyCPU'">
+    <DefineConstants>TRACE;RELEASE;NETSTANDARD2_0</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Accord.Math.Core\Accord.Math.Core (NETStandard).csproj" />
+    <ProjectReference Include="..\Accord.Math\Accord.Math (NETStandard).csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/Sources/Accord.Audio/ComplexFilters/Base/IComplexFilter.cs b/Sources/Accord.Audio/ComplexFilters/Base/IComplexFilter.cs
@@ -23,8 +23,6 @@
 namespace Accord.Audio.ComplexFilters
 {
     using System;
-    using AForge;
-    using AForge.Math;
 
     /// <summary>
     ///   Audio processing filter, which operates with Fourier transformed
diff --git a/Sources/Accord.Audio/ComplexFilters/CombFilter.cs b/Sources/Accord.Audio/ComplexFilters/CombFilter.cs
@@ -24,7 +24,6 @@ namespace Accord.Audio.ComplexFilters
 {
     using Accord.Audio;
     using Accord.Audio.Generators;
-    using AForge.Math;
     using System.Numerics;
 
     /// <summary>
diff --git a/Sources/Accord.Audio/ComplexFilters/DifferentialRectificationFilter.cs b/Sources/Accord.Audio/ComplexFilters/DifferentialRectificationFilter.cs
@@ -22,7 +22,6 @@
 
 namespace Accord.Audio.ComplexFilters
 {
-    using AForge.Math;
     using System.Numerics;
 
     /// <summary>
diff --git a/Sources/Accord.Audio/ComplexFilters/EnvelopeFilter.cs b/Sources/Accord.Audio/ComplexFilters/EnvelopeFilter.cs
@@ -24,7 +24,6 @@ namespace Accord.Audio.ComplexFilters
 {
     using System;
     using Accord.Audio;
-    using AForge.Math;
     using System.Numerics;
 
     /// <summary>
diff --git a/Sources/Accord.Audio/Filters/SignalConverter.cs b/Sources/Accord.Audio/Filters/SignalConverter.cs
@@ -1,77 +0,0 @@
-// Accord (Experimental) Audio Library
-// Accord.NET framework
-// http://www.crsouza.com
-//
-// Copyright © César Souza, 2009-2011
-// cesarsouza at gmail.com
-//
-
-namespace Accord.Audio.Filters
-{
-    using System.Collections.Generic;
-
-    public class FormatConverter : BaseFilter
-    {
-        private SampleFormat destinationFormat;
-
-        private Dictionary<SampleFormat, SampleFormat> formatTranslations = new Dictionary<SampleFormat, SampleFormat>();
-
-        public override Dictionary<SampleFormat, SampleFormat> FormatTranslations
-        {
-            get { return formatTranslations; }
-        }
-
-        public FormatConverter(SampleFormat destinationFormat)
-        {
-            this.destinationFormat = destinationFormat;
-
-            if (destinationFormat == SampleFormat.Format32BitIeeeFloat)
-            {
-                formatTranslations[SampleFormat.Format16Bit] = destinationFormat;
-                formatTranslations[SampleFormat.Format32Bit] = destinationFormat;
-            }
-            else
-            {
-                throw new UnsupportedSampleFormatException();
-            }
-        }
-
-        protected override void ProcessFilter(Signal sourceData, Signal destinationData)
-        {
-            int channels = sourceData.Channels;
-            int length = sourceData.Length;
-            SampleFormat dstFormat = destinationData.SampleFormat;
-            SampleFormat srcFormat = sourceData.SampleFormat;
-
-            if (dstFormat == SampleFormat.Format32BitIeeeFloat)
-            {
-                float dst;
-
-                if (srcFormat == SampleFormat.Format16Bit)
-                {
-                    short src;
-                    for (int c = 0; c < channels; c++)
-                    {
-                        for (int i = 0; i < length; i++)
-                        {
-                            src = (short)sourceData.GetSample(c, i);
-                            SampleConverter.Convert(src, out dst);
-                        }
-                    }
-                }
-                else if (srcFormat == SampleFormat.Format32Bit)
-                {
-                    int src;
-                    for (int c = 0; c < channels; c++)
-                    {
-                        for (int i = 0; i < length; i++)
-                        {
-                            src = (int)sourceData.GetSample(c, i);
-                            SampleConverter.Convert(src, out dst);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/Sources/Accord.Audio/Filters/WaveRectifier.cs b/Sources/Accord.Audio/Filters/WaveRectifier.cs
@@ -23,7 +23,6 @@
 namespace Accord.Audio.Filters
 {
     using System.Collections.Generic;
-    using AForge.Math;
     using System.Numerics;
 
     /// <summary>
diff --git a/Sources/Accord.Audio/Generators/ImpulseGenerator.cs b/Sources/Accord.Audio/Generators/ImpulseGenerator.cs
@@ -23,7 +23,6 @@
 namespace Accord.Audio.Generators
 {
     using System;
-    using AForge.Math;
     using System.Numerics;
 
     /// <summary>
diff --git a/Sources/Accord.Audio/Signals/ComplexSignal.cs b/Sources/Accord.Audio/Signals/ComplexSignal.cs
@@ -25,7 +25,6 @@ namespace Accord.Audio
     using System;
     using System.Runtime.InteropServices;
     using Accord.Math;
-    using AForge.Math;
     using System.Numerics;
 
     /// <summary>
diff --git a/Sources/Accord.Audio/Signals/Signal.cs b/Sources/Accord.Audio/Signals/Signal.cs
@@ -24,7 +24,6 @@ namespace Accord.Audio
 {
     using System;
     using System.Runtime.InteropServices;
-    using AForge.Math;
     using System.Numerics;
 
     /// <summary>
diff --git a/Sources/Accord.Audio/Tools.cs b/Sources/Accord.Audio/Tools.cs
@@ -24,10 +24,9 @@ namespace Accord.Audio
 {
     using System;
     using System.Runtime.InteropServices;
-    using AForge.Math;
-    using Accord.Math;
     using System.Collections.Generic;
     using System.Numerics;
+    using Accord.Math;
 
     /// <summary>
     ///   Tool functions for audio processing.
diff --git a/Sources/Accord.Audio/UnsafeTools.cs b/Sources/Accord.Audio/UnsafeTools.cs
@@ -24,7 +24,6 @@ namespace Accord.Audio
 {
     using System;
     using System.Runtime.InteropServices;
-    using AForge.Math;
     using Accord.Math;
     using System.Collections.Generic;
     using System.Numerics;
diff --git a/Sources/Accord.Audio/Windows/IWindow.cs b/Sources/Accord.Audio/Windows/IWindow.cs
@@ -23,7 +23,6 @@
 namespace Accord.Audio.Windows
 {
     using System;
-    using AForge.Math;
 
     /// <summary>
     ///   Spectral Window
diff --git a/Sources/Accord.Audio/Windows/RectangularWindow.cs b/Sources/Accord.Audio/Windows/RectangularWindow.cs
@@ -22,7 +22,6 @@
 
 namespace Accord.Audio.Windows
 {
-    using AForge.Math;
     using System.Numerics;
 
     /// <summary>
diff --git a/Sources/Accord.Audio/Windows/WindowBase.cs b/Sources/Accord.Audio/Windows/WindowBase.cs
@@ -22,7 +22,6 @@
 
 namespace Accord.Audio.Windows
 {
-    using AForge.Math;
     using System.Numerics;
 
     /// <summary>
diff --git a/Sources/Accord.Audition/Accord.Audition (NETStandard).csproj b/Sources/Accord.Audition/Accord.Audition (NETStandard).csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk"> 
+
+  <PropertyGroup>
+    <AssemblyName>Accord.Audition</AssemblyName>
+    <RootNamespace>Accord.Audition</RootNamespace>
+  </PropertyGroup>
+
+  <Import Project="$(SolutionDir)Accord.NET (NETStandard).targets" />
+
+
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NETSTANDARD2_0</DefineConstants>
+	<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <OutputPath>$(SolutionDir)..\Debug\</OutputPath>
+    <DocumentationFile></DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard|AnyCPU'">
+    <DefineConstants>TRACE;RELEASE;NETSTANDARD2_0</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Accord.Audio\Accord.Audio (NETStandard).csproj" />
+    <ProjectReference Include="..\Accord.Core\Accord.Core (NETStandard).csproj" />
+    <ProjectReference Include="..\Accord.MachineLearning\Accord.MachineLearning (NETStandard).csproj" />
+    <ProjectReference Include="..\Accord.Math.Core\Accord.Math.Core (NETStandard).csproj" />
+    <ProjectReference Include="..\Accord.Math\Accord.Math (NETStandard).csproj" />
+    <ProjectReference Include="..\Accord.Statistics\Accord.Statistics (NETStandard).csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/Sources/Accord.Controls.Audio/Accord.NS.Controls.Audio.csproj b/Sources/Accord.Controls.Audio/Accord.NS.Controls.Audio.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <DefineConstants>TRACE;DEBUG;NETSTANDARD2_0</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="Properties\AssemblyInfo.cs" />
+    <Compile Remove="Properties\VersionInfo.cs" />
+  </ItemGroup>
+
+</Project>
diff --git a/Sources/Accord.Controls.Imaging/Accord.NS.Controls.Imaging.csproj b/Sources/Accord.Controls.Imaging/Accord.NS.Controls.Imaging.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <DefineConstants>TRACE;DEBUG;NETSTANDARD2_0</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="Properties\AssemblyInfo.cs" />
+    <Compile Remove="Properties\VersionInfo.cs" />
+  </ItemGroup>
+
+</Project>
diff --git a/Sources/Accord.Controls.Statistics/Accord.NS.Controls.csproj b/Sources/Accord.Controls.Statistics/Accord.NS.Controls.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <DefineConstants>TRACE;DEBUG;NETSTANDARD2_0</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="Properties\AssemblyInfo.cs" />
+    <Compile Remove="Properties\VersionInfo.cs" />
+  </ItemGroup>
+
+</Project>