From cd74a3d29fac9d0501c6c7197ddbaa25e9765a5e Mon Sep 17 00:00:00 2001 From: Anton Kasyanov Date: Mon, 4 Mar 2019 21:17:03 +0200 Subject: [PATCH] NuGet packages update --- Eve-O-Preview/Eve-O-Preview.csproj | 33 +++--- Eve-O-Preview/FodyWeavers.xml | 2 +- Eve-O-Preview/FodyWeavers.xsd | 111 ++++++++++++++++++ .../Configuration/SaveConfigurationHandler.cs | 4 +- .../Services/StartStopServiceHandler.cs | 8 +- Eve-O-Preview/Program.cs | 4 +- Eve-O-Preview/packages.config | 11 +- 7 files changed, 144 insertions(+), 29 deletions(-) create mode 100644 Eve-O-Preview/FodyWeavers.xsd diff --git a/Eve-O-Preview/Eve-O-Preview.csproj b/Eve-O-Preview/Eve-O-Preview.csproj index 30d8b89..c469a1f 100644 --- a/Eve-O-Preview/Eve-O-Preview.csproj +++ b/Eve-O-Preview/Eve-O-Preview.csproj @@ -1,5 +1,6 @@  + Debug AnyCPU @@ -75,24 +76,29 @@ app.manifest - - ..\packages\Costura.Fody.1.6.2\lib\dotnet\Costura.dll - False + + ..\packages\Costura.Fody.3.3.2\lib\net40\Costura.dll - - ..\packages\LightInject.5.1.2\lib\net452\LightInject.dll - True + + ..\packages\LightInject.5.4.0\lib\net46\LightInject.dll - - ..\packages\MediatR.4.0.1\lib\net45\MediatR.dll + + ..\packages\MediatR.6.0.0\lib\net461\MediatR.dll - - ..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + + + + + + ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + @@ -221,15 +227,14 @@ + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - - + + + + + + + + + A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks + + + + + A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. + + + + + A list of unmanaged 32 bit assembly names to include, delimited with line breaks. + + + + + A list of unmanaged 64 bit assembly names to include, delimited with line breaks. + + + + + The order of preloaded assemblies, delimited with line breaks. + + + + + + This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file. + + + + + Controls if .pdbs for reference assemblies are also embedded. + + + + + Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option. + + + + + As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off. + + + + + Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code. + + + + + Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior. + + + + + A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with | + + + + + A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |. + + + + + A list of unmanaged 32 bit assembly names to include, delimited with |. + + + + + A list of unmanaged 64 bit assembly names to include, delimited with |. + + + + + The order of preloaded assemblies, delimited with |. + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/Eve-O-Preview/Mediator/Handlers/Configuration/SaveConfigurationHandler.cs b/Eve-O-Preview/Mediator/Handlers/Configuration/SaveConfigurationHandler.cs index c870f7a..f1b2db2 100644 --- a/Eve-O-Preview/Mediator/Handlers/Configuration/SaveConfigurationHandler.cs +++ b/Eve-O-Preview/Mediator/Handlers/Configuration/SaveConfigurationHandler.cs @@ -15,11 +15,11 @@ namespace EveOPreview.Mediator.Handlers.Configuration this._storage = storage; } - public Task Handle(SaveConfiguration message, CancellationToken cancellationToken) + public Task Handle(SaveConfiguration message, CancellationToken cancellationToken) { this._storage.Save(); - return Task.CompletedTask; + return Unit.Task; } } } \ No newline at end of file diff --git a/Eve-O-Preview/Mediator/Handlers/Services/StartStopServiceHandler.cs b/Eve-O-Preview/Mediator/Handlers/Services/StartStopServiceHandler.cs index 2b34cdb..896ba68 100644 --- a/Eve-O-Preview/Mediator/Handlers/Services/StartStopServiceHandler.cs +++ b/Eve-O-Preview/Mediator/Handlers/Services/StartStopServiceHandler.cs @@ -15,18 +15,18 @@ namespace EveOPreview.Mediator.Handlers.Services this._manager = manager; } - public Task Handle(StartService message, CancellationToken cancellationToken) + public Task Handle(StartService message, CancellationToken cancellationToken) { this._manager.Start(); - return Task.CompletedTask; + return Unit.Task; } - public Task Handle(StopService message, CancellationToken cancellationToken) + public Task Handle(StopService message, CancellationToken cancellationToken) { this._manager.Stop(); - return Task.CompletedTask; + return Unit.Task; } } } \ No newline at end of file diff --git a/Eve-O-Preview/Program.cs b/Eve-O-Preview/Program.cs index eb723f5..f681020 100644 --- a/Eve-O-Preview/Program.cs +++ b/Eve-O-Preview/Program.cs @@ -4,7 +4,6 @@ using System.Windows.Forms; using EveOPreview.Configuration; using EveOPreview.Presenters; using EveOPreview.Services; -using EveOPreview.UI; using EveOPreview.View; using MediatR; @@ -80,8 +79,7 @@ namespace EveOPreview // MediatR container.Register(); - container.RegisterInstance(t => container.Resolve(t)); - container.RegisterInstance(t => container.ResolveAll(t)); + container.RegisterInstance(t => container.Resolve(t)); container.Register(typeof(INotificationHandler<>), typeof(Program).Assembly); container.Register(typeof(IRequestHandler<>), typeof(Program).Assembly); container.Register(typeof(IRequestHandler<,>), typeof(Program).Assembly); diff --git a/Eve-O-Preview/packages.config b/Eve-O-Preview/packages.config index b04a818..7b4d3e0 100644 --- a/Eve-O-Preview/packages.config +++ b/Eve-O-Preview/packages.config @@ -1,8 +1,9 @@  - - - - - + + + + + + \ No newline at end of file