diff --git a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj index aaf0d9cf..f5b03c6a 100644 --- a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj +++ b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj @@ -59,8 +59,11 @@ + + 2.2.4 + - 3.0.0-preview3.19153.1 + 2.2.4 1.1.5.188 @@ -75,7 +78,7 @@ 1.68.0 - 1.6.258-beta + 1.5.231 1.1.13 @@ -89,12 +92,6 @@ 4.5.0 - - 4.5.2 - - - 4.5.1 - 1.1.0 diff --git a/AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj b/AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj index 0fdef3af..53eda31e 100644 --- a/AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj +++ b/AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj @@ -65,59 +65,59 @@ ..\..\packages\Markdig.0.16.0\lib\net40\Markdig.dll - - ..\..\packages\Microsoft.Data.Sqlite.Core.3.0.0-preview3.19153.1\lib\netstandard2.0\Microsoft.Data.Sqlite.dll + + ..\..\packages\Microsoft.Data.Sqlite.Core.2.2.4\lib\netstandard2.0\Microsoft.Data.Sqlite.dll - - ..\..\packages\Microsoft.DotNet.PlatformAbstractions.3.0.0-preview3-27503-5\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll + + ..\..\packages\Microsoft.DotNet.PlatformAbstractions.2.1.0\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll - - ..\..\packages\Microsoft.EntityFrameworkCore.3.0.0-preview3.19153.1\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll + + ..\..\packages\Microsoft.EntityFrameworkCore.2.2.4\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll - - ..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.0.0-preview3.19153.1\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll + + ..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.2.2.4\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll - - ..\..\packages\Microsoft.EntityFrameworkCore.Relational.3.0.0-preview3.19153.1\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Relational.dll + + ..\..\packages\Microsoft.EntityFrameworkCore.Relational.2.2.4\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Relational.dll - - ..\..\packages\Microsoft.EntityFrameworkCore.Sqlite.Core.3.0.0-preview3.19153.1\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Sqlite.dll + + ..\..\packages\Microsoft.EntityFrameworkCore.Sqlite.Core.2.2.4\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Sqlite.dll - - ..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.0.0-preview3.19153.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll + + ..\..\packages\Microsoft.Extensions.Caching.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll - - ..\..\packages\Microsoft.Extensions.Caching.Memory.3.0.0-preview3.19153.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll + + ..\..\packages\Microsoft.Extensions.Caching.Memory.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll - - ..\..\packages\Microsoft.Extensions.Configuration.3.0.0-preview3.19153.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll + + ..\..\packages\Microsoft.Extensions.Configuration.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll - - ..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.0.0-preview3.19153.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll + + ..\..\packages\Microsoft.Extensions.Configuration.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll - - ..\..\packages\Microsoft.Extensions.Configuration.Binder.3.0.0-preview3.19153.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll + + ..\..\packages\Microsoft.Extensions.Configuration.Binder.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll - - ..\..\packages\Microsoft.Extensions.DependencyInjection.3.0.0-preview3.19153.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll + + ..\..\packages\Microsoft.Extensions.DependencyInjection.2.2.0\lib\net461\Microsoft.Extensions.DependencyInjection.dll - - ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.0.0-preview3.19153.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\..\packages\Microsoft.Extensions.DependencyModel.3.0.0-preview3-27503-5\lib\net451\Microsoft.Extensions.DependencyModel.dll + + ..\..\packages\Microsoft.Extensions.DependencyModel.2.1.0\lib\net451\Microsoft.Extensions.DependencyModel.dll - - ..\..\packages\Microsoft.Extensions.Logging.3.0.0-preview3.19153.1\lib\netstandard2.0\Microsoft.Extensions.Logging.dll + + ..\..\packages\Microsoft.Extensions.Logging.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.dll - - ..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.0.0-preview3.19153.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + + ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll - - ..\..\packages\Microsoft.Extensions.Options.3.0.0-preview3.19153.1\lib\netstandard2.0\Microsoft.Extensions.Options.dll + + ..\..\packages\Microsoft.Extensions.Options.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll - - ..\..\packages\Microsoft.Extensions.Primitives.3.0.0-preview3.19153.1\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll + + ..\..\packages\Microsoft.Extensions.Primitives.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll ..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll @@ -147,8 +147,8 @@ ..\..\packages\SkiaSharp.Views.1.68.0\lib\net45\SkiaSharp.Views.WPF.dll - - ..\..\packages\sqlite-net-pcl.1.6.258-beta\lib\netstandard1.1\SQLite-net.dll + + ..\..\packages\sqlite-net-pcl.1.5.231\lib\netstandard1.1\SQLite-net.dll ..\..\packages\SQLitePCLRaw.bundle_green.1.1.13\lib\net45\SQLitePCLRaw.batteries_green.dll @@ -166,48 +166,39 @@ ..\..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll - - ..\..\packages\System.Collections.Immutable.1.6.0-preview3.19128.7\lib\netstandard2.0\System.Collections.Immutable.dll + + ..\..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll - - ..\..\packages\System.ComponentModel.Annotations.4.6.0-preview3.19128.7\lib\net461\System.ComponentModel.Annotations.dll + + ..\..\packages\System.ComponentModel.Annotations.4.5.0\lib\net461\System.ComponentModel.Annotations.dll - - ..\..\packages\System.Diagnostics.DiagnosticSource.4.6.0-preview3.19128.7\lib\net46\System.Diagnostics.DiagnosticSource.dll + + ..\..\packages\System.Diagnostics.DiagnosticSource.4.5.0\lib\net46\System.Diagnostics.DiagnosticSource.dll ..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll - - ..\..\packages\System.Interactive.Async.4.0.0-preview.1.build.745\lib\net46\System.Interactive.Async.dll - - - ..\..\packages\System.Linq.Async.4.0.0-preview.1.build.745\lib\net46\System.Linq.Async.dll + + ..\..\packages\System.Interactive.Async.3.2.0\lib\net46\System.Interactive.Async.dll - ..\..\packages\System.Memory.4.5.2\lib\netstandard2.0\System.Memory.dll + ..\..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll - - ..\..\packages\System.Numerics.Vectors.4.6.0-preview3.19128.7\lib\net46\System.Numerics.Vectors.dll + + ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0-preview3.19128.7\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll ..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll True True - - ..\..\packages\System.Text.Encoding.CodePages.4.5.1\lib\net461\System.Text.Encoding.CodePages.dll - - - ..\..\packages\System.Threading.Tasks.Extensions.4.6.0-preview.18571.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll - diff --git a/AideDeJeu/AideDeJeu.GTK/app.config b/AideDeJeu/AideDeJeu.GTK/app.config index 24dd85c9..d7dffb75 100644 --- a/AideDeJeu/AideDeJeu.GTK/app.config +++ b/AideDeJeu/AideDeJeu.GTK/app.config @@ -4,11 +4,11 @@ - + - + @@ -16,7 +16,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -64,19 +64,19 @@ - + - + - + - + @@ -86,6 +86,26 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu.GTK/packages.config b/AideDeJeu/AideDeJeu.GTK/packages.config index 62562981..d82cfde3 100644 --- a/AideDeJeu/AideDeJeu.GTK/packages.config +++ b/AideDeJeu/AideDeJeu.GTK/packages.config @@ -1,32 +1,32 @@  - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + @@ -34,18 +34,15 @@ - - - + + + - - - - - + + + + - - diff --git a/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj b/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj index abfb35a8..a2844f1d 100644 --- a/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj +++ b/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj @@ -125,10 +125,10 @@ - 3.0.0-preview3.19153.1 + 2.2.4 - 3.0.0-preview3.19153.1 + 2.2.4 1.1.5.188 @@ -143,17 +143,11 @@ 1.68.0 - 1.6.258-beta + 1.5.231 4.5.0 - - 4.5.2 - - - 4.5.1 - 1.1.0 diff --git a/AideDeJeu/AideDeJeu/AideDeJeu.csproj b/AideDeJeu/AideDeJeu/AideDeJeu.csproj index 45ca2af9..bf276a78 100644 --- a/AideDeJeu/AideDeJeu/AideDeJeu.csproj +++ b/AideDeJeu/AideDeJeu/AideDeJeu.csproj @@ -72,14 +72,13 @@ - - + + - - + diff --git a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs index 4be4e3ac..333001c0 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs @@ -1192,7 +1192,7 @@ namespace AideDeJeu.ViewModels.PlayerCharacter //} //pdfDoc.close(); - System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance); + //System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance); //PdfDocument pdfDoc = new PdfDocument(new PdfWriter()); //var stream = DependencyService.Get().CreateStream("test.pdf"); var stream = new FileStream(Path.Combine(Xamarin.Essentials.FileSystem.CacheDirectory, "test.pdf"), FileMode.Create, FileAccess.ReadWrite); diff --git a/AideDeJeu/AideDeJeuCmd/AideDeJeuCmd.csproj b/AideDeJeu/AideDeJeuCmd/AideDeJeuCmd.csproj index 6dc90993..083c32c2 100644 --- a/AideDeJeu/AideDeJeuCmd/AideDeJeuCmd.csproj +++ b/AideDeJeu/AideDeJeuCmd/AideDeJeuCmd.csproj @@ -12,9 +12,9 @@ - - - + + + diff --git a/AideDeJeu/AideDeJeuUnitTest/AideDeJeuUnitTest.csproj b/AideDeJeu/AideDeJeuUnitTest/AideDeJeuUnitTest.csproj index e1eb13cc..2f3be817 100644 --- a/AideDeJeu/AideDeJeuUnitTest/AideDeJeuUnitTest.csproj +++ b/AideDeJeu/AideDeJeuUnitTest/AideDeJeuUnitTest.csproj @@ -8,12 +8,10 @@ - + + - - - - + diff --git a/AideDeJeu/AideDeJeuWeb/AideDeJeuWeb.csproj b/AideDeJeu/AideDeJeuWeb/AideDeJeuWeb.csproj index ac957268..7e3e1320 100644 --- a/AideDeJeu/AideDeJeuWeb/AideDeJeuWeb.csproj +++ b/AideDeJeu/AideDeJeuWeb/AideDeJeuWeb.csproj @@ -11,9 +11,9 @@ - - - + + +