Skip to content

Commit

Permalink
Merge branch 'release/3.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
giacomelli committed Sep 6, 2022
2 parents c243d39 + d3b739e commit e4f8a19
Show file tree
Hide file tree
Showing 297 changed files with 2,297 additions and 1,294 deletions.
2 changes: 2 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

* Open a new GitHub pull request with the fix.
* Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
* Provide a code sample showing the bug happening.
* Write a unit test that exposes the bug.


### Do you intend to add a new feature or change an existing one?
Expand Down
15 changes: 11 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

GeneticSharp is a fast, extensible, multi-platform and multithreading C# Genetic Algorithm library that simplifies the development of applications using Genetic Algorithms (GAs).

Can be used in any kind of .NET Core and .NET Framework apps, like ASP .NET MVC, ASP .NET Core, Blazor, Web Forms, UWP, Windows Forms, GTK#, Xamarin and Unity3D games.
Can be used in any kind of .NET 6, .NET Standard and .NET Framework apps, like ASP .NET MVC, ASP .NET Core, Blazor, Web Forms, UWP, Windows Forms, GTK#, Xamarin, MAUI and Unity3D games.


--------
Expand Down Expand Up @@ -189,7 +189,7 @@ Add your own fitness evaluation, implementing [IFitness](src/GeneticSharp.Domain

## Multi-platform
- Mono, .NET Standard 2.0 and .NET Framework 4.6.2 support
- .NET 6, .NET Standard 2.0, Mono and .NET Framework 4.6.2 support
- Fully tested on Windows and MacOS

## Code quality
Expand All @@ -202,7 +202,7 @@ Add your own fitness evaluation, implementing [IFitness](src/GeneticSharp.Domain

## Setup

### .NET Standard 2.0 and .NET Framework 4.6.2
### .NET 6
Only GeneticSharp:

```shell
Expand All @@ -219,6 +219,13 @@ You should use the [UnityNuGet](https://github.com/xoofx/UnityNuGet) to install

Or you can use the latest GeneticSharp.unitypackage available on our [release page](https://github.com/giacomelli/GeneticSharp/releases).

## .NET Standard 2.0 and .NET Framework 4.6.2
To install previous version that support .NET Standard 2.0 and .NET Framework 4.6.2:

```shell
install-package GeneticSharp -Version 2.6.0
```

## Mono and .NET Framework 3.5
To install previous version that support .NET Framework 3.5:

Expand Down Expand Up @@ -292,7 +299,7 @@ Console.WriteLine("Best solution found has {0} fitness.", ga.BestChromosome.Fitn


## Templates for `dotnet new`
If you're using .NET Core, you can install GeneticSharp.Templates:
If you're using .NET 6 or .NET Core, you can install GeneticSharp.Templates:

```shell
dotnet new -i GeneticSharp.Templates
Expand Down
8 changes: 5 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version: 2.6.{build}
os: Visual Studio 2017
version: 3.0.{build}
os: Visual Studio 2022
configuration: Release
environment:
clone_folder: c:\gs
Expand All @@ -14,13 +14,15 @@ assembly_info:

install:
- cmd: choco install gtksharp
- cmd: dotnet tool install --global Cake.Tool

before_build:
- cmd: dotnet --version
- cmd: setJavaVersionForSonar.cmd

build_script:
# Cake.
- ps: .\build.ps1
- cmd: dotnet cake

after_build:
# Build the GeneticSharp and GeneticSharp.Extensions NuGet packages.
Expand Down
10 changes: 5 additions & 5 deletions build.cake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#tool nuget:?package=MSBuild.SonarQube.Runner.Tool&version=4.6.0
#addin nuget:?package=Cake.Sonar&version=1.1.22
#addin nuget:?package=Cake.Git&version=0.19.0
#tool "nuget:?package=MSBuild.SonarQube.Runner.Tool&version=4.8.0"
#addin "nuget:?package=Cake.Sonar&version=1.1.30"
#addin "nuget:?package=Cake.Git&version=2.0.0"

var target = Argument("target", "Default");
var solutionDir = "src";
Expand All @@ -13,12 +13,12 @@ if (string.IsNullOrEmpty(sonarLogin))
Task("Build")
.Does(() =>
{
var settings = new DotNetCoreBuildSettings
var settings = new DotNetBuildSettings
{
Configuration = "Release",
};
DotNetCoreBuild(solutionDir, settings);
DotNetBuild(solutionDir, settings);
});

Task("Test")
Expand Down
256 changes: 0 additions & 256 deletions build.ps1

This file was deleted.

2 changes: 1 addition & 1 deletion buildLibrariesNuget.cmd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SET PACKAGE_VERSION="2.6.0"
SET PACKAGE_VERSION="3.0.0"

mkdir .\src\nuget
dotnet pack src/GeneticSharp.Domain/GeneticSharp.Domain.csproj -c release --no-build --output ../nuget /p:PackageVersion=%PACKAGE_VERSION%
Expand Down
2 changes: 1 addition & 1 deletion buildTemplatesNuget.cmd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SET PACKAGE_VERSION=1.1.0
SET PACKAGE_VERSION=3.0.0

cd .\src\Templates

Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "2.2.108"
"version": "6.0.400"
}
}
5 changes: 5 additions & 0 deletions setJavaVersionForSonar.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
set JAVA_HOME=C:\Program Files\Java\jdk15
set Path=%JAVA_HOME%\bin;%Path%
echo Java 15 activated.
echo %JAVA_HOME%
java -version
1 change: 0 additions & 1 deletion src/GeneticSharp.Benchmarks/ChromosomesBenchmark.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using BenchmarkDotNet.Attributes;
using GeneticSharp.Domain.Chromosomes;

namespace GeneticSharp.Benchmarks
{
Expand Down
Loading

0 comments on commit e4f8a19

Please sign in to comment.