Skip to content

Commit 397e6b5

Browse files
swhardenswharden
committed
make Spectrogram in .NET Core 3.0
1 parent d956ee6 commit 397e6b5

File tree

8 files changed

+33
-105
lines changed

8 files changed

+33
-105
lines changed

‎src/ConsoleDemo/ConsoleDemo.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</ItemGroup>
5454
<ItemGroup>
5555
<ProjectReference Include="..\Spectrogram\Spectrogram.csproj">
56-
<Project>{f4814553-c114-4df7-b0f7-6512796247c7}</Project>
56+
<Project>{8717f4ce-4497-4eaa-b95d-0f7a04fb397d}</Project>
5757
<Name>Spectrogram</Name>
5858
</ProjectReference>
5959
</ItemGroup>

‎src/ConsoleDemo/Program.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ class Program
1010
{
1111
static void Main(string[] args)
1212
{
13+
var spec = new Spectrogram.Spectrogram();
14+
1315
double[] values = Spectrogram.Tools.generateFakeSignal();
1416
double[] fft = Spectrogram.Tools.FFT(values);
1517

‎src/Spectrogram/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎src/Spectrogram/Spectrogram.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
62

73
namespace Spectrogram
84
{
95
public class Spectrogram
106
{
7+
public Spectrogram()
8+
{
9+
Console.WriteLine("You created a Spectrogram");
10+
}
1111
}
1212
}

‎src/Spectrogram/Spectrogram.csproj

Lines changed: 20 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,26 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{F4814553-C114-4DF7-B0F7-6512796247C7}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>Spectrogram</RootNamespace>
11-
<AssemblyName>Spectrogram</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<Deterministic>true</Deterministic>
4+
<TargetFrameworks>netcoreapp3.0;net45</TargetFrameworks>
5+
<Description>A tool to create spectrograms in .NET</Description>
6+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
7+
<PackageProjectUrl>https://github.com/swharden/Spectrogram</PackageProjectUrl>
8+
<RepositoryUrl></RepositoryUrl>
9+
<PackageReleaseNotes>This software is alpha - you probably don't want to use it.</PackageReleaseNotes>
10+
<Product />
11+
<Authors>Scott W Harden</Authors>
12+
<Company>Harden Technologies, LLC</Company>
13+
<Version>0.0.1</Version>
14+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1515
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
16+
17+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.0|AnyCPU'">
1918
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
2419
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>pdbonly</DebugType>
27-
<Optimize>true</Optimize>
28-
<OutputPath>bin\Release\</OutputPath>
29-
<DefineConstants>TRACE</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
32-
</PropertyGroup>
33-
<ItemGroup>
34-
<Reference Include="NAudio, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
35-
<HintPath>..\packages\NAudio.1.9.0\lib\net35\NAudio.dll</HintPath>
36-
</Reference>
37-
<Reference Include="ScottPlot, Version=3.0.8.0, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\packages\ScottPlot.3.0.9\lib\net45\ScottPlot.dll</HintPath>
39-
</Reference>
40-
<Reference Include="System" />
41-
<Reference Include="System.Core" />
42-
<Reference Include="System.Drawing" />
43-
<Reference Include="System.Windows.Forms" />
44-
<Reference Include="System.Xml.Linq" />
45-
<Reference Include="System.Data.DataSetExtensions" />
46-
<Reference Include="Microsoft.CSharp" />
47-
<Reference Include="System.Data" />
48-
<Reference Include="System.Net.Http" />
49-
<Reference Include="System.Xml" />
50-
</ItemGroup>
51-
<ItemGroup>
52-
<Compile Include="Spectrogram.cs" />
53-
<Compile Include="Properties\AssemblyInfo.cs" />
54-
<Compile Include="Tools.cs" />
55-
</ItemGroup>
20+
5621
<ItemGroup>
57-
<None Include="packages.config" />
22+
<PackageReference Include="NAudio" Version="1.9.0" />
23+
<PackageReference Include="ScottPlot" Version="3.0.9" />
5824
</ItemGroup>
59-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
60-
</Project>
25+
26+
</Project>

‎src/Spectrogram/Tools.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace Spectrogram
88
{
9+
910
public static class Tools
1011
{
1112
public static double[] FFT(double[] values, bool useHammingWindow = true)

‎src/Spectrogram/packages.config

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/SpectrographStuff.sln

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.29209.62
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleDemo", "ConsoleDemo\ConsoleDemo.csproj", "{DA5009A8-9036-4BDA-B591-3244DEB759E9}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spectrogram", "Spectrogram\Spectrogram.csproj", "{F4814553-C114-4DF7-B0F7-6512796247C7}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectrogram", "Spectrogram\Spectrogram.csproj", "{8717F4CE-4497-4EAA-B95D-0F7A04FB397D}"
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,10 +17,10 @@ Global
1717
{DA5009A8-9036-4BDA-B591-3244DEB759E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
1818
{DA5009A8-9036-4BDA-B591-3244DEB759E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
1919
{DA5009A8-9036-4BDA-B591-3244DEB759E9}.Release|Any CPU.Build.0 = Release|Any CPU
20-
{F4814553-C114-4DF7-B0F7-6512796247C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21-
{F4814553-C114-4DF7-B0F7-6512796247C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
22-
{F4814553-C114-4DF7-B0F7-6512796247C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
23-
{F4814553-C114-4DF7-B0F7-6512796247C7}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{8717F4CE-4497-4EAA-B95D-0F7A04FB397D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{8717F4CE-4497-4EAA-B95D-0F7A04FB397D}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{8717F4CE-4497-4EAA-B95D-0F7A04FB397D}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{8717F4CE-4497-4EAA-B95D-0F7A04FB397D}.Release|Any CPU.Build.0 = Release|Any CPU
2424
EndGlobalSection
2525
GlobalSection(SolutionProperties) = preSolution
2626
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)