From c598fa00aa0a4604c4f22aba2092760bb2371428 Mon Sep 17 00:00:00 2001 From: giacomelli Date: Sat, 3 Sep 2022 08:00:54 -0300 Subject: [PATCH] Changed TargetFramework to net6.0, updated the NuGet packages and small fixes/code upgrades. --- appveyor.yml | 2 +- global.json | 2 +- src/GeneticSharp.Benchmarks/DefaultConfig.cs | 10 +++++++--- .../GeneticSharp.Benchmarks.csproj | 6 +++--- .../GeneticAlgorithmTest.cs | 12 ++++++------ .../GeneticSharp.Domain.UnitTests.csproj | 8 ++++---- .../Crossovers/CrossoverException.cs | 1 - .../Fitnesses/FitnessException.cs | 3 +-- src/GeneticSharp.Domain/GeneticSharp.Domain.csproj | 2 +- .../Mutations/MutationException.cs | 3 +-- .../Reinsertions/ReinsertionException.cs | 1 - .../Selections/SelectionException.cs | 3 +-- .../GeneticSharp.Extensions.UnitTests.csproj | 4 ++-- .../Sudoku/SudokuRandomPermutationsChromosomeTest.cs | 2 +- .../GeneticSharp.Extensions.csproj | 2 +- ...icSharp.Infrastructure.Framework.UnitTests.csproj | 4 ++-- .../GeneticSharp.Infrastructure.Framework.csproj | 2 +- .../GeneticSharp.Runner.BlazorApp.csproj | 2 +- .../GeneticSharp.Runner.ConsoleApp.csproj | 9 ++++----- .../GeneticSharp.Runner.GtkApp.csproj | 8 ++------ .../Samples/BitmapEqualitySampleController.cs | 8 ++++---- .../Issue1Sample/Issue1Sample/Issue1Sample.csproj | 2 +- .../Issue40Sample/Issue40Sample/Issue40Sample.csproj | 2 +- .../Issue9Sample/Issue9Sample/Issue9Sample.csproj | 2 +- src/Templates/content/ConsoleApp/ConsoleApp.csproj | 2 +- .../content/TspBlazorApp/TspBlazorApp.csproj | 2 +- .../content/TspConsoleApp/TspConsoleApp.csproj | 2 +- src/msbuilds/GeneticSharp.app.targets | 2 +- 28 files changed, 51 insertions(+), 57 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a6614084..7a3c5204 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ version: 2.6.{build} -os: Visual Studio 2017 +os: Visual Studio 2022 configuration: Release environment: clone_folder: c:\gs diff --git a/global.json b/global.json index 389b9e6d..a05a252d 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "2.2.108" + "version": "6.0.400" } } \ No newline at end of file diff --git a/src/GeneticSharp.Benchmarks/DefaultConfig.cs b/src/GeneticSharp.Benchmarks/DefaultConfig.cs index 670e6c3d..2c2436a3 100644 --- a/src/GeneticSharp.Benchmarks/DefaultConfig.cs +++ b/src/GeneticSharp.Benchmarks/DefaultConfig.cs @@ -1,5 +1,6 @@ using BenchmarkDotNet.Columns; using BenchmarkDotNet.Configs; +using BenchmarkDotNet.Environments; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Order; @@ -9,10 +10,13 @@ public class DefaultConfig : ManualConfig { public DefaultConfig() { - Set(new DefaultOrderer(SummaryOrderPolicy.Default, MethodOrderPolicy.Alphabetical)); - Add(RankColumn.Arabic); + + Orderer = new DefaultOrderer(SummaryOrderPolicy.Default, MethodOrderPolicy.Alphabetical); - Add(Job.Core + AddColumn(RankColumn.Arabic); + + AddJob(Job.Default + .WithRuntime(CoreRuntime.Core60) .WithMinIterationCount(15) .WithMaxIterationCount(100)); } diff --git a/src/GeneticSharp.Benchmarks/GeneticSharp.Benchmarks.csproj b/src/GeneticSharp.Benchmarks/GeneticSharp.Benchmarks.csproj index 54cd28db..e4c5aeff 100644 --- a/src/GeneticSharp.Benchmarks/GeneticSharp.Benchmarks.csproj +++ b/src/GeneticSharp.Benchmarks/GeneticSharp.Benchmarks.csproj @@ -1,6 +1,6 @@ - netcoreapp2.1;net462 + net6.0 Exe win7-x86;osx-x64;linux-x64 1.2.0 @@ -12,7 +12,7 @@ - - + + diff --git a/src/GeneticSharp.Domain.UnitTests/GeneticAlgorithmTest.cs b/src/GeneticSharp.Domain.UnitTests/GeneticAlgorithmTest.cs index f3e8bf70..4c902d83 100644 --- a/src/GeneticSharp.Domain.UnitTests/GeneticAlgorithmTest.cs +++ b/src/GeneticSharp.Domain.UnitTests/GeneticAlgorithmTest.cs @@ -151,17 +151,17 @@ public void Start_ParallelManyGenerations_Optimization() target.TaskExecutor = taskExecutor; Assert.AreEqual(GeneticAlgorithmState.NotStarted, target.State); - Assert.IsFalse(target.IsRunning); + Assert.IsFalse(target.IsRunning, "Should not be running before start"); target.Start(); Assert.AreEqual(GeneticAlgorithmState.TerminationReached, target.State); - Assert.IsFalse(target.IsRunning); - Assert.IsTrue(target.Population.CurrentGeneration.Chromosomes.Count >= 100); - Assert.IsTrue(target.Population.CurrentGeneration.Chromosomes.Count <= 150); + Assert.IsFalse(target.IsRunning, "Should not be running anymore"); + Assert.IsTrue(target.Population.CurrentGeneration.Chromosomes.Count >= 100, "Chromosomes shoud be equal or greater than 100"); + Assert.IsTrue(target.Population.CurrentGeneration.Chromosomes.Count <= 150, "Chromosomes shoud be equal or less than 150"); Assert.IsNotNull(target.Population.BestChromosome); - Assert.IsTrue(target.Population.BestChromosome.Fitness >= 0.9); - Assert.IsTrue(target.Population.Generations.Count > 0); + Assert.IsTrue(target.Population.BestChromosome.Fitness >= 0.9, $"Fitness should be equal or greater than 0.9, but is {target.Population.BestChromosome.Fitness}"); + Assert.IsTrue(target.Population.Generations.Count > 0, "Generations should be greater than 0"); }); FlowAssert.IsAtLeastOneAttemptOk(20, () => diff --git a/src/GeneticSharp.Domain.UnitTests/GeneticSharp.Domain.UnitTests.csproj b/src/GeneticSharp.Domain.UnitTests/GeneticSharp.Domain.UnitTests.csproj index ad15fb74..41979281 100644 --- a/src/GeneticSharp.Domain.UnitTests/GeneticSharp.Domain.UnitTests.csproj +++ b/src/GeneticSharp.Domain.UnitTests/GeneticSharp.Domain.UnitTests.csproj @@ -4,7 +4,7 @@ - netcoreapp2.0;net462 + net6.0 @@ -14,13 +14,13 @@ - + all runtime; build; native; contentfiles; analyzers - + - + \ No newline at end of file diff --git a/src/GeneticSharp.Domain/Crossovers/CrossoverException.cs b/src/GeneticSharp.Domain/Crossovers/CrossoverException.cs index 267686b8..2d20c964 100644 --- a/src/GeneticSharp.Domain/Crossovers/CrossoverException.cs +++ b/src/GeneticSharp.Domain/Crossovers/CrossoverException.cs @@ -90,7 +90,6 @@ private CrossoverException(SerializationInfo info, StreamingContext context) /// /// /// - [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)] public override void GetObjectData(SerializationInfo info, StreamingContext context) { base.GetObjectData(info, context); diff --git a/src/GeneticSharp.Domain/Fitnesses/FitnessException.cs b/src/GeneticSharp.Domain/Fitnesses/FitnessException.cs index 3486e133..64290d66 100644 --- a/src/GeneticSharp.Domain/Fitnesses/FitnessException.cs +++ b/src/GeneticSharp.Domain/Fitnesses/FitnessException.cs @@ -85,8 +85,7 @@ private FitnessException(SerializationInfo info, StreamingContext context) /// Sets the with information about the exception. /// /// The that holds the serialized object data about the exception being thrown. - /// The that contains contextual information about the source or destination. - [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)] + /// The that contains contextual information about the source or destination. public override void GetObjectData(SerializationInfo info, StreamingContext context) { base.GetObjectData(info, context); diff --git a/src/GeneticSharp.Domain/GeneticSharp.Domain.csproj b/src/GeneticSharp.Domain/GeneticSharp.Domain.csproj index e63d2935..7a1566e4 100644 --- a/src/GeneticSharp.Domain/GeneticSharp.Domain.csproj +++ b/src/GeneticSharp.Domain/GeneticSharp.Domain.csproj @@ -3,7 +3,7 @@ - netstandard2.0;net462 + net6.0 GeneticSharp.Domain diff --git a/src/GeneticSharp.Domain/Mutations/MutationException.cs b/src/GeneticSharp.Domain/Mutations/MutationException.cs index bcf1a575..c8070c5a 100644 --- a/src/GeneticSharp.Domain/Mutations/MutationException.cs +++ b/src/GeneticSharp.Domain/Mutations/MutationException.cs @@ -89,8 +89,7 @@ private MutationException(SerializationInfo info, StreamingContext context) /// /// /// - /// - [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)] + /// public override void GetObjectData(SerializationInfo info, StreamingContext context) { base.GetObjectData(info, context); diff --git a/src/GeneticSharp.Domain/Reinsertions/ReinsertionException.cs b/src/GeneticSharp.Domain/Reinsertions/ReinsertionException.cs index 5cbdd62a..4faced06 100644 --- a/src/GeneticSharp.Domain/Reinsertions/ReinsertionException.cs +++ b/src/GeneticSharp.Domain/Reinsertions/ReinsertionException.cs @@ -90,7 +90,6 @@ private ReinsertionException(SerializationInfo info, StreamingContext context) /// /// /// - [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)] public override void GetObjectData(SerializationInfo info, StreamingContext context) { base.GetObjectData(info, context); diff --git a/src/GeneticSharp.Domain/Selections/SelectionException.cs b/src/GeneticSharp.Domain/Selections/SelectionException.cs index 3da50f62..9d65ce9e 100644 --- a/src/GeneticSharp.Domain/Selections/SelectionException.cs +++ b/src/GeneticSharp.Domain/Selections/SelectionException.cs @@ -89,8 +89,7 @@ private SelectionException(SerializationInfo info, StreamingContext context) /// /// /// - /// - [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)] + /// public override void GetObjectData(SerializationInfo info, StreamingContext context) { base.GetObjectData(info, context); diff --git a/src/GeneticSharp.Extensions.UnitTests/GeneticSharp.Extensions.UnitTests.csproj b/src/GeneticSharp.Extensions.UnitTests/GeneticSharp.Extensions.UnitTests.csproj index b492dccc..1c4d6138 100644 --- a/src/GeneticSharp.Extensions.UnitTests/GeneticSharp.Extensions.UnitTests.csproj +++ b/src/GeneticSharp.Extensions.UnitTests/GeneticSharp.Extensions.UnitTests.csproj @@ -4,7 +4,7 @@ - netcoreapp2.0;net462 + net6.0 @@ -18,7 +18,7 @@ all runtime; build; native; contentfiles; analyzers - + diff --git a/src/GeneticSharp.Extensions.UnitTests/Sudoku/SudokuRandomPermutationsChromosomeTest.cs b/src/GeneticSharp.Extensions.UnitTests/Sudoku/SudokuRandomPermutationsChromosomeTest.cs index f720bd81..239432a9 100644 --- a/src/GeneticSharp.Extensions.UnitTests/Sudoku/SudokuRandomPermutationsChromosomeTest.cs +++ b/src/GeneticSharp.Extensions.UnitTests/Sudoku/SudokuRandomPermutationsChromosomeTest.cs @@ -47,7 +47,7 @@ public void Evolve_RandomPermutationsChromosome_VeryEasySudoku_Solved() var sudoku = SudokuTestHelper.CreateBoard(SudokuTestDifficulty.VeryEasy); IChromosome chromosome = new SudokuRandomPermutationsChromosome(sudoku,2,3); - var fitness = SudokuTestHelper.Eval(chromosome, sudoku, 50, 0, 10); + var fitness = SudokuTestHelper.Eval(chromosome, sudoku, 50, 0, 100); Assert.AreEqual( 0, fitness); } diff --git a/src/GeneticSharp.Extensions/GeneticSharp.Extensions.csproj b/src/GeneticSharp.Extensions/GeneticSharp.Extensions.csproj index 988aff06..d00a526f 100644 --- a/src/GeneticSharp.Extensions/GeneticSharp.Extensions.csproj +++ b/src/GeneticSharp.Extensions/GeneticSharp.Extensions.csproj @@ -3,7 +3,7 @@ - netstandard2.0;net462 + net6.0 GeneticSharp.Extensions Skahal Studios GeneticSharp diff --git a/src/GeneticSharp.Infrastructure.Framework.UnitTests/GeneticSharp.Infrastructure.Framework.UnitTests.csproj b/src/GeneticSharp.Infrastructure.Framework.UnitTests/GeneticSharp.Infrastructure.Framework.UnitTests.csproj index e68dcb8e..f02af23e 100644 --- a/src/GeneticSharp.Infrastructure.Framework.UnitTests/GeneticSharp.Infrastructure.Framework.UnitTests.csproj +++ b/src/GeneticSharp.Infrastructure.Framework.UnitTests/GeneticSharp.Infrastructure.Framework.UnitTests.csproj @@ -4,7 +4,7 @@ - netcoreapp2.0;net462 + net6.0 @@ -17,7 +17,7 @@ all runtime; build; native; contentfiles; analyzers - + diff --git a/src/GeneticSharp.Infrastructure.Framework/GeneticSharp.Infrastructure.Framework.csproj b/src/GeneticSharp.Infrastructure.Framework/GeneticSharp.Infrastructure.Framework.csproj index 703de71b..41cd7d94 100644 --- a/src/GeneticSharp.Infrastructure.Framework/GeneticSharp.Infrastructure.Framework.csproj +++ b/src/GeneticSharp.Infrastructure.Framework/GeneticSharp.Infrastructure.Framework.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net462 + net6.0 GeneticSharp.Infrastructure.Framework GeneticSharp.Infrastructure.Framework diff --git a/src/GeneticSharp.Runner.BlazorApp/GeneticSharp.Runner.BlazorApp.csproj b/src/GeneticSharp.Runner.BlazorApp/GeneticSharp.Runner.BlazorApp.csproj index cf5e0b7d..2a7caebf 100644 --- a/src/GeneticSharp.Runner.BlazorApp/GeneticSharp.Runner.BlazorApp.csproj +++ b/src/GeneticSharp.Runner.BlazorApp/GeneticSharp.Runner.BlazorApp.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net6.0 7.3 3.0 diff --git a/src/GeneticSharp.Runner.ConsoleApp/GeneticSharp.Runner.ConsoleApp.csproj b/src/GeneticSharp.Runner.ConsoleApp/GeneticSharp.Runner.ConsoleApp.csproj index 6da036b0..0924fc4b 100644 --- a/src/GeneticSharp.Runner.ConsoleApp/GeneticSharp.Runner.ConsoleApp.csproj +++ b/src/GeneticSharp.Runner.ConsoleApp/GeneticSharp.Runner.ConsoleApp.csproj @@ -4,17 +4,16 @@ - netcoreapp2.0;net462 + net6.0 Exe win7-x86;osx-x64;linux-x64 - - + - - + + diff --git a/src/GeneticSharp.Runner.GtkApp/GeneticSharp.Runner.GtkApp.csproj b/src/GeneticSharp.Runner.GtkApp/GeneticSharp.Runner.GtkApp.csproj index 15e7f02a..de4771f1 100644 --- a/src/GeneticSharp.Runner.GtkApp/GeneticSharp.Runner.GtkApp.csproj +++ b/src/GeneticSharp.Runner.GtkApp/GeneticSharp.Runner.GtkApp.csproj @@ -1,7 +1,7 @@  - net462 + net6.0 x86 @@ -19,10 +19,6 @@ - - - - @@ -51,7 +47,7 @@ - + references\Windows_NT\atk-sharp.dll diff --git a/src/GeneticSharp.Runner.GtkApp/Samples/BitmapEqualitySampleController.cs b/src/GeneticSharp.Runner.GtkApp/Samples/BitmapEqualitySampleController.cs index d56b0176..3d06a5a4 100644 --- a/src/GeneticSharp.Runner.GtkApp/Samples/BitmapEqualitySampleController.cs +++ b/src/GeneticSharp.Runner.GtkApp/Samples/BitmapEqualitySampleController.cs @@ -10,9 +10,9 @@ using GeneticSharp.Extensions.Drawing; using GeneticSharp.Infrastructure.Framework.Texts; using Gtk; -using GeneticSharp.Infrastructure.Framework.Commons; using GeneticSharp.Domain; using GeneticSharp.Infrastructure.Framework.Threading; +using System.Drawing.Imaging; namespace GeneticSharp.Runner.GtkApp.Samples { @@ -134,15 +134,15 @@ public override void Draw() using (var ms = new MemoryStream()) { - var converter = new ImageConverter(); - var imageBytes = (byte[])converter.ConvertTo(bitmap, typeof(byte[])); + bitmap.Save(ms, ImageFormat.Png); + var imageBytes = ms.ToArray(); var pb = new Gdk.Pixbuf(imageBytes); var width = Context.DrawingArea.Width; var height = Context.DrawingArea.Height; pb = pb.ScaleSimple(width, height, Gdk.InterpType.Nearest); - buffer.DrawPixbuf(gc, pb, 0, 0, 0, 100, width, height, Gdk.RgbDither.None, 0, 0); + buffer.DrawPixbuf(gc, pb, 0, 0, 0, 100, width, height, Gdk.RgbDither.None, 0, 0); } } diff --git a/src/Samples/Issue1Sample/Issue1Sample/Issue1Sample.csproj b/src/Samples/Issue1Sample/Issue1Sample/Issue1Sample.csproj index 6e7e47cc..69d9141d 100644 --- a/src/Samples/Issue1Sample/Issue1Sample/Issue1Sample.csproj +++ b/src/Samples/Issue1Sample/Issue1Sample/Issue1Sample.csproj @@ -5,7 +5,7 @@ - netcoreapp2.0 + net6.0 Exe win7-x86;osx-x64;linux-x64 diff --git a/src/Samples/Issue40Sample/Issue40Sample/Issue40Sample.csproj b/src/Samples/Issue40Sample/Issue40Sample/Issue40Sample.csproj index bca115d7..cce49419 100644 --- a/src/Samples/Issue40Sample/Issue40Sample/Issue40Sample.csproj +++ b/src/Samples/Issue40Sample/Issue40Sample/Issue40Sample.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.1 + net6.0 diff --git a/src/Samples/Issue9Sample/Issue9Sample/Issue9Sample.csproj b/src/Samples/Issue9Sample/Issue9Sample/Issue9Sample.csproj index 14260d90..0a72f2cc 100644 --- a/src/Samples/Issue9Sample/Issue9Sample/Issue9Sample.csproj +++ b/src/Samples/Issue9Sample/Issue9Sample/Issue9Sample.csproj @@ -5,7 +5,7 @@ - netcoreapp2.0 + net6.0 Exe win7-x86;osx-x64;linux-x64 diff --git a/src/Templates/content/ConsoleApp/ConsoleApp.csproj b/src/Templates/content/ConsoleApp/ConsoleApp.csproj index e649fd77..c485b52a 100644 --- a/src/Templates/content/ConsoleApp/ConsoleApp.csproj +++ b/src/Templates/content/ConsoleApp/ConsoleApp.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.1 + net6.0 diff --git a/src/Templates/content/TspBlazorApp/TspBlazorApp.csproj b/src/Templates/content/TspBlazorApp/TspBlazorApp.csproj index cf5e0b7d..2a7caebf 100644 --- a/src/Templates/content/TspBlazorApp/TspBlazorApp.csproj +++ b/src/Templates/content/TspBlazorApp/TspBlazorApp.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net6.0 7.3 3.0 diff --git a/src/Templates/content/TspConsoleApp/TspConsoleApp.csproj b/src/Templates/content/TspConsoleApp/TspConsoleApp.csproj index 1ebbd76f..d7287840 100644 --- a/src/Templates/content/TspConsoleApp/TspConsoleApp.csproj +++ b/src/Templates/content/TspConsoleApp/TspConsoleApp.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.1 + net6.0 diff --git a/src/msbuilds/GeneticSharp.app.targets b/src/msbuilds/GeneticSharp.app.targets index 0be11472..5fad90ad 100644 --- a/src/msbuilds/GeneticSharp.app.targets +++ b/src/msbuilds/GeneticSharp.app.targets @@ -1,6 +1,6 @@ - netcoreapp2.0;net462 + net6.0 false \ No newline at end of file