Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update project for using it in 2020s #2

Open
wants to merge 22 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5a14da5
Upgrade projects to dotnetstandard 2.1
Aug 12, 2020
ce12aa9
Make Accord-Framework targetable to dotnet core 3.1
Aug 12, 2020
d473dff
fixed project for dotnetcore 3.1
Aug 13, 2020
e8a1f51
make video compilable for NET Standard
Aug 13, 2020
fc48d80
increment version
Aug 13, 2020
7556c51
Merge pull request #1 from sharpSteff/dotnetcore3_1
sharpSteff Jul 4, 2022
15f5834
Merge remote-tracking branch 'sharpSteff/development' into development
kasthack Dec 18, 2022
0000000
[WIP] Get rid of ancient framework support and migrate to supported v…
kasthack Dec 19, 2022
0000000
[WIP] Drop older runtime SKUs from app.config's
kasthack Dec 19, 2022
0000000
Fix parts of the build
kasthack Dec 19, 2022
0000000
Drop .NET <=3.5 bootstrapper packages
kasthack Dec 19, 2022
0000000
Fix more build issues
kasthack Dec 19, 2022
0000000
Drop the remains of older bootstrapper packages
kasthack Dec 19, 2022
0000000
Fix even more build issues
kasthack Dec 19, 2022
0000000
Bump submodule versions
kasthack Dec 19, 2022
0000000
Upgrade docs project
kasthack Dec 19, 2022
0000000
Update gitmodule subprojects to net 4.8
kasthack Dec 19, 2022
0000000
Upgrade nunit to 3.13.3, switch to nuget version instead of bundled b…
kasthack Dec 19, 2022
0000000
Fix build for Accord.Tests.Math.FSharp
kasthack Dec 19, 2022
0000000
Fix missing test images
kasthack Jan 2, 2023
0000000
Update build instructions
kasthack Jan 2, 2023
0000000
Fix OleDB issues: update driver version to 16.0, fix name conflicts i…
kasthack Jan 3, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
51 changes: 21 additions & 30 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,14 @@
version: 3.8.2.{build}
version: 3.8.2.{build}

image:
- Visual Studio 2017
- Visual Studio 2022

configuration:
- mono
- net35
- net40
- net45
- net46
- net462
- net48

platform: Any CPU

matrix:
exclude:
- configuration: net35
image: Visual Studio 2017

clone_depth: 5

before_build:
Expand All @@ -29,28 +20,28 @@ build:
verbosity: normal

test:
assemblies:
only:
- Accord.Tests.Audio.dll
- Accord.Tests.Controls.dll
- Accord.Tests.Core.dll
- Accord.Tests.Imaging.dll
- Accord.Tests.IO.dll
- Accord.Tests.MachineLearning.dll
- Accord.Tests.Math.dll
- Accord.Tests.Math.Cpp.dll
- Accord.Tests.Math.Interop.dll
- Accord.Tests.Neuro.dll
- Accord.Tests.Statistics.dll
- Accord.Tests.Statistics.VB.dll
- Accord.Tests.Text.dll
- Accord.Tests.Video.dll
- Accord.Tests.Vision.dll
assemblies:
only:
- Accord.Tests.Audio.dll
- Accord.Tests.Controls.dll
- Accord.Tests.Core.dll
- Accord.Tests.Imaging.dll
- Accord.Tests.IO.dll
- Accord.Tests.MachineLearning.dll
- Accord.Tests.Math.dll
- Accord.Tests.Math.Cpp.dll
- Accord.Tests.Math.Interop.dll
- Accord.Tests.Neuro.dll
- Accord.Tests.Statistics.dll
- Accord.Tests.Statistics.VB.dll
- Accord.Tests.Text.dll
- Accord.Tests.Video.dll
- Accord.Tests.Vision.dll

categories:
except:
- Office
- Random
- Random
- Slow

notifications:
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "Samples/Statistics/Workbench (Distributions)"]
path = Samples/Statistics/Workbench (Distributions)
url = ../../cesarsouza/statistics-workbench.git
url = ../../kasthack-labs/statistics-workbench.git
[submodule "Samples/Video/Screencast Capture"]
path = Samples/Video/Screencast Capture
url = ../../cesarsouza/screencast-capture.git
url = ../../kasthack-labs/screencast-capture.git
13 changes: 2 additions & 11 deletions Externals/Json.NET/Json100r3/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,8 @@ Versions:

Json.NET has different libraries for the various .NET Framework versions.

-net45:
.NET 4.5+

-net40:
.NET 4.0

-net35:
.NET 3.5

-net20:
.NET 2.0, Unity
-net48:
.NET 4.8+

-portable-net45+win8+wpa81+wp8:
.NET 4.5, Windows Phone 8, Windows 8 Store
Expand Down
Binary file removed Externals/ace/AccessDatabaseEngine.exe
Binary file not shown.
Binary file removed Externals/ace/AccessDatabaseEngine_X64.exe
Binary file not shown.
28 changes: 9 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Accord.NET Framework

This project is currently archived. Please fork the project into your own GitHub account if you would like to continue its development.
I'm currently(2023-01-03) workign on making this project run on moden runtimes but don't expect it to be supported.

\- kasthack

~~This project is currently archived. Please fork the project into your own GitHub account if you would like to continue its development.~~

# Archiving

Expand Down Expand Up @@ -60,25 +64,11 @@ The framework comes with a wide range of sample applications to help get you sta

# Building

#### With Visual Studio 2015

Please download and install the following dependencies:

- [T4 Toolbox for Visual Studio 2015](https://visualstudiogallery.msdn.microsoft.com/34b6d489-afbc-4d7b-82c3-dded2b726dbc)
- [Sandcastle Help File Builder (with VS2015 extension)](https://github.com/EWSoftware/SHFB/releases)
- [NUnit 3 Test Adapter](https://marketplace.visualstudio.com/items?itemName=NUnitDevelopers.NUnit3TestAdapter)

Then navigate to the Sources directory, and open the *Accord.NET.sln* solution file. Note: the solution includes F# unit test projects that can be disabled/unloaded from the solution in case you do not have support for F# tools in your version of Visual Studio.


#### With Visual Studio 2017

Please download and install the following dependencies:
#### With Visual Studio 2022

- [T4 Toolbox for Visual Studio 2017](https://github.com/hagronnestad/T4Toolbox/releases/tag/vs2017-b1)
- [Sandcastle Help File Builder (with VS2017 extension)](https://github.com/EWSoftware/SHFB/releases)
- [NUnit 3 Test Adapter](https://marketplace.visualstudio.com/items?itemName=NUnitDevelopers.NUnit3TestAdapter)
- [Visual C++ Redistributable for Visual Studio 2015](https://www.microsoft.com/en-us/download/details.aspx?id=48145&751be11f-ede8-5a0c-058c-2ee190a24fa6) (both x64 and x86)
* [T4 Toolbox](https://github.com/Ch0senOne/T4Toolbox/releases)
* [Sandcastle Help File Builder(with VS 2022 extension)](https://github.com/EWSoftware/SHFB/releases)
* [Microsoft 365 Access Runtime](https://support.microsoft.com/en-us/office/download-and-install-microsoft-365-access-runtime-185c5a32-8ba9-491e-ac76-91cbe3ea09c9) (Required for some tests)

Then navigate to the Sources directory, and open the *Accord.NET.sln* solution file. Note: the solution includes F# unit test projects that can be disabled/unloaded from the solution in case you do not have support for F# tools in your version of Visual Studio.

Expand Down
12 changes: 1 addition & 11 deletions Samples/Audio/Beat detection/Beat detection.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>SampleApp</RootNamespace>
<AssemblyName>Beat detection</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<AppDesignerFolder>Properties</AppDesignerFolder>
<StartupObject>SampleApp.Program</StartupObject>
<FileUpgradeFlags>
Expand Down Expand Up @@ -121,16 +121,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>
Expand Down
18 changes: 9 additions & 9 deletions Samples/Audio/Beat detection/packages.config
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Accord" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Audio" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Audition" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.DirectSound" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.MachineLearning" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Math" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Statistics" version="3.8.2-alpha" targetFramework="net46" />
<package id="SharpDX" version="4.0.1" targetFramework="net46" />
<package id="SharpDX.DirectSound" version="4.0.1" targetFramework="net46" />
<package id="Accord" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Audio" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Audition" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.DirectSound" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.MachineLearning" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Math" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Statistics" version="3.8.2-alpha" targetFramework="net48" />
<package id="SharpDX" version="4.0.1" targetFramework="net48" />
<package id="SharpDX.DirectSound" version="4.0.1" targetFramework="net48" />
</packages>
12 changes: 1 addition & 11 deletions Samples/Audio/Fourier (FFT)/Fourier (FFT).csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>SampleApp</RootNamespace>
<AssemblyName>Fourier %28FFT%29</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SourceAnalysisOverrideSettingsFile>C:\Documents and Settings\Caio\Dados de aplicativos\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
<StartupObject>SampleApp.Program</StartupObject>
Expand Down Expand Up @@ -131,16 +131,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>
Expand Down
22 changes: 11 additions & 11 deletions Samples/Audio/Fourier (FFT)/packages.config
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Accord" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Audio" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Controls" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Controls.Audio" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.DirectSound" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.MachineLearning" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Math" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Statistics" version="3.8.2-alpha" targetFramework="net46" />
<package id="SharpDX" version="4.0.1" targetFramework="net46" />
<package id="SharpDX.DirectSound" version="4.0.1" targetFramework="net46" />
<package id="ZedGraph" version="5.1.7" targetFramework="net40" />
<package id="Accord" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Audio" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Controls" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Controls.Audio" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.DirectSound" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.MachineLearning" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Math" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Statistics" version="3.8.2-alpha" targetFramework="net48" />
<package id="SharpDX" version="4.0.1" targetFramework="net48" />
<package id="SharpDX.DirectSound" version="4.0.1" targetFramework="net48" />
<package id="ZedGraph" version="5.1.7" targetFramework="net48" />
</packages>
14 changes: 7 additions & 7 deletions Samples/Audio/Recorder/Recorder.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Recorder</RootNamespace>
<AssemblyName>Recorder</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<NuGetPackageImportStamp>
Expand Down Expand Up @@ -145,11 +145,11 @@
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\Accord.3.8.2-alpha\build\Accord.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Accord.3.8.2-alpha\build\Accord.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
22 changes: 11 additions & 11 deletions Samples/Audio/Recorder/packages.config
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Accord" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Audio" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Controls" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Controls.Audio" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.DirectSound" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.MachineLearning" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Math" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Statistics" version="3.8.2-alpha" targetFramework="net46" />
<package id="SharpDX" version="4.0.1" targetFramework="net46" />
<package id="SharpDX.DirectSound" version="4.0.1" targetFramework="net46" />
<package id="ZedGraph" version="5.1.7" targetFramework="net40-Client" />
<package id="Accord" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Audio" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Controls" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Controls.Audio" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.DirectSound" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.MachineLearning" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Math" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Statistics" version="3.8.2-alpha" targetFramework="net48" />
<package id="SharpDX" version="4.0.1" targetFramework="net48" />
<package id="SharpDX.DirectSound" version="4.0.1" targetFramework="net48" />
<package id="ZedGraph" version="5.1.7" targetFramework="net48" />
</packages>
12 changes: 1 addition & 11 deletions Samples/Fuzzy/Robot (Inference)/Robot (Inference).csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
Expand Down Expand Up @@ -139,16 +139,6 @@
<ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>
Expand Down
2 changes: 1 addition & 1 deletion Samples/Fuzzy/Robot (Inference)/app.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" /></startup>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
Expand Down
8 changes: 4 additions & 4 deletions Samples/Fuzzy/Robot (Inference)/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Accord" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Fuzzy" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Math" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord.Statistics" version="3.8.2-alpha" targetFramework="net46" />
<package id="Accord" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Fuzzy" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Math" version="3.8.2-alpha" targetFramework="net48" />
<package id="Accord.Statistics" version="3.8.2-alpha" targetFramework="net48" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<PublishUrl>publish\</PublishUrl>
Expand Down Expand Up @@ -141,16 +141,6 @@
<ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>
Expand All @@ -165,11 +155,11 @@
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\Accord.3.8.2-alpha\build\Accord.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Accord.3.8.2-alpha\build\Accord.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
Loading