Skip to content

Commit

Permalink
Fixing .NET Core incompatibilities
Browse files Browse the repository at this point in the history
And also migrating to using ImageSharp as drawing library.

Work done for #159 and #158
  • Loading branch information
atruskie committed Feb 17, 2020
1 parent 79d7ae0 commit a4d25e9
Show file tree
Hide file tree
Showing 114 changed files with 847 additions and 2,928 deletions.
58 changes: 29 additions & 29 deletions AudioAnalysis.sln
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2024
# Visual Studio Version 16
VisualStudioVersion = 16.0.29721.120
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A050BD53-DEE0-40F3-BEAB-1F7474533C40}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -15,31 +15,31 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
stylecop.json = stylecop.json
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnalysisPrograms", "src\AnalysisPrograms\AnalysisPrograms.csproj", "{EC323929-0160-46BC-A04B-B4A66D02E757}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnalysisPrograms", "src\AnalysisPrograms\AnalysisPrograms.csproj", "{EC323929-0160-46BC-A04B-B4A66D02E757}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AudioAnalysisTools", "src\AudioAnalysisTools\AudioAnalysisTools.csproj", "{86855CBC-7243-492A-A500-2DE36CC7C825}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AudioAnalysisTools", "src\AudioAnalysisTools\AudioAnalysisTools.csproj", "{86855CBC-7243-492A-A500-2DE36CC7C825}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Acoustics.Tools", "src\Acoustics.Tools\Acoustics.Tools.csproj", "{0338570E-5A77-4A2E-8E17-7955C36AE1F7}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Acoustics.Tools", "src\Acoustics.Tools\Acoustics.Tools.csproj", "{0338570E-5A77-4A2E-8E17-7955C36AE1F7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Acoustics.Shared", "src\Acoustics.Shared\Acoustics.Shared.csproj", "{EF04F5A8-D4BD-4CD1-BFC2-F6AD2D9C7927}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Acoustics.Shared", "src\Acoustics.Shared\Acoustics.Shared.csproj", "{EF04F5A8-D4BD-4CD1-BFC2-F6AD2D9C7927}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnalysisBase", "src\AnalysisBase\AnalysisBase.csproj", "{80BC795A-A987-45AB-B29B-76CF190384BA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnalysisBase", "src\AnalysisBase\AnalysisBase.csproj", "{80BC795A-A987-45AB-B29B-76CF190384BA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Acoustics.Test", "tests\Acoustics.Test\Acoustics.Test.csproj", "{99B8FFB6-3C32-4F26-A1DF-F9B8A8FC0C05}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Acoustics.Test", "tests\Acoustics.Test\Acoustics.Test.csproj", "{99B8FFB6-3C32-4F26-A1DF-F9B8A8FC0C05}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{90D785B5-36C3-46C9-8EC5-DE2FA4A4BC2E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{2C6A426C-01D7-432E-AF76-824346A9CD38}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TowseyLibrary", "src\TowseyLibrary\TowseyLibrary.csproj", "{7C6831FD-F60C-4F7B-8E6A-35E850174411}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TowseyLibrary", "src\TowseyLibrary\TowseyLibrary.csproj", "{7C6831FD-F60C-4F7B-8E6A-35E850174411}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{1DEC9774-CCB2-437E-A134-7E4CBF2724DB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AcousticWorkbench", "src\AcousticWorkbench\AcousticWorkbench.csproj", "{E92AFA1B-B089-4CC3-B765-3B4CFF84E294}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AcousticWorkbench", "src\AcousticWorkbench\AcousticWorkbench.csproj", "{E92AFA1B-B089-4CC3-B765-3B4CFF84E294}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "AED", "src\AED\AED.fsproj", "{D5DFD3D5-EF64-4F5B-867F-192DAA7594FC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Acoustics.Unsafe", "src\Acoustics.Unsafe\Acoustics.Unsafe.csproj", "{CB44FCC9-E533-4BB6-85A5-EFB204C60A4F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Acoustics.Unsafe", "src\Acoustics.Unsafe\Acoustics.Unsafe.csproj", "{CB44FCC9-E533-4BB6-85A5-EFB204C60A4F}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Acoustics.Shared.FSharp", "src\Acoustics.Shared.FSharp\Acoustics.Shared.FSharp.fsproj", "{0A247CB0-779D-4E71-BD86-D3F1D233B7E9}"
EndProject
Expand Down Expand Up @@ -311,44 +311,44 @@ Global
{99B8FFB6-3C32-4F26-A1DF-F9B8A8FC0C05}.SilverlightOnly|x86.Build.0 = Release|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.AudioAnalysis|Any CPU.ActiveCfg = Release|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.AudioAnalysis|Any CPU.Build.0 = Release|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.AudioAnalysis|Mixed Platforms.ActiveCfg = Release|x86
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.AudioAnalysis|Mixed Platforms.Build.0 = Release|x86
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.AudioAnalysis|Mixed Platforms.ActiveCfg = Debug|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.AudioAnalysis|Mixed Platforms.Build.0 = Debug|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.AudioAnalysis|x64.ActiveCfg = Release|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.AudioAnalysis|x64.Build.0 = Release|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.AudioAnalysis|x86.ActiveCfg = Release|x86
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.AudioAnalysis|x86.Build.0 = Release|x86
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.AudioAnalysis|x86.ActiveCfg = Debug|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.AudioAnalysis|x86.Build.0 = Debug|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Core|Any CPU.ActiveCfg = Release|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Core|Any CPU.Build.0 = Release|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Core|Mixed Platforms.ActiveCfg = Release|x86
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Core|Mixed Platforms.Build.0 = Release|x86
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Core|Mixed Platforms.ActiveCfg = Debug|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Core|Mixed Platforms.Build.0 = Debug|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Core|x64.ActiveCfg = Release|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Core|x64.Build.0 = Release|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Core|x86.ActiveCfg = Release|x86
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Core|x86.Build.0 = Release|x86
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Core|x86.ActiveCfg = Debug|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Core|x86.Build.0 = Debug|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Debug|Mixed Platforms.Build.0 = Debug|x86
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Debug|x64.ActiveCfg = Debug|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Debug|x64.Build.0 = Debug|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Debug|x86.ActiveCfg = Debug|x86
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Debug|x86.Build.0 = Debug|x86
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Debug|x86.ActiveCfg = Debug|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Debug|x86.Build.0 = Debug|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Release|Any CPU.Build.0 = Release|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Release|x64.ActiveCfg = Release|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Release|x64.Build.0 = Release|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Release|x86.ActiveCfg = Release|x86
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Release|x86.Build.0 = Release|x86
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Release|x86.ActiveCfg = Release|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.Release|x86.Build.0 = Release|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.SilverlightOnly|Any CPU.ActiveCfg = Release|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.SilverlightOnly|Any CPU.Build.0 = Release|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.SilverlightOnly|Mixed Platforms.ActiveCfg = Release|x86
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.SilverlightOnly|Mixed Platforms.Build.0 = Release|x86
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.SilverlightOnly|Mixed Platforms.ActiveCfg = Debug|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.SilverlightOnly|Mixed Platforms.Build.0 = Debug|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.SilverlightOnly|x64.ActiveCfg = Release|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.SilverlightOnly|x64.Build.0 = Release|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.SilverlightOnly|x86.ActiveCfg = Release|x86
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.SilverlightOnly|x86.Build.0 = Release|x86
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.SilverlightOnly|x86.ActiveCfg = Debug|Any CPU
{7C6831FD-F60C-4F7B-8E6A-35E850174411}.SilverlightOnly|x86.Build.0 = Debug|Any CPU
{E92AFA1B-B089-4CC3-B765-3B4CFF84E294}.AudioAnalysis|Any CPU.ActiveCfg = Release|Any CPU
{E92AFA1B-B089-4CC3-B765-3B4CFF84E294}.AudioAnalysis|Any CPU.Build.0 = Release|Any CPU
{E92AFA1B-B089-4CC3-B765-3B4CFF84E294}.AudioAnalysis|Mixed Platforms.ActiveCfg = Release|Any CPU
Expand Down
1 change: 1 addition & 0 deletions AudioAnalysis.sln.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
<s:Boolean x:Key="/Default/ReSpeller/UserDictionaries/=en_005Fus/Words/=parallelized/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/ReSpeller/UserDictionaries/=en_005Fus/Words/=spectrums/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/ReSpeller/UserDictionaries/=en_005Fus/Words/=Truskinger/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Attacher/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Bioacoustics/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Cepstral/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Chromeless/@EntryIndexedValue">True</s:Boolean>
Expand Down
19 changes: 12 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,18 @@ Required Software

The required software for developing new code (not running the program) includes:

- A Windows OS (we're working on making this Linux compatible)
- Visual Studio 2019
- If you're at a university that has an Office365 Subscription you can download software from https://azureforeducation.microsoft.com/devtools
- The [community edition](https://visualstudio.microsoft.com/vs/) of Visual Studio should work fine and is totally free
- [Optional] Resharper Ulitmate (Academic License)
- Install these plugins (_ReSharper_ menu > _Extension Manager_)
- ReSpeller Free
- The latest .NET Core SDK
- An IDE:
- Visual Studio 2019 (Windows only)
- .NET Core SDK for Visual Studio 2019
- If you're at a university that has an Office365 Subscription you can download software from https://azureforeducation.microsoft.com/devtools
- The [community edition](https://visualstudio.microsoft.com/vs/) of Visual Studio should work fine and is totally free
- [Optional] Resharper Ulitmate (Academic License)
- Install these plugins (_ReSharper_ menu > _Extension Manager_)
- ReSpeller Free
- VS Code
- C# Extension

- [msysgit](https://git-for-windows.github.io/)

Binary Large Objects (BLOBs)
Expand Down
1 change: 0 additions & 1 deletion NuGet.Config
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="All" value="(Aggregate source)" />
<add key="SqLiteFileSystem Packages" value="https://ci.appveyor.com/nuget/sqlitefilesystem-dcfwbf0p9du0" />
<add key="natemcmaster Packages" value="https://www.myget.org/F/natemcmaster" />
<add key="SixLabors Packages (myget)" value="https://www.myget.org/F/sixlabors" />
Expand Down
Loading

0 comments on commit a4d25e9

Please sign in to comment.