From b3248d408ae1f029792b8873b0c74de6dd19b7ea Mon Sep 17 00:00:00 2001 From: Igor Matsak Date: Tue, 21 Jan 2020 22:18:20 +0300 Subject: [PATCH] update version to v1.0.27 --- Atomex.Client.Core | 2 +- Atomex.Client.Wpf.Installer/Product.wxs | 2 +- Atomex.Client.Wpf.Tests/app.config | 44 +--- Atomex.Client.Wpf/App.config | 44 +--- Atomex.Client.Wpf/Atomex.Client.Wpf.csproj | 248 ++++++++------------- Atomex.Client.Wpf/packages.config | 103 ++++----- 6 files changed, 159 insertions(+), 284 deletions(-) diff --git a/Atomex.Client.Core b/Atomex.Client.Core index 96192b9..c8ecf56 160000 --- a/Atomex.Client.Core +++ b/Atomex.Client.Core @@ -1 +1 @@ -Subproject commit 96192b96bc9561956a486e5ee98c71d9acdaad2e +Subproject commit c8ecf56f1f7c0939493569fd0d99f7cf52f6af85 diff --git a/Atomex.Client.Wpf.Installer/Product.wxs b/Atomex.Client.Wpf.Installer/Product.wxs index 1306d78..be4e22c 100644 --- a/Atomex.Client.Wpf.Installer/Product.wxs +++ b/Atomex.Client.Wpf.Installer/Product.wxs @@ -3,7 +3,7 @@ - + diff --git a/Atomex.Client.Wpf.Tests/app.config b/Atomex.Client.Wpf.Tests/app.config index b6293c7..1513705 100644 --- a/Atomex.Client.Wpf.Tests/app.config +++ b/Atomex.Client.Wpf.Tests/app.config @@ -12,27 +12,27 @@ - + - + - + - + - + - + @@ -54,38 +54,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Atomex.Client.Wpf/App.config b/Atomex.Client.Wpf/App.config index faeec34..0117543 100644 --- a/Atomex.Client.Wpf/App.config +++ b/Atomex.Client.Wpf/App.config @@ -15,23 +15,23 @@ - + - + - + - + - + @@ -43,7 +43,7 @@ - + @@ -61,38 +61,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Atomex.Client.Wpf/Atomex.Client.Wpf.csproj b/Atomex.Client.Wpf/Atomex.Client.Wpf.csproj index eea96fd..854bc23 100644 --- a/Atomex.Client.Wpf/Atomex.Client.Wpf.csproj +++ b/Atomex.Client.Wpf/Atomex.Client.Wpf.csproj @@ -63,7 +63,7 @@ - ..\packages\Portable.BouncyCastle.1.8.5.2\lib\net40\BouncyCastle.Crypto.dll + ..\packages\Portable.BouncyCastle.1.8.5\lib\net40\BouncyCastle.Crypto.dll ..\packages\Common.Logging.Core.3.4.1\lib\net40\Common.Logging.Core.dll @@ -71,202 +71,141 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll + + ..\packages\Info.Blockchain.API.Standart.1.0.4\lib\netstandard2.0\Info.Blockchain.API.Standart.dll + ..\packages\LiteDB.4.1.4\lib\net40\LiteDB.dll ..\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.dll - - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.BoxIcons.dll - - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.Core.dll - - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.Entypo.dll - - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.EvaIcons.dll - - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.FeatherIcons.dll - - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.FontAwesome.dll - - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.Ionicons.dll - - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.JamIcons.dll - - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.Material.dll - - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.MaterialDesign.dll - - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.MaterialLight.dll - - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.Microns.dll - - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.Modern.dll - - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.Octicons.dll - - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.PicolIcons.dll - - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.RPGAwesome.dll - - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.SimpleIcons.dll - - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.Typicons.dll - - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.Unicons.dll - - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.WeatherIcons.dll - - - ..\packages\MahApps.Metro.IconPacks.3.1.0\lib\net46\MahApps.Metro.IconPacks.Zondicons.dll + + ..\packages\MahApps.Metro.IconPacks.2.3.0\lib\net46\MahApps.Metro.IconPacks.dll - ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll ..\packages\Microsoft.DotNet.InternalAbstractions.1.0.0\lib\net451\Microsoft.DotNet.InternalAbstractions.dll - - ..\packages\Microsoft.DotNet.PlatformAbstractions.3.1.1\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll + + ..\packages\Microsoft.DotNet.PlatformAbstractions.3.0.0\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll - - ..\packages\Microsoft.Extensions.Configuration.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll + + ..\packages\Microsoft.Extensions.Configuration.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll - - ..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll + + ..\packages\Microsoft.Extensions.Configuration.Abstractions.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll - - ..\packages\Microsoft.Extensions.Configuration.Binder.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll + + ..\packages\Microsoft.Extensions.Configuration.Binder.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll - - ..\packages\Microsoft.Extensions.Configuration.FileExtensions.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.FileExtensions.dll + + ..\packages\Microsoft.Extensions.Configuration.FileExtensions.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.FileExtensions.dll - - ..\packages\Microsoft.Extensions.Configuration.Json.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Json.dll + + ..\packages\Microsoft.Extensions.Configuration.Json.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Json.dll - - ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\packages\Microsoft.Extensions.DependencyModel.3.1.1\lib\net451\Microsoft.Extensions.DependencyModel.dll + + ..\packages\Microsoft.Extensions.DependencyModel.3.0.0\lib\net451\Microsoft.Extensions.DependencyModel.dll - - ..\packages\Microsoft.Extensions.FileProviders.Abstractions.3.1.1\lib\netstandard2.0\Microsoft.Extensions.FileProviders.Abstractions.dll + + ..\packages\Microsoft.Extensions.FileProviders.Abstractions.3.0.0\lib\netstandard2.0\Microsoft.Extensions.FileProviders.Abstractions.dll - - ..\packages\Microsoft.Extensions.FileProviders.Physical.3.1.1\lib\netstandard2.0\Microsoft.Extensions.FileProviders.Physical.dll + + ..\packages\Microsoft.Extensions.FileProviders.Physical.3.0.0\lib\netstandard2.0\Microsoft.Extensions.FileProviders.Physical.dll - - ..\packages\Microsoft.Extensions.FileSystemGlobbing.3.1.1\lib\netstandard2.0\Microsoft.Extensions.FileSystemGlobbing.dll + + ..\packages\Microsoft.Extensions.FileSystemGlobbing.3.0.0\lib\netstandard2.0\Microsoft.Extensions.FileSystemGlobbing.dll - - ..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + + ..\packages\Microsoft.Extensions.Logging.Abstractions.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll - - ..\packages\Microsoft.Extensions.Options.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Options.dll + + ..\packages\Microsoft.Extensions.Options.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll - - ..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll + + ..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll - - ..\packages\Microsoft.Extensions.Primitives.3.1.1\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll + + ..\packages\Microsoft.Extensions.Primitives.3.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll - - ..\packages\NBitcoin.5.0.13\lib\net461\NBitcoin.dll + + ..\packages\NBitcoin.4.2.15\lib\net461\NBitcoin.dll - - ..\packages\NBitcoin.Altcoins.2.0.5.1\lib\net452\NBitcoin.Altcoins.dll + + ..\packages\NBitcoin.Altcoins.1.0.5\lib\net452\NBitcoin.Altcoins.dll - - ..\packages\Nethereum.ABI.3.5.0\lib\net451\Nethereum.ABI.dll + + ..\packages\Nethereum.ABI.3.4.0\lib\net451\Nethereum.ABI.dll - - ..\packages\Nethereum.Accounts.3.5.0\lib\net451\Nethereum.Accounts.dll + + ..\packages\Nethereum.Accounts.3.4.0\lib\net451\Nethereum.Accounts.dll - - ..\packages\Nethereum.BlockchainProcessing.3.5.0\lib\net451\Nethereum.BlockchainProcessing.dll + + ..\packages\Nethereum.BlockchainProcessing.3.4.0\lib\net451\Nethereum.BlockchainProcessing.dll - - ..\packages\Nethereum.Contracts.3.5.0\lib\net451\Nethereum.Contracts.dll + + ..\packages\Nethereum.Contracts.3.4.0\lib\net451\Nethereum.Contracts.dll - - ..\packages\Nethereum.HdWallet.3.5.0\lib\net452\Nethereum.HdWallet.dll + + ..\packages\Nethereum.HdWallet.3.4.0\lib\net452\Nethereum.HdWallet.dll - - ..\packages\Nethereum.Hex.3.5.0\lib\net451\Nethereum.Hex.dll + + ..\packages\Nethereum.Hex.3.4.0\lib\net451\Nethereum.Hex.dll - - ..\packages\Nethereum.JsonRpc.Client.3.5.0\lib\net451\Nethereum.JsonRpc.Client.dll + + ..\packages\Nethereum.JsonRpc.Client.3.4.0\lib\net451\Nethereum.JsonRpc.Client.dll - - ..\packages\Nethereum.JsonRpc.RpcClient.3.5.0\lib\net451\Nethereum.JsonRpc.RpcClient.dll + + ..\packages\Nethereum.JsonRpc.RpcClient.3.4.0\lib\net451\Nethereum.JsonRpc.RpcClient.dll - - ..\packages\Nethereum.JsonRpc.WebSocketClient.3.5.0\lib\net461\Nethereum.JsonRpc.WebSocketClient.dll + + ..\packages\Nethereum.JsonRpc.WebSocketClient.3.4.0\lib\net461\Nethereum.JsonRpc.WebSocketClient.dll - - ..\packages\Nethereum.KeyStore.3.5.0\lib\net451\Nethereum.KeyStore.dll + + ..\packages\Nethereum.KeyStore.3.4.0\lib\net451\Nethereum.KeyStore.dll - - ..\packages\Nethereum.Model.3.5.0\lib\net451\Nethereum.Model.dll + + ..\packages\Nethereum.Model.3.4.0\lib\net451\Nethereum.Model.dll - - ..\packages\Nethereum.RLP.3.5.0\lib\net451\Nethereum.RLP.dll + + ..\packages\Nethereum.RLP.3.4.0\lib\net451\Nethereum.RLP.dll - - ..\packages\Nethereum.RPC.3.5.0\lib\net451\Nethereum.RPC.dll + + ..\packages\Nethereum.RPC.3.4.0\lib\net451\Nethereum.RPC.dll - - ..\packages\Nethereum.Signer.3.5.0\lib\net451\Nethereum.Signer.dll + + ..\packages\Nethereum.Signer.3.4.0\lib\net451\Nethereum.Signer.dll - - ..\packages\Nethereum.Util.3.5.0\lib\net451\Nethereum.Util.dll + + ..\packages\Nethereum.Util.3.4.0\lib\net451\Nethereum.Util.dll - - ..\packages\Nethereum.Web3.3.5.0\lib\net451\Nethereum.Web3.dll + + ..\packages\Nethereum.Web3.3.4.0\lib\net451\Nethereum.Web3.dll - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\OxyPlot.Core.2.0.0\lib\net45\OxyPlot.dll + + ..\packages\OxyPlot.Core.1.0.0\lib\net45\OxyPlot.dll - - ..\packages\OxyPlot.Wpf.2.0.0\lib\net45\OxyPlot.Wpf.dll + + ..\packages\OxyPlot.Wpf.1.0.0\lib\net45\OxyPlot.Wpf.dll - ..\packages\protobuf-net.2.4.4\lib\net40\protobuf-net.dll + ..\packages\protobuf-net.2.4.1\lib\net40\protobuf-net.dll ..\packages\QRCoder.1.3.6\lib\net40\QRCoder.dll - - ..\packages\Serilog.2.9.0\lib\net46\Serilog.dll + ..\packages\Serilog.2.8.0\lib\net46\Serilog.dll ..\packages\Serilog.Settings.Configuration.3.1.0\lib\net461\Serilog.Settings.Configuration.dll @@ -275,7 +214,7 @@ ..\packages\Serilog.Sinks.Console.3.1.1\lib\net45\Serilog.Sinks.Console.dll - ..\packages\Serilog.Sinks.File.4.1.0\lib\net45\Serilog.Sinks.File.dll + ..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll ..\packages\Serilog.Sinks.RollingFile.3.3.0\lib\net45\Serilog.Sinks.RollingFile.dll @@ -285,7 +224,7 @@ ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll - ..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll + ..\packages\System.ComponentModel.Annotations.4.6.0\lib\net461\System.ComponentModel.Annotations.dll @@ -293,7 +232,7 @@ - ..\packages\System.Drawing.Common.4.7.0\lib\net461\System.Drawing.Common.dll + ..\packages\System.Drawing.Common.4.6.0\lib\net461\System.Drawing.Common.dll ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll @@ -324,12 +263,11 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\packages\System.Reflection.TypeExtensions.4.7.0\lib\net461\System.Reflection.TypeExtensions.dll + + ..\packages\System.Reflection.TypeExtensions.4.6.0\lib\net461\System.Reflection.TypeExtensions.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -343,14 +281,14 @@ True - - ..\packages\System.Text.Encodings.Web.4.7.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + ..\packages\System.Text.Encodings.Web.4.6.0\lib\netstandard2.0\System.Text.Encodings.Web.dll - - ..\packages\System.Text.Json.4.7.0\lib\net461\System.Text.Json.dll + + ..\packages\System.Text.Json.4.6.0\lib\net461\System.Text.Json.dll - - ..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll diff --git a/Atomex.Client.Wpf/packages.config b/Atomex.Client.Wpf/packages.config index 7c3110b..d77b06c 100644 --- a/Atomex.Client.Wpf/packages.config +++ b/Atomex.Client.Wpf/packages.config @@ -3,69 +3,70 @@ + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - + + + + + - + - + - + - + @@ -87,10 +88,10 @@ - + - + @@ -102,12 +103,12 @@ - - + + - +