diff --git a/.gitignore b/.gitignore index b768c35..3fbf531 100644 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,5 @@ Translation/TrlUtil.vshost.exe.manifest *.nupkg .vs/ /UpgradeLog.htm -packages/ \ No newline at end of file +packages/ +project.lock.json \ No newline at end of file diff --git a/ModernKeePass.sln b/ModernKeePass.sln index c8ea3bb..4c07ef3 100644 --- a/ModernKeePass.sln +++ b/ModernKeePass.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePass", "ModernKeePass\ModernKeePass.csproj", "{A0CFC681-769B-405A-8482-0CDEE595A91F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePassLibPCL", "ModernKeePassLib\ModernKeePassLibPCL.csproj", "{2E710089-9559-4967-846C-E763DD1F3ACB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePassLib", "ModernKeePassLib\ModernKeePassLib.csproj", "{2E710089-9559-4967-846C-E763DD1F3ACB}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModernKeePassLib.Test", "ModernKeePassLib.Test\ModernKeePassLib.Test.csproj", "{067456C0-086C-46A8-B37F-1405717B7BFC}" ProjectSection(ProjectDependencies) = postProject diff --git a/ModernKeePass/Common/DatabaseHelper.cs b/ModernKeePass/Common/DatabaseHelper.cs index 4306b92..fe3153d 100644 --- a/ModernKeePass/Common/DatabaseHelper.cs +++ b/ModernKeePass/Common/DatabaseHelper.cs @@ -2,10 +2,10 @@ using Windows.Storage; using System.Threading.Tasks; using ModernKeePass.ViewModels; -using ModernKeePassLibPCL; -using ModernKeePassLibPCL.Interfaces; -using ModernKeePassLibPCL.Keys; -using ModernKeePassLibPCL.Serialization; +using ModernKeePassLib; +using ModernKeePassLib.Interfaces; +using ModernKeePassLib.Keys; +using ModernKeePassLib.Serialization; namespace ModernKeePass.Common { diff --git a/ModernKeePass/ModernKeePass.csproj b/ModernKeePass/ModernKeePass.csproj index 426196d..8d42de0 100644 --- a/ModernKeePass/ModernKeePass.csproj +++ b/ModernKeePass/ModernKeePass.csproj @@ -159,30 +159,10 @@ - - ..\packages\Portable.BouncyCastle.1.8.1.1\lib\netstandard1.0\crypto.dll - True - - - ..\packages\ModernKeePassLibPCL.2.28.1.25559\lib\netstandard1.2\ModernKeePassLibPCL.dll - True - - - ..\packages\PInvoke.Windows.Core.0.5.97\lib\portable-net45+win8+wpa81\PInvoke.Windows.Core.dll - True - - - ..\packages\Splat.2.0.0\lib\Portable-Win81+Wpa81\Splat.dll - True - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\win8\System.Runtime.InteropServices.RuntimeInformation.dll True - - ..\packages\Validation.2.4.15\lib\portable-net45+win8+wp8+wpa81\Validation.dll - True - diff --git a/ModernKeePass/Package.appxmanifest b/ModernKeePass/Package.appxmanifest index 258607f..a5a024d 100644 --- a/ModernKeePass/Package.appxmanifest +++ b/ModernKeePass/Package.appxmanifest @@ -1,6 +1,6 @@  - + ModernKeePass wismna diff --git a/ModernKeePass/ViewModels/EntryVm.cs b/ModernKeePass/ViewModels/EntryVm.cs index a7c6826..69f7354 100644 --- a/ModernKeePass/ViewModels/EntryVm.cs +++ b/ModernKeePass/ViewModels/EntryVm.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -using ModernKeePassLibPCL; -using ModernKeePassLibPCL.Security; +using ModernKeePassLib; +using ModernKeePassLib.Security; namespace ModernKeePass.ViewModels { diff --git a/ModernKeePass/ViewModels/GroupVm.cs b/ModernKeePass/ViewModels/GroupVm.cs index 624f12f..653cfbb 100644 --- a/ModernKeePass/ViewModels/GroupVm.cs +++ b/ModernKeePass/ViewModels/GroupVm.cs @@ -1,7 +1,7 @@ using System.Collections.ObjectModel; using System.ComponentModel; using System.Linq; -using ModernKeePassLibPCL; +using ModernKeePassLib; namespace ModernKeePass.ViewModels { diff --git a/ModernKeePass/packages.config b/ModernKeePass/packages.config index 9289d4a..b80f9f4 100644 --- a/ModernKeePass/packages.config +++ b/ModernKeePass/packages.config @@ -1,19 +1,8 @@  - - - - - - - - - - - @@ -31,5 +20,4 @@ - \ No newline at end of file diff --git a/ModernKeePassLib.Test/Cryptography/Cipher/StandardAesEngineTests.cs b/ModernKeePassLib.Test/Cryptography/Cipher/StandardAesEngineTests.cs index 81ac274..50580cd 100644 --- a/ModernKeePassLib.Test/Cryptography/Cipher/StandardAesEngineTests.cs +++ b/ModernKeePassLib.Test/Cryptography/Cipher/StandardAesEngineTests.cs @@ -4,7 +4,7 @@ using System.IO; #if KeePassLib using KeePassLib.Cryptography.Cipher; #else -using ModernKeePassLibPCL.Cryptography.Cipher; +using ModernKeePassLib.Cryptography.Cipher; #endif using NUnit.Framework; diff --git a/ModernKeePassLib.Test/Cryptography/CryptoRandomStreamTests.cs b/ModernKeePassLib.Test/Cryptography/CryptoRandomStreamTests.cs index e71feb0..39ff6a0 100644 --- a/ModernKeePassLib.Test/Cryptography/CryptoRandomStreamTests.cs +++ b/ModernKeePassLib.Test/Cryptography/CryptoRandomStreamTests.cs @@ -4,7 +4,7 @@ using System; #if KeePassLib using KeePassLib.Cryptography; #else -using ModernKeePassLibPCL.Cryptography; +using ModernKeePassLib.Cryptography; #endif namespace ModernKeePassLib.Test.Shared.Cryptography diff --git a/ModernKeePassLib.Test/Cryptography/CryptoRandomTests.cs b/ModernKeePassLib.Test/Cryptography/CryptoRandomTests.cs index e1d3eae..c94b3b6 100644 --- a/ModernKeePassLib.Test/Cryptography/CryptoRandomTests.cs +++ b/ModernKeePassLib.Test/Cryptography/CryptoRandomTests.cs @@ -4,7 +4,7 @@ using System; #if KeePassLib using KeePassLib.Cryptography; #else -using ModernKeePassLibPCL.Cryptography; +using ModernKeePassLib.Cryptography; #endif namespace ModernKeePassLib.Test.Shared.Cryptography diff --git a/ModernKeePassLib.Test/Cryptography/HashingStreamExTests.cs b/ModernKeePassLib.Test/Cryptography/HashingStreamExTests.cs index a1d1b2a..59c4980 100644 --- a/ModernKeePassLib.Test/Cryptography/HashingStreamExTests.cs +++ b/ModernKeePassLib.Test/Cryptography/HashingStreamExTests.cs @@ -6,7 +6,7 @@ using System.Text; #if KeePassLib using KeePassLib.Cryptography; #else -using ModernKeePassLibPCL.Cryptography; +using ModernKeePassLib.Cryptography; #endif namespace ModernKeePassLib.Test.Shared.Cryptography diff --git a/ModernKeePassLib.Test/Cryptography/HmacOtpTests.cs b/ModernKeePassLib.Test/Cryptography/HmacOtpTests.cs index 563c29d..894b979 100644 --- a/ModernKeePassLib.Test/Cryptography/HmacOtpTests.cs +++ b/ModernKeePassLib.Test/Cryptography/HmacOtpTests.cs @@ -5,7 +5,7 @@ using System.Text; #if KeePassLib using KeePassLib.Cryptography; #else -using ModernKeePassLibPCL.Cryptography; +using ModernKeePassLib.Cryptography; #endif namespace ModernKeePassLib.Test.Shared.Cryptography diff --git a/ModernKeePassLib.Test/Keys/CompositeKeyTests.cs b/ModernKeePassLib.Test/Keys/CompositeKeyTests.cs index a5a4b4a..c740cbe 100644 --- a/ModernKeePassLib.Test/Keys/CompositeKeyTests.cs +++ b/ModernKeePassLib.Test/Keys/CompositeKeyTests.cs @@ -4,7 +4,7 @@ using System; #if KeePassLib using KeePassLib.Keys; #else -using ModernKeePassLibPCL.Keys; +using ModernKeePassLib.Keys; #endif namespace ModernKeePassLib.Test.Shared.Keys diff --git a/ModernKeePassLib.Test/Keys/KcpCustomKeyTests.cs b/ModernKeePassLib.Test/Keys/KcpCustomKeyTests.cs index 62ad9a2..0df7709 100644 --- a/ModernKeePassLib.Test/Keys/KcpCustomKeyTests.cs +++ b/ModernKeePassLib.Test/Keys/KcpCustomKeyTests.cs @@ -4,7 +4,7 @@ using System; #if KeePassLib using KeePassLib.Keys; #else -using ModernKeePassLibPCL.Keys; +using ModernKeePassLib.Keys; #endif namespace ModernKeePassLib.Test.Shared.Keys diff --git a/ModernKeePassLib.Test/Keys/KcpKeyFileTests.cs b/ModernKeePassLib.Test/Keys/KcpKeyFileTests.cs index 0cd3053..f00ee71 100644 --- a/ModernKeePassLib.Test/Keys/KcpKeyFileTests.cs +++ b/ModernKeePassLib.Test/Keys/KcpKeyFileTests.cs @@ -5,7 +5,7 @@ using System.IO; #if KeePassLib using KeePassLib.Keys; #else -using ModernKeePassLibPCL.Keys; +using ModernKeePassLib.Keys; #endif namespace ModernKeePassLib.Test.Shared.Keys diff --git a/ModernKeePassLib.Test/Keys/KcpPasswordTests.cs b/ModernKeePassLib.Test/Keys/KcpPasswordTests.cs index 779115b..4dc794b 100644 --- a/ModernKeePassLib.Test/Keys/KcpPasswordTests.cs +++ b/ModernKeePassLib.Test/Keys/KcpPasswordTests.cs @@ -4,7 +4,7 @@ using System; #if KeePassLib using KeePassLib.Keys; #else -using ModernKeePassLibPCL.Keys; +using ModernKeePassLib.Keys; #endif namespace ModernKeePassLib.Test.Shared.Keys diff --git a/ModernKeePassLib.Test/ModernKeePassLib.Test.csproj b/ModernKeePassLib.Test/ModernKeePassLib.Test.csproj index ddc2348..772d146 100644 --- a/ModernKeePassLib.Test/ModernKeePassLib.Test.csproj +++ b/ModernKeePassLib.Test/ModernKeePassLib.Test.csproj @@ -73,9 +73,9 @@ - + {2e710089-9559-4967-846c-e763dd1f3acb} - ModernKeePassLibPCL + ModernKeePassLib diff --git a/ModernKeePassLib.Test/Serialization/HashedBlockStreamTests.cs b/ModernKeePassLib.Test/Serialization/HashedBlockStreamTests.cs index 07f3ba4..926e91a 100644 --- a/ModernKeePassLib.Test/Serialization/HashedBlockStreamTests.cs +++ b/ModernKeePassLib.Test/Serialization/HashedBlockStreamTests.cs @@ -5,7 +5,7 @@ using System.IO; #if KeePassLib using KeePassLib.Serialization; #else -using ModernKeePassLibPCL.Serialization; +using ModernKeePassLib.Serialization; #endif namespace ModernKeePassLib.Test.Shared.Serialization diff --git a/ModernKeePassLib.Test/Serialization/KdbxFileTests.cs b/ModernKeePassLib.Test/Serialization/KdbxFileTests.cs index 861e2dc..18d4bf9 100644 --- a/ModernKeePassLib.Test/Serialization/KdbxFileTests.cs +++ b/ModernKeePassLib.Test/Serialization/KdbxFileTests.cs @@ -12,11 +12,11 @@ using KeePassLib.Security; using KeePassLib.Serialization; using KeePassLib.Collections; #else -using ModernKeePassLibPCL; -using ModernKeePassLibPCL.Keys; -using ModernKeePassLibPCL.Security; -using ModernKeePassLibPCL.Serialization; -using ModernKeePassLibPCL.Collections; +using ModernKeePassLib; +using ModernKeePassLib.Keys; +using ModernKeePassLib.Security; +using ModernKeePassLib.Serialization; +using ModernKeePassLib.Collections; #endif namespace ModernKeePassLib.Test.Shared.Serialization diff --git a/ModernKeePassLib.Test/Utility/GfxUtilTests.cs b/ModernKeePassLib.Test/Utility/GfxUtilTests.cs index 66fd853..9ae1ee1 100644 --- a/ModernKeePassLib.Test/Utility/GfxUtilTests.cs +++ b/ModernKeePassLib.Test/Utility/GfxUtilTests.cs @@ -5,7 +5,7 @@ using System; using KeePassLib.Utility; #else using Splat; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Utility; #endif namespace ModernKeePassLib.Test.Shared.Utility diff --git a/ModernKeePassLib/Collections/AutoTypeConfig.cs b/ModernKeePassLib/Collections/AutoTypeConfig.cs index 8670811..c6b2396 100644 --- a/ModernKeePassLib/Collections/AutoTypeConfig.cs +++ b/ModernKeePassLib/Collections/AutoTypeConfig.cs @@ -21,9 +21,9 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using ModernKeePassLibPCL.Interfaces; +using ModernKeePassLib.Interfaces; -namespace ModernKeePassLibPCL.Collections +namespace ModernKeePassLib.Collections { [Flags] public enum AutoTypeObfuscationOptions diff --git a/ModernKeePassLib/Collections/ProtectedBinaryDictionary.cs b/ModernKeePassLib/Collections/ProtectedBinaryDictionary.cs index afd9457..5dd132c 100644 --- a/ModernKeePassLib/Collections/ProtectedBinaryDictionary.cs +++ b/ModernKeePassLib/Collections/ProtectedBinaryDictionary.cs @@ -23,15 +23,15 @@ using System.Collections.Generic; using System.Text; using System.Diagnostics; -using ModernKeePassLibPCL.Interfaces; -using ModernKeePassLibPCL.Security; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Interfaces; +using ModernKeePassLib.Security; +using ModernKeePassLib.Utility; #if KeePassLibSD using KeePassLibSD; #endif -namespace ModernKeePassLibPCL.Collections +namespace ModernKeePassLib.Collections { /// /// A list of ProtectedBinary objects (dictionary). diff --git a/ModernKeePassLib/Collections/ProtectedStringDictionary.cs b/ModernKeePassLib/Collections/ProtectedStringDictionary.cs index 2eea87c..00c418b 100644 --- a/ModernKeePassLib/Collections/ProtectedStringDictionary.cs +++ b/ModernKeePassLib/Collections/ProtectedStringDictionary.cs @@ -23,15 +23,15 @@ using System.Collections.Generic; using System.Diagnostics; using System.Text; -using ModernKeePassLibPCL.Interfaces; -using ModernKeePassLibPCL.Security; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Interfaces; +using ModernKeePassLib.Security; +using ModernKeePassLib.Utility; #if KeePassLibSD using KeePassLibSD; #endif -namespace ModernKeePassLibPCL.Collections +namespace ModernKeePassLib.Collections { /// /// A list of ProtectedString objects (dictionary). diff --git a/ModernKeePassLib/Collections/PwObjectList.cs b/ModernKeePassLib/Collections/PwObjectList.cs index da3ebfd..7820aa3 100644 --- a/ModernKeePassLib/Collections/PwObjectList.cs +++ b/ModernKeePassLib/Collections/PwObjectList.cs @@ -22,9 +22,9 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics; -using ModernKeePassLibPCL.Interfaces; +using ModernKeePassLib.Interfaces; -namespace ModernKeePassLibPCL.Collections +namespace ModernKeePassLib.Collections { /// /// List of objects that implement IDeepCloneable, diff --git a/ModernKeePassLib/Collections/PwObjectPool.cs b/ModernKeePassLib/Collections/PwObjectPool.cs index 89de624..5bad39e 100644 --- a/ModernKeePassLib/Collections/PwObjectPool.cs +++ b/ModernKeePassLib/Collections/PwObjectPool.cs @@ -22,14 +22,14 @@ using System.Collections.Generic; using System.Text; using System.Diagnostics; -using ModernKeePassLibPCL.Delegates; -using ModernKeePassLibPCL.Interfaces; +using ModernKeePassLib.Delegates; +using ModernKeePassLib.Interfaces; #if KeePassLibSD using KeePassLibSD; #endif -namespace ModernKeePassLibPCL.Collections +namespace ModernKeePassLib.Collections { public sealed class PwObjectPool { diff --git a/ModernKeePassLib/Collections/StringDictionaryEx.cs b/ModernKeePassLib/Collections/StringDictionaryEx.cs index 585612f..b6f8232 100644 --- a/ModernKeePassLib/Collections/StringDictionaryEx.cs +++ b/ModernKeePassLib/Collections/StringDictionaryEx.cs @@ -23,13 +23,13 @@ using System.Collections.Generic; using System.Text; using System.Diagnostics; -using ModernKeePassLibPCL.Interfaces; +using ModernKeePassLib.Interfaces; #if KeePassLibSD using KeePassLibSD; #endif -namespace ModernKeePassLibPCL.Collections +namespace ModernKeePassLib.Collections { public sealed class StringDictionaryEx : IDeepCloneable, IEnumerable> diff --git a/ModernKeePassLib/Cryptography/Cipher/CipherPool.cs b/ModernKeePassLib/Cryptography/Cipher/CipherPool.cs index 8fcc533..9b76314 100644 --- a/ModernKeePassLib/Cryptography/Cipher/CipherPool.cs +++ b/ModernKeePassLib/Cryptography/Cipher/CipherPool.cs @@ -24,7 +24,7 @@ using System.IO; using System.Diagnostics; using System.Security; -namespace ModernKeePassLibPCL.Cryptography.Cipher +namespace ModernKeePassLib.Cryptography.Cipher { /// /// Pool of encryption/decryption algorithms (ciphers). diff --git a/ModernKeePassLib/Cryptography/Cipher/ICipherEngine.cs b/ModernKeePassLib/Cryptography/Cipher/ICipherEngine.cs index a9f5736..d529c0b 100644 --- a/ModernKeePassLib/Cryptography/Cipher/ICipherEngine.cs +++ b/ModernKeePassLib/Cryptography/Cipher/ICipherEngine.cs @@ -20,7 +20,7 @@ using System; using System.IO; -namespace ModernKeePassLibPCL.Cryptography.Cipher +namespace ModernKeePassLib.Cryptography.Cipher { /// /// Interface of an encryption/decryption class. diff --git a/ModernKeePassLib/Cryptography/Cipher/Salsa20Cipher.cs b/ModernKeePassLib/Cryptography/Cipher/Salsa20Cipher.cs index a738614..c841189 100644 --- a/ModernKeePassLib/Cryptography/Cipher/Salsa20Cipher.cs +++ b/ModernKeePassLib/Cryptography/Cipher/Salsa20Cipher.cs @@ -22,9 +22,9 @@ using System; using System.Diagnostics; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL.Cryptography.Cipher +namespace ModernKeePassLib.Cryptography.Cipher { public sealed class Salsa20Cipher : IDisposable { diff --git a/ModernKeePassLib/Cryptography/Cipher/StandardAesEngine.cs b/ModernKeePassLib/Cryptography/Cipher/StandardAesEngine.cs index c038e4a..d8bfd3d 100644 --- a/ModernKeePassLib/Cryptography/Cipher/StandardAesEngine.cs +++ b/ModernKeePassLib/Cryptography/Cipher/StandardAesEngine.cs @@ -24,7 +24,7 @@ using System.IO; using System.Security; using System.Diagnostics; using Windows.Storage.Streams; -#if ModernKeePassLibPCL +#if ModernKeePassLib using Windows.Security.Cryptography; using Windows.Security.Cryptography.Core; #else @@ -42,7 +42,7 @@ using Org.BouncyCastle.Crypto.Parameters; #endif -using ModernKeePassLibPCL.Resources; +using ModernKeePassLib.Resources; using Org.BouncyCastle.Crypto; using Org.BouncyCastle.Crypto.Engines; using Org.BouncyCastle.Crypto.IO; @@ -50,14 +50,14 @@ using Org.BouncyCastle.Crypto.Modes; using Org.BouncyCastle.Crypto.Paddings; using Org.BouncyCastle.Crypto.Parameters; -namespace ModernKeePassLibPCL.Cryptography.Cipher +namespace ModernKeePassLib.Cryptography.Cipher { /// /// Standard AES cipher implementation. /// public sealed class StandardAesEngine : ICipherEngine { -#if !ModernKeePassLibPCL && !KeePassRT +#if !ModernKeePassLib && !KeePassRT private const CipherMode m_rCipherMode = CipherMode.CBC; private const PaddingMode m_rCipherPadding = PaddingMode.PKCS7; #endif @@ -129,8 +129,8 @@ namespace ModernKeePassLibPCL.Cryptography.Cipher byte[] pbLocalKey = new byte[32]; Array.Copy(pbKey, pbLocalKey, 32); -#if !ModernKeePassLibPCL -//#if ModernKeePassLibPCL +#if !ModernKeePassLib +//#if ModernKeePassLib /*var provider = WinRTCrypto.SymmetricKeyAlgorithmProvider. OpenAlgorithm(SymmetricAlgorithm.AesCbcPkcs7); var key = provider.CreateSymmetricKey(pbLocalKey); @@ -173,7 +173,7 @@ namespace ModernKeePassLibPCL.Cryptography.Cipher //#else //#if !KeePassRT -//#if !ModernKeePassLibPCL +//#if !ModernKeePassLib RijndaelManaged r = new RijndaelManaged(); if(r.BlockSize != 128) // AES block size { diff --git a/ModernKeePassLib/Cryptography/CryptoRandom.cs b/ModernKeePassLib/Cryptography/CryptoRandom.cs index 5c76fa1..9d775c6 100644 --- a/ModernKeePassLib/Cryptography/CryptoRandom.cs +++ b/ModernKeePassLib/Cryptography/CryptoRandom.cs @@ -19,7 +19,7 @@ using System; using System.Security; -#if ModernKeePassLibPCL +#if ModernKeePassLib using Windows.Security.Cryptography; #else using System.Security.Cryptography; @@ -27,11 +27,11 @@ using System.Security.Cryptography; using System.IO; using System.Diagnostics; -using ModernKeePassLibPCL.Native; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Native; +using ModernKeePassLib.Utility; using Windows.Security.Cryptography.Core; -namespace ModernKeePassLibPCL.Cryptography +namespace ModernKeePassLib.Cryptography { /// /// Cryptographically strong random number generator. The returned values @@ -42,7 +42,7 @@ namespace ModernKeePassLibPCL.Cryptography { private byte[] m_pbEntropyPool = new byte[64]; private uint m_uCounter; -#if ModernKeePassLibPCL +#if ModernKeePassLib //private IRandomNumberGenerator m_rng = NetFxCrypto.RandomNumberGenerator; #else private RNGCryptoServiceProvider m_rng = new RNGCryptoServiceProvider(); @@ -107,7 +107,7 @@ namespace ModernKeePassLibPCL.Cryptography byte[] pbNewData = pbEntropy; if(pbEntropy.Length >= 64) { -#if ModernKeePassLibPCL +#if ModernKeePassLib /*var shaNew = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha512); pbNewData = shaNew.HashData(pbEntropy);*/ var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256); @@ -132,7 +132,7 @@ namespace ModernKeePassLibPCL.Cryptography ms.Write(pbNewData, 0, pbNewData.Length); byte[] pbFinal = ms.ToArray(); -#if ModernKeePassLibPCL +#if ModernKeePassLib /*var shaPool = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha512); m_pbEntropyPool = shaPool.HashData(pbFinal);*/ var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256); @@ -164,7 +164,7 @@ namespace ModernKeePassLibPCL.Cryptography pb = TimeUtil.PackTime(DateTime.Now); ms.Write(pb, 0, pb.Length); -#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT) +#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT) // In try-catch for systems without GUI; // https://sourceforge.net/p/keepass/discussion/329221/thread/20335b73/ try @@ -181,7 +181,7 @@ namespace ModernKeePassLibPCL.Cryptography pb = MemUtil.UInt32ToBytes((uint)rWeak.Next()); ms.Write(pb, 0, pb.Length); -#if ModernKeePassLibPCL +#if ModernKeePassLib pb = MemUtil.UInt32ToBytes((uint)Environment.ProcessorCount); ms.Write(pb, 0, pb.Length); @@ -192,7 +192,7 @@ namespace ModernKeePassLibPCL.Cryptography ms.Write(pb, 0, pb.Length); #endif -#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT) +#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT) Process p = null; try { @@ -287,7 +287,7 @@ namespace ModernKeePassLibPCL.Cryptography m_uGeneratedBytesCount += 32; } -#if ModernKeePassLibPCL +#if ModernKeePassLib /*var sha256 = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha256); return sha256.HashData(pbFinal);*/ var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256); @@ -322,7 +322,7 @@ namespace ModernKeePassLibPCL.Cryptography long lCopy = (long)((uRequestedBytes < 32) ? uRequestedBytes : 32); -#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT) +#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT) Array.Copy(pbRandom256, 0, pbRes, lPos, lCopy); #else Array.Copy(pbRandom256, 0, pbRes, (int)lPos, (int)lCopy); diff --git a/ModernKeePassLib/Cryptography/CryptoRandomStream.cs b/ModernKeePassLib/Cryptography/CryptoRandomStream.cs index 0f57837..8a5e9d5 100644 --- a/ModernKeePassLib/Cryptography/CryptoRandomStream.cs +++ b/ModernKeePassLib/Cryptography/CryptoRandomStream.cs @@ -20,15 +20,15 @@ using System; using System.Diagnostics; using Windows.Security.Cryptography.Core; -#if ModernKeePassLibPCL +#if ModernKeePassLib using Windows.Security.Cryptography; #else using System.Security.Cryptography; #endif -using ModernKeePassLibPCL.Cryptography.Cipher; +using ModernKeePassLib.Cryptography.Cipher; -namespace ModernKeePassLibPCL.Cryptography +namespace ModernKeePassLib.Cryptography { /// /// Algorithms supported by CryptoRandomStream. @@ -116,7 +116,7 @@ namespace ModernKeePassLibPCL.Cryptography } else if(genAlgorithm == CrsAlgorithm.Salsa20) { -#if ModernKeePassLibPCL +#if ModernKeePassLib /*var sha256 = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha256); var pbKey32 = sha256.HashData(pbKey);*/ var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256); diff --git a/ModernKeePassLib/Cryptography/CryptographicHashExtensions.cs b/ModernKeePassLib/Cryptography/CryptographicHashExtensions.cs index e3a1679..43b0e74 100644 --- a/ModernKeePassLib/Cryptography/CryptographicHashExtensions.cs +++ b/ModernKeePassLib/Cryptography/CryptographicHashExtensions.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using Windows.Security.Cryptography.Core; -namespace ModernKeePassLibPCL.Cryptography +namespace ModernKeePassLib.Cryptography { public static class CryptographicHashExtensions { diff --git a/ModernKeePassLib/Cryptography/HashingStreamEx.cs b/ModernKeePassLib/Cryptography/HashingStreamEx.cs index 6c84a71..e58d772 100644 --- a/ModernKeePassLib/Cryptography/HashingStreamEx.cs +++ b/ModernKeePassLib/Cryptography/HashingStreamEx.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic; using System.Text; using System.IO; -#if ModernKeePassLibPCL +#if ModernKeePassLib using Windows.Security.Cryptography; using Windows.Security.Cryptography.Core; using Org.BouncyCastle.Crypto; @@ -31,16 +31,16 @@ using System.Security.Cryptography; #endif using System.Diagnostics; using System.Runtime.InteropServices.ComTypes; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Utility; using Org.BouncyCastle.Crypto.Tls; -namespace ModernKeePassLibPCL.Cryptography +namespace ModernKeePassLib.Cryptography { public sealed class HashingStreamEx : Stream { private Stream m_sBaseStream; private bool m_bWriting; -#if ModernKeePassLibPCL +#if ModernKeePassLib //private ICryptoTransform m_hash; //private CryptographicHash m_hash; private IDigest m_hash; @@ -81,7 +81,7 @@ namespace ModernKeePassLibPCL.Cryptography set { throw new NotSupportedException(); } } -#if ModernKeePassLibPCL +#if ModernKeePassLib //public HashingStreamEx(Stream sBaseStream, bool bWriting, HashAlgorithm? hashAlgorithm) public HashingStreamEx(Stream sBaseStream, bool bWriting, string hashAlgorithm) #else @@ -93,7 +93,7 @@ namespace ModernKeePassLibPCL.Cryptography m_sBaseStream = sBaseStream; m_bWriting = bWriting; -#if ModernKeePassLibPCL +#if ModernKeePassLib //m_hash = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(hashAlgorithm ?? HashAlgorithm.Sha256).CreateHash(); //m_hash = HashAlgorithmProvider.OpenAlgorithm(hashAlgorithm ?? HashAlgorithmNames.Sha256).CreateHash(); m_hash = new Sha256Digest(); @@ -125,7 +125,7 @@ namespace ModernKeePassLibPCL.Cryptography m_sBaseStream.Flush(); } -#if ModernKeePassLibPCL || KeePassRT +#if ModernKeePassLib || KeePassRT protected override void Dispose(bool disposing) { if(!disposing) return; @@ -138,7 +138,7 @@ namespace ModernKeePassLibPCL.Cryptography try { //m_hash.TransformFinalBlock(new byte[0], 0, 0); -#if ModernKeePassLibPCL +#if ModernKeePassLib //m_pbFinalHash = (m_hash as CryptographicHash).GetValueAndReset (); //CryptographicBuffer.CopyToByteArray(m_hash.GetValueAndReset(), out m_pbFinalHash); m_pbFinalHash = new byte[32]; diff --git a/ModernKeePassLib/Cryptography/HmacOtp.cs b/ModernKeePassLib/Cryptography/HmacOtp.cs index 80e0a9c..db34309 100644 --- a/ModernKeePassLib/Cryptography/HmacOtp.cs +++ b/ModernKeePassLib/Cryptography/HmacOtp.cs @@ -20,18 +20,18 @@ using System; using System.Collections.Generic; using System.Text; -#if ModernKeePassLibPCL +#if ModernKeePassLib using Windows.Security.Cryptography; #else using System.Security.Cryptography; #endif using System.Globalization; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Utility; using Windows.Security.Cryptography.Core; #if (!KeePassLibSD && !KeePassRT) -namespace ModernKeePassLibPCL.Cryptography +namespace ModernKeePassLib.Cryptography { /// /// Generate HMAC-based one-time passwords as specified in RFC 4226. @@ -47,7 +47,7 @@ namespace ModernKeePassLibPCL.Cryptography byte[] pbText = MemUtil.UInt64ToBytes(uFactor); Array.Reverse(pbText); // Big-Endian -#if ModernKeePassLibPCL +#if ModernKeePassLib /*var hsha1 = WinRTCrypto.MacAlgorithmProvider.OpenAlgorithm(MacAlgorithm.HmacSha1).CreateHash(pbSecret); hsha1.Append(pbText); var pbHash = hsha1.GetValueAndReset();*/ diff --git a/ModernKeePassLib/Cryptography/PasswordGenerator/CharSetBasedGenerator.cs b/ModernKeePassLib/Cryptography/PasswordGenerator/CharSetBasedGenerator.cs index 10772d7..228d513 100644 --- a/ModernKeePassLib/Cryptography/PasswordGenerator/CharSetBasedGenerator.cs +++ b/ModernKeePassLib/Cryptography/PasswordGenerator/CharSetBasedGenerator.cs @@ -22,10 +22,10 @@ using System.Collections.Generic; using System.Text; using System.Diagnostics; -using ModernKeePassLibPCL.Security; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Security; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL.Cryptography.PasswordGenerator +namespace ModernKeePassLib.Cryptography.PasswordGenerator { internal static class CharSetBasedGenerator { diff --git a/ModernKeePassLib/Cryptography/PasswordGenerator/CustomPwGenerator.cs b/ModernKeePassLib/Cryptography/PasswordGenerator/CustomPwGenerator.cs index fdd058f..c1df173 100644 --- a/ModernKeePassLib/Cryptography/PasswordGenerator/CustomPwGenerator.cs +++ b/ModernKeePassLib/Cryptography/PasswordGenerator/CustomPwGenerator.cs @@ -21,10 +21,10 @@ using System; using System.Collections.Generic; using System.Text; -using ModernKeePassLibPCL; -using ModernKeePassLibPCL.Security; +using ModernKeePassLib; +using ModernKeePassLib.Security; -namespace ModernKeePassLibPCL.Cryptography.PasswordGenerator +namespace ModernKeePassLib.Cryptography.PasswordGenerator { public abstract class CustomPwGenerator { diff --git a/ModernKeePassLib/Cryptography/PasswordGenerator/CustomPwGeneratorPool.cs b/ModernKeePassLib/Cryptography/PasswordGenerator/CustomPwGeneratorPool.cs index a377533..d3a55f7 100644 --- a/ModernKeePassLib/Cryptography/PasswordGenerator/CustomPwGeneratorPool.cs +++ b/ModernKeePassLib/Cryptography/PasswordGenerator/CustomPwGeneratorPool.cs @@ -22,7 +22,7 @@ using System.Collections; using System.Collections.Generic; using System.Text; -namespace ModernKeePassLibPCL.Cryptography.PasswordGenerator +namespace ModernKeePassLib.Cryptography.PasswordGenerator { public sealed class CustomPwGeneratorPool : IEnumerable { diff --git a/ModernKeePassLib/Cryptography/PasswordGenerator/PatternBasedGenerator.cs b/ModernKeePassLib/Cryptography/PasswordGenerator/PatternBasedGenerator.cs index 324642d..4ade1e8 100644 --- a/ModernKeePassLib/Cryptography/PasswordGenerator/PatternBasedGenerator.cs +++ b/ModernKeePassLib/Cryptography/PasswordGenerator/PatternBasedGenerator.cs @@ -22,10 +22,10 @@ using System.Collections.Generic; using System.Text; using System.Diagnostics; -using ModernKeePassLibPCL.Security; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Security; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL.Cryptography.PasswordGenerator +namespace ModernKeePassLib.Cryptography.PasswordGenerator { internal static class PatternBasedGenerator { diff --git a/ModernKeePassLib/Cryptography/PasswordGenerator/PwCharSet.cs b/ModernKeePassLib/Cryptography/PasswordGenerator/PwCharSet.cs index 3545136..b51e752 100644 --- a/ModernKeePassLib/Cryptography/PasswordGenerator/PwCharSet.cs +++ b/ModernKeePassLib/Cryptography/PasswordGenerator/PwCharSet.cs @@ -22,7 +22,7 @@ using System.Collections.Generic; using System.Text; using System.Diagnostics; -namespace ModernKeePassLibPCL.Cryptography.PasswordGenerator +namespace ModernKeePassLib.Cryptography.PasswordGenerator { public sealed class PwCharSet { diff --git a/ModernKeePassLib/Cryptography/PasswordGenerator/PwGenerator.cs b/ModernKeePassLib/Cryptography/PasswordGenerator/PwGenerator.cs index 5c19df5..01c5ea5 100644 --- a/ModernKeePassLib/Cryptography/PasswordGenerator/PwGenerator.cs +++ b/ModernKeePassLib/Cryptography/PasswordGenerator/PwGenerator.cs @@ -22,9 +22,9 @@ using System.Collections.Generic; using System.Text; using System.Diagnostics; -using ModernKeePassLibPCL.Security; +using ModernKeePassLib.Security; -namespace ModernKeePassLibPCL.Cryptography.PasswordGenerator +namespace ModernKeePassLib.Cryptography.PasswordGenerator { public enum PwgError { diff --git a/ModernKeePassLib/Cryptography/PasswordGenerator/PwProfile.cs b/ModernKeePassLib/Cryptography/PasswordGenerator/PwProfile.cs index 826d73b..3ad5265 100644 --- a/ModernKeePassLib/Cryptography/PasswordGenerator/PwProfile.cs +++ b/ModernKeePassLib/Cryptography/PasswordGenerator/PwProfile.cs @@ -24,11 +24,11 @@ using System.Xml.Serialization; using System.ComponentModel; using System.Diagnostics; -using ModernKeePassLibPCL.Interfaces; -using ModernKeePassLibPCL.Security; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Interfaces; +using ModernKeePassLib.Security; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL.Cryptography.PasswordGenerator +namespace ModernKeePassLib.Cryptography.PasswordGenerator { /// /// Type of the password generator. Different types like generators diff --git a/ModernKeePassLib/Cryptography/PopularPasswords.cs b/ModernKeePassLib/Cryptography/PopularPasswords.cs index 29d0526..e5a4521 100644 --- a/ModernKeePassLib/Cryptography/PopularPasswords.cs +++ b/ModernKeePassLib/Cryptography/PopularPasswords.cs @@ -22,9 +22,9 @@ using System.Collections.Generic; using System.Text; using System.Diagnostics; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL.Cryptography +namespace ModernKeePassLib.Cryptography { public static class PopularPasswords { diff --git a/ModernKeePassLib/Cryptography/QualityEstimation.cs b/ModernKeePassLib/Cryptography/QualityEstimation.cs index a711b99..1272d7c 100644 --- a/ModernKeePassLib/Cryptography/QualityEstimation.cs +++ b/ModernKeePassLib/Cryptography/QualityEstimation.cs @@ -22,10 +22,10 @@ using System.Collections.Generic; using System.Text; using System.Diagnostics; -using ModernKeePassLibPCL.Cryptography.PasswordGenerator; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Cryptography.PasswordGenerator; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL.Cryptography +namespace ModernKeePassLib.Cryptography { /// /// A class that offers static functions to estimate the quality of diff --git a/ModernKeePassLib/Cryptography/SelfTest.cs b/ModernKeePassLib/Cryptography/SelfTest.cs index 88b2d55..3b71b91 100644 --- a/ModernKeePassLib/Cryptography/SelfTest.cs +++ b/ModernKeePassLib/Cryptography/SelfTest.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; using System.Security; -#if ModernKeePassLibPCL +#if ModernKeePassLib using Windows.Security.Cryptography; #else using System.Security.Cryptography; @@ -29,14 +29,14 @@ using System.Text; using System.Globalization; using System.Diagnostics; -using ModernKeePassLibPCL.Cryptography.Cipher; -using ModernKeePassLibPCL.Keys; -using ModernKeePassLibPCL.Native; -using ModernKeePassLibPCL.Utility; -using ModernKeePassLibPCL.Resources; -using ModernKeePassLibPCL.Security; +using ModernKeePassLib.Cryptography.Cipher; +using ModernKeePassLib.Keys; +using ModernKeePassLib.Native; +using ModernKeePassLib.Utility; +using ModernKeePassLib.Resources; +using ModernKeePassLib.Security; -namespace ModernKeePassLibPCL.Cryptography +namespace ModernKeePassLib.Cryptography { /* /// /// Return values of the SelfTest.Perform method. @@ -64,7 +64,7 @@ namespace ModernKeePassLibPCL.Cryptography TestRijndael(); TestSalsa20(); -#if !ModernKeePassLibPCL +#if !ModernKeePassLib TestNativeKeyTransform(); #endif @@ -82,7 +82,7 @@ namespace ModernKeePassLibPCL.Cryptography internal static void TestFipsComplianceProblems() { -#if !ModernKeePassLibPCL && !KeePassRT +#if !ModernKeePassLib && !KeePassRT try { new RijndaelManaged(); } catch(Exception exAes) { @@ -99,7 +99,7 @@ namespace ModernKeePassLibPCL.Cryptography private static void TestRijndael() { -#if !ModernKeePassLibPCL && !KeePassRT +#if !ModernKeePassLib && !KeePassRT // Test vector (official ECB test vector #356) byte[] pbIV = new byte[16]; byte[] pbTestKey = new byte[32]; @@ -211,7 +211,7 @@ namespace ModernKeePassLibPCL.Cryptography } #endif -#if !ModernKeePassLibPCL +#if !ModernKeePassLib private static void TestNativeKeyTransform() { #if DEBUG diff --git a/ModernKeePassLib/Delegates/Handlers.cs b/ModernKeePassLib/Delegates/Handlers.cs index 48b9360..8a8b6f4 100644 --- a/ModernKeePassLib/Delegates/Handlers.cs +++ b/ModernKeePassLib/Delegates/Handlers.cs @@ -19,7 +19,7 @@ using System; -namespace ModernKeePassLibPCL.Delegates +namespace ModernKeePassLib.Delegates { /// /// Function definition of a method that performs an action on a group. diff --git a/ModernKeePassLib/Interfaces/IDeepCloneable.cs b/ModernKeePassLib/Interfaces/IDeepCloneable.cs index 7558646..5a67a9c 100644 --- a/ModernKeePassLib/Interfaces/IDeepCloneable.cs +++ b/ModernKeePassLib/Interfaces/IDeepCloneable.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; -namespace ModernKeePassLibPCL.Interfaces +namespace ModernKeePassLib.Interfaces { /// /// Interface for objects that are deeply cloneable. diff --git a/ModernKeePassLib/Interfaces/IStatusLogger.cs b/ModernKeePassLib/Interfaces/IStatusLogger.cs index 0c25fd3..8fab8ee 100644 --- a/ModernKeePassLib/Interfaces/IStatusLogger.cs +++ b/ModernKeePassLib/Interfaces/IStatusLogger.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; -namespace ModernKeePassLibPCL.Interfaces +namespace ModernKeePassLib.Interfaces { /// /// Status message types. diff --git a/ModernKeePassLib/Interfaces/IStructureItem.cs b/ModernKeePassLib/Interfaces/IStructureItem.cs index 28f9233..a733064 100644 --- a/ModernKeePassLib/Interfaces/IStructureItem.cs +++ b/ModernKeePassLib/Interfaces/IStructureItem.cs @@ -19,7 +19,7 @@ using System; -namespace ModernKeePassLibPCL.Interfaces +namespace ModernKeePassLib.Interfaces { public interface IStructureItem : ITimeLogger // Provides LocationChanged { diff --git a/ModernKeePassLib/Interfaces/ITimeLogger.cs b/ModernKeePassLib/Interfaces/ITimeLogger.cs index 664ff66..4742699 100644 --- a/ModernKeePassLib/Interfaces/ITimeLogger.cs +++ b/ModernKeePassLib/Interfaces/ITimeLogger.cs @@ -19,7 +19,7 @@ using System; -namespace ModernKeePassLibPCL.Interfaces +namespace ModernKeePassLib.Interfaces { /// /// Interface for objects that support various times (creation time, last diff --git a/ModernKeePassLib/Interfaces/IUIOperations.cs b/ModernKeePassLib/Interfaces/IUIOperations.cs index cce4100..2593676 100644 --- a/ModernKeePassLib/Interfaces/IUIOperations.cs +++ b/ModernKeePassLib/Interfaces/IUIOperations.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace ModernKeePassLibPCL.Interfaces +namespace ModernKeePassLib.Interfaces { public interface IUIOperations { diff --git a/ModernKeePassLib/Interfaces/IXmlSerializerEx.cs b/ModernKeePassLib/Interfaces/IXmlSerializerEx.cs index 18a3015..0be854f 100644 --- a/ModernKeePassLib/Interfaces/IXmlSerializerEx.cs +++ b/ModernKeePassLib/Interfaces/IXmlSerializerEx.cs @@ -23,7 +23,7 @@ using System.Text; using System.IO; using System.Xml; -namespace ModernKeePassLibPCL.Interfaces +namespace ModernKeePassLib.Interfaces { public interface IXmlSerializerEx { diff --git a/ModernKeePassLib/Keys/CompositeKey.cs b/ModernKeePassLib/Keys/CompositeKey.cs index 64b60a7..5d8806a 100644 --- a/ModernKeePassLib/Keys/CompositeKey.cs +++ b/ModernKeePassLib/Keys/CompositeKey.cs @@ -23,7 +23,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Runtime.InteropServices.WindowsRuntime; -#if ModernKeePassLibPCL +#if ModernKeePassLib using Windows.Security.Cryptography; #else using System.Security.Cryptography; @@ -34,16 +34,16 @@ using Org.BouncyCastle.Crypto.Engines; using Org.BouncyCastle.Crypto.Parameters; #endif -using ModernKeePassLibPCL.Native; -using ModernKeePassLibPCL.Resources; -using ModernKeePassLibPCL.Security; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Native; +using ModernKeePassLib.Resources; +using ModernKeePassLib.Security; +using ModernKeePassLib.Utility; using Windows.Security.Cryptography.Core; using Windows.Storage.Streams; using Org.BouncyCastle.Crypto.Engines; using Org.BouncyCastle.Crypto.Parameters; -namespace ModernKeePassLibPCL.Keys +namespace ModernKeePassLib.Keys { /// /// Represents a key. A key can be build up using several user key data sources @@ -117,7 +117,7 @@ namespace ModernKeePassLibPCL.Keys return m_vUserKeys.Remove(pKey); } -#if !ModernKeePassLibPCL && !KeePassRT +#if !ModernKeePassLib && !KeePassRT /// /// Test whether the composite key contains a specific type of /// user keys (password, key file, ...). If at least one user @@ -182,7 +182,7 @@ namespace ModernKeePassLibPCL.Keys } } -#if ModernKeePassLibPCL +#if ModernKeePassLib /*var sha256 = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha256); var pbHash = sha256.HashData(ms.ToArray());*/ var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256); @@ -243,7 +243,7 @@ namespace ModernKeePassLibPCL.Keys private void ValidateUserKeys() { -#if !ModernKeePassLibPCL +#if !ModernKeePassLib int nAccounts = 0; foreach(IUserKey uKey in m_vUserKeys) @@ -283,7 +283,7 @@ namespace ModernKeePassLibPCL.Keys byte[] pbNewKey = new byte[32]; Array.Copy(pbOriginalKey32, pbNewKey, pbNewKey.Length); -#if !ModernKeePassLibPCL +#if !ModernKeePassLib // Try to use the native library first if(NativeLib.TransformKey256(pbNewKey, pbKeySeed32, uNumRounds)) return (new SHA256Managed()).ComputeHash(pbNewKey); @@ -292,7 +292,7 @@ namespace ModernKeePassLibPCL.Keys if(TransformKeyManaged(ref pbNewKey, pbKeySeed32, uNumRounds) == false) return null; -#if ModernKeePassLibPCL +#if ModernKeePassLib /*var sha256 = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha256); return sha256.HashData(pbNewKey);*/ var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256); @@ -320,7 +320,7 @@ namespace ModernKeePassLibPCL.Keys aes.ProcessBlock(pbNewKey32, 16, pbNewKey32, 16); } #else -#if ModernKeePassLibPCL +#if ModernKeePassLib /*var aes = WinRTCrypto.SymmetricKeyAlgorithmProvider.OpenAlgorithm(SymmetricAlgorithm.AesEcb); var key = aes.CreateSymmetricKey(pbKeySeed32); var iCrypt = WinRTCrypto.CryptographicEngine.CreateEncryptor(key);*/ @@ -393,7 +393,7 @@ namespace ModernKeePassLibPCL.Keys { ulong uRounds; -#if !ModernKeePassLibPCL +#if !ModernKeePassLib // Try native method if(NativeLib.TransformKeyBenchmark256(uMilliseconds, out uRounds)) return uRounds; @@ -412,7 +412,7 @@ namespace ModernKeePassLibPCL.Keys AesEngine aes = new AesEngine(); aes.Init(true, kp); #else -#if ModernKeePassLibPCL +#if ModernKeePassLib var aes = WinRTCrypto.SymmetricKeyAlgorithmProvider.OpenAlgorithm(SymmetricAlgorithm.AesEcb); var key = aes.CreateSymmetricKey(pbKey); var iCrypt = WinRTCrypto.CryptographicEngine.CreateEncryptor(key); diff --git a/ModernKeePassLib/Keys/IUserKey.cs b/ModernKeePassLib/Keys/IUserKey.cs index c2ab9e4..1b733d9 100644 --- a/ModernKeePassLib/Keys/IUserKey.cs +++ b/ModernKeePassLib/Keys/IUserKey.cs @@ -19,9 +19,9 @@ using System; -using ModernKeePassLibPCL.Security; +using ModernKeePassLib.Security; -namespace ModernKeePassLibPCL.Keys +namespace ModernKeePassLib.Keys { /// /// Interface to a user key, like a password, key file data, etc. diff --git a/ModernKeePassLib/Keys/KcpCustomKey.cs b/ModernKeePassLib/Keys/KcpCustomKey.cs index 9e5816f..5b8d244 100644 --- a/ModernKeePassLib/Keys/KcpCustomKey.cs +++ b/ModernKeePassLib/Keys/KcpCustomKey.cs @@ -21,17 +21,17 @@ using System; using System.Collections.Generic; using System.Text; using System.Diagnostics; -#if ModernKeePassLibPCL +#if ModernKeePassLib using Windows.Security.Cryptography; #else using System.Security.Cryptography; #endif -using ModernKeePassLibPCL.Security; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Security; +using ModernKeePassLib.Utility; using Windows.Security.Cryptography.Core; -namespace ModernKeePassLibPCL.Keys +namespace ModernKeePassLib.Keys { public sealed class KcpCustomKey : IUserKey { @@ -60,7 +60,7 @@ namespace ModernKeePassLibPCL.Keys if(bPerformHash) { -#if ModernKeePassLibPCL +#if ModernKeePassLib /*var sha256 = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha256); var pbRaw = sha256.HashData(pbKeyData);*/ var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256); diff --git a/ModernKeePassLib/Keys/KcpKeyFile.cs b/ModernKeePassLib/Keys/KcpKeyFile.cs index a1704c6..9115fae 100644 --- a/ModernKeePassLib/Keys/KcpKeyFile.cs +++ b/ModernKeePassLib/Keys/KcpKeyFile.cs @@ -22,7 +22,7 @@ using System.Text; using System.IO; using System.Xml; using System.Security; -#if ModernKeePassLibPCL +#if ModernKeePassLib using System.Collections.Generic; using System.Linq; using System.Xml.Linq; @@ -32,14 +32,14 @@ using System.Security.Cryptography; #endif using System.Diagnostics; -using ModernKeePassLibPCL.Cryptography; -using ModernKeePassLibPCL.Resources; -using ModernKeePassLibPCL.Security; -using ModernKeePassLibPCL.Serialization; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Cryptography; +using ModernKeePassLib.Resources; +using ModernKeePassLib.Security; +using ModernKeePassLib.Serialization; +using ModernKeePassLib.Utility; using Windows.Security.Cryptography.Core; -namespace ModernKeePassLibPCL.Keys +namespace ModernKeePassLib.Keys { /// /// Key files as provided by the user. @@ -139,7 +139,7 @@ namespace ModernKeePassLibPCL.Keys if(pbKey == null) { -#if ModernKeePassLibPCL +#if ModernKeePassLib /*var sha256 = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha256); pbKey = sha256.HashData(pbFileData);*/ var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256); @@ -206,7 +206,7 @@ namespace ModernKeePassLibPCL.Keys ms.Write(pbAdditionalEntropy, 0, pbAdditionalEntropy.Length); ms.Write(pbKey32, 0, 32); -#if ModernKeePassLibPCL +#if ModernKeePassLib /*var sha256 = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha256); pbFinalKey32 = sha256.HashData(ms.ToArray());*/ var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256); @@ -252,7 +252,7 @@ namespace ModernKeePassLibPCL.Keys try { -#if ModernKeePassLibPCL +#if ModernKeePassLib var doc = XDocument.Load(ms); @@ -320,7 +320,7 @@ namespace ModernKeePassLibPCL.Keys IOConnectionInfo ioc = IOConnectionInfo.FromPath(strFile); var sOut = IOConnection.OpenWrite(ioc); -#if ModernKeePassLibPCL +#if ModernKeePassLib var settings = new XmlWriterSettings() { Encoding = StrUtil.Utf8 }; var xtw = XmlWriter.Create(sOut, settings); #else diff --git a/ModernKeePassLib/Keys/KcpPassword.cs b/ModernKeePassLib/Keys/KcpPassword.cs index 6068899..a460251 100644 --- a/ModernKeePassLib/Keys/KcpPassword.cs +++ b/ModernKeePassLib/Keys/KcpPassword.cs @@ -20,17 +20,17 @@ using System; using System.Text; using System.Diagnostics; -#if ModernKeePassLibPCL +#if ModernKeePassLib using Windows.Security.Cryptography; #else using System.Security.Cryptography; #endif -using ModernKeePassLibPCL.Security; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Security; +using ModernKeePassLib.Utility; using Windows.Security.Cryptography.Core; -namespace ModernKeePassLibPCL.Keys +namespace ModernKeePassLib.Keys { /// /// Master password / passphrase as provided by the user. @@ -73,7 +73,7 @@ namespace ModernKeePassLibPCL.Keys Debug.Assert(pbPasswordUtf8 != null); if(pbPasswordUtf8 == null) throw new ArgumentNullException("pbPasswordUtf8"); -#if ModernKeePassLibPCL +#if ModernKeePassLib /*var sha256 = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha256); var pbRaw = sha256.HashData(pbPasswordUtf8);*/ var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256); diff --git a/ModernKeePassLib/Keys/KcpUserAccount.cs b/ModernKeePassLib/Keys/KcpUserAccount.cs index d5d5d72..a4b0386 100644 --- a/ModernKeePassLib/Keys/KcpUserAccount.cs +++ b/ModernKeePassLib/Keys/KcpUserAccount.cs @@ -22,12 +22,12 @@ using System.Security; using System.Security.Cryptography; using System.IO; -using ModernKeePassLibPCL.Cryptography; -using ModernKeePassLibPCL.Resources; -using ModernKeePassLibPCL.Security; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Cryptography; +using ModernKeePassLib.Resources; +using ModernKeePassLib.Security; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL.Keys +namespace ModernKeePassLib.Keys { /// /// A user key depending on the currently logged on Windows user account. diff --git a/ModernKeePassLib/Keys/KeyProvider.cs b/ModernKeePassLib/Keys/KeyProvider.cs index a98840f..dd6f652 100644 --- a/ModernKeePassLib/Keys/KeyProvider.cs +++ b/ModernKeePassLib/Keys/KeyProvider.cs @@ -21,9 +21,9 @@ using System; using System.Collections.Generic; using System.Text; -using ModernKeePassLibPCL.Serialization; +using ModernKeePassLib.Serialization; -namespace ModernKeePassLibPCL.Keys +namespace ModernKeePassLib.Keys { public sealed class KeyProviderQueryContext { diff --git a/ModernKeePassLib/Keys/KeyProviderPool.cs b/ModernKeePassLib/Keys/KeyProviderPool.cs index 760540b..b10d1ef 100644 --- a/ModernKeePassLib/Keys/KeyProviderPool.cs +++ b/ModernKeePassLib/Keys/KeyProviderPool.cs @@ -23,7 +23,7 @@ using System.Collections.Generic; using System.Text; using System.Diagnostics; -namespace ModernKeePassLibPCL.Keys +namespace ModernKeePassLib.Keys { public sealed class KeyProviderPool : IEnumerable { diff --git a/ModernKeePassLib/Keys/KeyValidator.cs b/ModernKeePassLib/Keys/KeyValidator.cs index dc4e80a..793a75c 100644 --- a/ModernKeePassLib/Keys/KeyValidator.cs +++ b/ModernKeePassLib/Keys/KeyValidator.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace ModernKeePassLibPCL.Keys +namespace ModernKeePassLib.Keys { public enum KeyValidationType { diff --git a/ModernKeePassLib/Keys/KeyValidatorPool.cs b/ModernKeePassLib/Keys/KeyValidatorPool.cs index acf780e..40c483b 100644 --- a/ModernKeePassLib/Keys/KeyValidatorPool.cs +++ b/ModernKeePassLib/Keys/KeyValidatorPool.cs @@ -23,9 +23,9 @@ using System.Collections.Generic; using System.Text; using System.Diagnostics; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL.Keys +namespace ModernKeePassLib.Keys { public sealed class KeyValidatorPool : IEnumerable { diff --git a/ModernKeePassLib/Keys/UserKeyType.cs b/ModernKeePassLib/Keys/UserKeyType.cs index 6132a3b..9d25637 100644 --- a/ModernKeePassLib/Keys/UserKeyType.cs +++ b/ModernKeePassLib/Keys/UserKeyType.cs @@ -19,7 +19,7 @@ using System; -namespace ModernKeePassLibPCL.Keys +namespace ModernKeePassLib.Keys { [Flags] public enum UserKeyType diff --git a/ModernKeePassLib/ModernKeePassLibPCL.csproj b/ModernKeePassLib/ModernKeePassLib.csproj similarity index 96% rename from ModernKeePassLib/ModernKeePassLibPCL.csproj rename to ModernKeePassLib/ModernKeePassLib.csproj index 87eed35..5c94208 100644 --- a/ModernKeePassLib/ModernKeePassLibPCL.csproj +++ b/ModernKeePassLib/ModernKeePassLib.csproj @@ -7,8 +7,8 @@ {2E710089-9559-4967-846C-E763DD1F3ACB} Library Properties - ModernKeePassLibPCL - ModernKeePassLibPCL + ModernKeePassLib + ModernKeePassLib false @@ -28,7 +28,7 @@ full false bin\Debug - DEBUG;ModernKeePassLibPCL + DEBUG;ModernKeePassLib prompt 4 @@ -37,7 +37,7 @@ bin\Release prompt 4 - ModernKeePassLibPCL + ModernKeePassLib @@ -120,7 +120,7 @@ - + diff --git a/ModernKeePassLib/ModernKeePassLib.nuget.targets b/ModernKeePassLib/ModernKeePassLib.nuget.targets new file mode 100644 index 0000000..8930d73 --- /dev/null +++ b/ModernKeePassLib/ModernKeePassLib.nuget.targets @@ -0,0 +1,9 @@ + + + + $(UserProfile)\.nuget\packages\ + + + + + \ No newline at end of file diff --git a/ModernKeePassLib/ModernKeePassLibPCL.nuspec b/ModernKeePassLib/ModernKeePassLib.nuspec similarity index 68% rename from ModernKeePassLib/ModernKeePassLibPCL.nuspec rename to ModernKeePassLib/ModernKeePassLib.nuspec index 0b030f4..d4976cc 100644 --- a/ModernKeePassLib/ModernKeePassLibPCL.nuspec +++ b/ModernKeePassLib/ModernKeePassLib.nuspec @@ -1,27 +1,30 @@  - ModernKeePassLibPCL - 2.28.1000 - ModernKeePassLibPCL + ModernKeePassLib + 2.28.2000 + ModernKeePassLib Geoffroy Bonneville Geoffroy Bonneville https://www.gnu.org/licenses/gpl-3.0.en.html https://github.com/wismna/ModernKeePass false - Portable KeePass Password Management Library - Initial release. + Portable KeePass Password Management Library that targets .Net Standard and WinRT + Bump to 2.28, write mode activated with BouncyCastle Copyright © 2017 Geoffroy Bonneville - KeePass KeePassLib Portable - + diff --git a/ModernKeePassLib/ModernKeePassLibPCL.nuget.targets b/ModernKeePassLib/ModernKeePassLibPCL.nuget.targets new file mode 100644 index 0000000..8930d73 --- /dev/null +++ b/ModernKeePassLib/ModernKeePassLibPCL.nuget.targets @@ -0,0 +1,9 @@ + + + + $(UserProfile)\.nuget\packages\ + + + + + \ No newline at end of file diff --git a/ModernKeePassLib/Native/Native.PCL.cs b/ModernKeePassLib/Native/Native.PCL.cs index 6e3f6d7..878ff26 100644 --- a/ModernKeePassLib/Native/Native.PCL.cs +++ b/ModernKeePassLib/Native/Native.PCL.cs @@ -2,7 +2,7 @@ using PlatformID = System.UInt32; -namespace ModernKeePassLibPCL.Native +namespace ModernKeePassLib.Native { internal static class NativeLib { diff --git a/ModernKeePassLib/Native/NativeLib.cs b/ModernKeePassLib/Native/NativeLib.cs index 42f3561..866538e 100644 --- a/ModernKeePassLib/Native/NativeLib.cs +++ b/ModernKeePassLib/Native/NativeLib.cs @@ -28,9 +28,9 @@ using System.IO; using System.Reflection; using System.Diagnostics; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL.Native +namespace ModernKeePassLib.Native { /// /// Interface to native library (library containing fast versions of diff --git a/ModernKeePassLib/Native/NativeMethods.Unix.cs b/ModernKeePassLib/Native/NativeMethods.Unix.cs index 62561ca..faa3fc1 100644 --- a/ModernKeePassLib/Native/NativeMethods.Unix.cs +++ b/ModernKeePassLib/Native/NativeMethods.Unix.cs @@ -25,7 +25,7 @@ using System.Runtime.InteropServices; using System.Reflection; using System.Diagnostics; -namespace ModernKeePassLibPCL.Native +namespace ModernKeePassLib.Native { internal static partial class NativeMethods { diff --git a/ModernKeePassLib/Native/NativeMethods.cs b/ModernKeePassLib/Native/NativeMethods.cs index 9542aac..9ce13fe 100644 --- a/ModernKeePassLib/Native/NativeMethods.cs +++ b/ModernKeePassLib/Native/NativeMethods.cs @@ -24,9 +24,9 @@ using System.Runtime.InteropServices; using System.IO; using System.Diagnostics; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL.Native +namespace ModernKeePassLib.Native { internal static partial class NativeMethods { diff --git a/ModernKeePassLib/Properties/AssemblyInfo.cs b/ModernKeePassLib/Properties/AssemblyInfo.cs index 43888cb..be30c15 100644 --- a/ModernKeePassLib/Properties/AssemblyInfo.cs +++ b/ModernKeePassLib/Properties/AssemblyInfo.cs @@ -34,7 +34,7 @@ using System.Runtime.InteropServices; // COM settings [assembly: ComVisible(false)] -#if !ModernKeePassLibPCL +#if !ModernKeePassLib // Assembly GUID [assembly: Guid("395f6eec-a1e0-4438-aa82-b75099348134")] #endif diff --git a/ModernKeePassLib/PwCustomIcon.cs b/ModernKeePassLib/PwCustomIcon.cs index 09453bd..6dd7412 100644 --- a/ModernKeePassLib/PwCustomIcon.cs +++ b/ModernKeePassLib/PwCustomIcon.cs @@ -19,16 +19,16 @@ using System; using System.Diagnostics; -#if ModernKeePassLibPCL +#if ModernKeePassLib using Image = Splat.IBitmap; #else using System.Drawing; #endif using System.IO; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL +namespace ModernKeePassLib { /// /// Custom icon. PwCustomIcon objects are immutable. diff --git a/ModernKeePassLib/PwDatabase.cs b/ModernKeePassLib/PwDatabase.cs index 0a15333..1cfe598 100644 --- a/ModernKeePassLib/PwDatabase.cs +++ b/ModernKeePassLib/PwDatabase.cs @@ -23,22 +23,22 @@ using System.Diagnostics; using System.IO; using System.Drawing; -#if ModernKeePassLibPCL +#if ModernKeePassLib using Image = Splat.IBitmap; #endif -using ModernKeePassLibPCL.Collections; -using ModernKeePassLibPCL.Cryptography; -using ModernKeePassLibPCL.Cryptography.Cipher; -using ModernKeePassLibPCL.Delegates; -using ModernKeePassLibPCL.Interfaces; -using ModernKeePassLibPCL.Keys; -using ModernKeePassLibPCL.Resources; -using ModernKeePassLibPCL.Security; -using ModernKeePassLibPCL.Serialization; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Collections; +using ModernKeePassLib.Cryptography; +using ModernKeePassLib.Cryptography.Cipher; +using ModernKeePassLib.Delegates; +using ModernKeePassLib.Interfaces; +using ModernKeePassLib.Keys; +using ModernKeePassLib.Resources; +using ModernKeePassLib.Security; +using ModernKeePassLib.Serialization; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL +namespace ModernKeePassLib { /// /// The core password manager class. It contains a number of groups, which diff --git a/ModernKeePassLib/PwDefs.cs b/ModernKeePassLib/PwDefs.cs index 9a6efc8..c07cabd 100644 --- a/ModernKeePassLib/PwDefs.cs +++ b/ModernKeePassLib/PwDefs.cs @@ -23,11 +23,11 @@ using System.Xml.Serialization; using System.ComponentModel; using System.Diagnostics; -using ModernKeePassLibPCL.Delegates; -using ModernKeePassLibPCL.Interfaces; -using ModernKeePassLibPCL.Serialization; +using ModernKeePassLib.Delegates; +using ModernKeePassLib.Interfaces; +using ModernKeePassLib.Serialization; -namespace ModernKeePassLibPCL +namespace ModernKeePassLib { /// /// Contains KeePassLib-global definitions and enums. @@ -318,7 +318,7 @@ namespace ModernKeePassLibPCL set { m_bSearchInTags = value; } } -#if ModernKeePassLibPCL || KeePassRT +#if ModernKeePassLib || KeePassRT private StringComparison m_scType = StringComparison.OrdinalIgnoreCase; #else private StringComparison m_scType = StringComparison.InvariantCultureIgnoreCase; diff --git a/ModernKeePassLib/PwDeletedObject.cs b/ModernKeePassLib/PwDeletedObject.cs index c5e2d38..d430e6a 100644 --- a/ModernKeePassLib/PwDeletedObject.cs +++ b/ModernKeePassLib/PwDeletedObject.cs @@ -21,9 +21,9 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using ModernKeePassLibPCL.Interfaces; +using ModernKeePassLib.Interfaces; -namespace ModernKeePassLibPCL +namespace ModernKeePassLib { /// /// Represents an object that has been deleted. diff --git a/ModernKeePassLib/PwEntry.cs b/ModernKeePassLib/PwEntry.cs index e30e6ed..2cf38e2 100644 --- a/ModernKeePassLib/PwEntry.cs +++ b/ModernKeePassLib/PwEntry.cs @@ -23,12 +23,12 @@ using System.Diagnostics; using System.Xml; using System.Drawing; -using ModernKeePassLibPCL.Collections; -using ModernKeePassLibPCL.Interfaces; -using ModernKeePassLibPCL.Security; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Collections; +using ModernKeePassLib.Interfaces; +using ModernKeePassLib.Security; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL +namespace ModernKeePassLib { /// /// A class representing a password entry. A password entry consists of several @@ -889,7 +889,7 @@ namespace ModernKeePassLibPCL if(m_bCompareNaturally) return StrUtil.CompareNaturally(strA, strB); -#if ModernKeePassLibPCL || KeePassRT +#if ModernKeePassLib || KeePassRT return string.Compare(strA, strB, m_bCaseInsensitive ? StringComparison.CurrentCultureIgnoreCase : StringComparison.CurrentCulture); #else diff --git a/ModernKeePassLib/PwEnums.cs b/ModernKeePassLib/PwEnums.cs index 8c899a8..e4fdc81 100644 --- a/ModernKeePassLib/PwEnums.cs +++ b/ModernKeePassLib/PwEnums.cs @@ -19,7 +19,7 @@ using System; -namespace ModernKeePassLibPCL +namespace ModernKeePassLib { /// /// Compression algorithm specifiers. diff --git a/ModernKeePassLib/PwGroup.cs b/ModernKeePassLib/PwGroup.cs index e961693..b787304 100644 --- a/ModernKeePassLib/PwGroup.cs +++ b/ModernKeePassLib/PwGroup.cs @@ -22,13 +22,13 @@ using System.Collections.Generic; using System.Diagnostics; using System.Text.RegularExpressions; -using ModernKeePassLibPCL.Collections; -using ModernKeePassLibPCL.Delegates; -using ModernKeePassLibPCL.Interfaces; -using ModernKeePassLibPCL.Security; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Collections; +using ModernKeePassLib.Delegates; +using ModernKeePassLib.Interfaces; +using ModernKeePassLib.Security; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL +namespace ModernKeePassLib { /// /// A group containing several password entries. @@ -841,13 +841,13 @@ namespace ModernKeePassLibPCL Regex rx = null; if(sp.RegularExpression) { -#if ModernKeePassLibPCL || KeePassRT +#if ModernKeePassLib || KeePassRT RegexOptions ro = RegexOptions.None; #else RegexOptions ro = RegexOptions.Compiled; #endif if((sp.ComparisonMode == StringComparison.CurrentCultureIgnoreCase) || -#if !ModernKeePassLibPCL && !KeePassRT +#if !ModernKeePassLib && !KeePassRT (sp.ComparisonMode == StringComparison.InvariantCultureIgnoreCase) || #endif (sp.ComparisonMode == StringComparison.OrdinalIgnoreCase)) diff --git a/ModernKeePassLib/PwUuid.cs b/ModernKeePassLib/PwUuid.cs index 2ddf256..8884444 100644 --- a/ModernKeePassLib/PwUuid.cs +++ b/ModernKeePassLib/PwUuid.cs @@ -22,9 +22,9 @@ using System.Collections.Generic; using System.Xml; using System.Diagnostics; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL +namespace ModernKeePassLib { // [ImmutableObject(true)] /// diff --git a/ModernKeePassLib/Resources/KLRes.Generated.cs b/ModernKeePassLib/Resources/KLRes.Generated.cs index 023af1d..74f4274 100644 --- a/ModernKeePassLib/Resources/KLRes.Generated.cs +++ b/ModernKeePassLib/Resources/KLRes.Generated.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace ModernKeePassLibPCL.Resources +namespace ModernKeePassLib.Resources { /// /// A strongly-typed resource class, for looking up localized strings, etc. diff --git a/ModernKeePassLib/Resources/KSRes.Generated.cs b/ModernKeePassLib/Resources/KSRes.Generated.cs index 4d3804c..7b49547 100644 --- a/ModernKeePassLib/Resources/KSRes.Generated.cs +++ b/ModernKeePassLib/Resources/KSRes.Generated.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace ModernKeePassLibPCL.Resources +namespace ModernKeePassLib.Resources { /// /// A strongly-typed resource class, for looking up localized strings, etc. diff --git a/ModernKeePassLib/Security/ProtectedBinary.cs b/ModernKeePassLib/Security/ProtectedBinary.cs index bfbd8fe..e514e47 100644 --- a/ModernKeePassLib/Security/ProtectedBinary.cs +++ b/ModernKeePassLib/Security/ProtectedBinary.cs @@ -21,16 +21,16 @@ using System; using System.Threading; using System.Diagnostics; -using ModernKeePassLibPCL.Cryptography; -using ModernKeePassLibPCL.Cryptography.Cipher; -using ModernKeePassLibPCL.Native; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Cryptography; +using ModernKeePassLib.Cryptography.Cipher; +using ModernKeePassLib.Native; +using ModernKeePassLib.Utility; #if KeePassLibSD using KeePassLibSD; #endif -namespace ModernKeePassLibPCL.Security +namespace ModernKeePassLib.Security { [Flags] public enum PbCryptFlags diff --git a/ModernKeePassLib/Security/ProtectedString.cs b/ModernKeePassLib/Security/ProtectedString.cs index 87365f0..9b8f715 100644 --- a/ModernKeePassLib/Security/ProtectedString.cs +++ b/ModernKeePassLib/Security/ProtectedString.cs @@ -21,8 +21,8 @@ using System; using System.Text; using System.Diagnostics; -using ModernKeePassLibPCL.Cryptography; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Cryptography; +using ModernKeePassLib.Utility; #if KeePassLibSD using KeePassLibSD; @@ -30,7 +30,7 @@ using KeePassLibSD; // SecureString objects are limited to 65536 characters, don't use -namespace ModernKeePassLibPCL.Security +namespace ModernKeePassLib.Security { /// /// Represents an in-memory encrypted string. diff --git a/ModernKeePassLib/Security/XorredBuffer.cs b/ModernKeePassLib/Security/XorredBuffer.cs index b941074..625e83c 100644 --- a/ModernKeePassLib/Security/XorredBuffer.cs +++ b/ModernKeePassLib/Security/XorredBuffer.cs @@ -20,7 +20,7 @@ using System; using System.Diagnostics; -namespace ModernKeePassLibPCL.Security +namespace ModernKeePassLib.Security { /// /// Represents an object that is encrypted using a XOR pad until diff --git a/ModernKeePassLib/Serialization/BinaryReaderEx.cs b/ModernKeePassLib/Serialization/BinaryReaderEx.cs index d145ed1..1891861 100644 --- a/ModernKeePassLib/Serialization/BinaryReaderEx.cs +++ b/ModernKeePassLib/Serialization/BinaryReaderEx.cs @@ -22,9 +22,9 @@ using System.Collections.Generic; using System.Text; using System.IO; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL.Serialization +namespace ModernKeePassLib.Serialization { public sealed class BinaryReaderEx { diff --git a/ModernKeePassLib/Serialization/FileLock.cs b/ModernKeePassLib/Serialization/FileLock.cs index c23236c..d8b6885 100644 --- a/ModernKeePassLib/Serialization/FileLock.cs +++ b/ModernKeePassLib/Serialization/FileLock.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic; using System.Text; using System.IO; -#if ModernKeePassLibPCL +#if ModernKeePassLib using System.Threading.Tasks; #else using System.Threading; @@ -29,11 +29,11 @@ using System.Threading; using System.Diagnostics; using System.Runtime.InteropServices.WindowsRuntime; using Windows.Storage.Streams; -using ModernKeePassLibPCL.Cryptography; -using ModernKeePassLibPCL.Resources; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Cryptography; +using ModernKeePassLib.Resources; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL.Serialization +namespace ModernKeePassLib.Serialization { public sealed class FileLockException : Exception { @@ -233,7 +233,7 @@ namespace ModernKeePassLibPCL.Serialization if(bFileDeleted) break; -#if ModernKeePassLibPCL +#if ModernKeePassLib if(bDisposing) Task.Delay(50).Wait(); #else diff --git a/ModernKeePassLib/Serialization/FileTransactionEx.cs b/ModernKeePassLib/Serialization/FileTransactionEx.cs index 72a6c42..59cb555 100644 --- a/ModernKeePassLib/Serialization/FileTransactionEx.cs +++ b/ModernKeePassLib/Serialization/FileTransactionEx.cs @@ -23,16 +23,16 @@ using System.Text; using System.IO; using System.Diagnostics; -#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT) +#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT) using System.Security.AccessControl; #endif -using ModernKeePassLibPCL.Native; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Native; +using ModernKeePassLib.Utility; using System.Threading.Tasks; using Windows.Storage.Streams; -namespace ModernKeePassLibPCL.Serialization +namespace ModernKeePassLib.Serialization { public sealed class FileTransactionEx { @@ -61,8 +61,8 @@ namespace ModernKeePassLibPCL.Serialization m_bTransacted = bTransacted; m_iocBase = iocBaseFile.CloneDeep(); -// ModernKeePassLibPCL is currently targeting .NET 4.5 -#if !ModernKeePassLibPCL +// ModernKeePassLib is currently targeting .NET 4.5 +#if !ModernKeePassLib // Prevent transactions for FTP URLs under .NET 4.0 in order to // avoid/workaround .NET bug 621450: // https://connect.microsoft.com/VisualStudio/feedback/details/621450/problem-renaming-file-on-ftp-server-using-ftpwebrequest-in-net-framework-4-0-vs2010-only @@ -104,14 +104,14 @@ namespace ModernKeePassLibPCL.Serialization { bool bMadeUnhidden = UrlUtil.UnhideFile(m_iocBase.Path); -#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT) +#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT) FileSecurity bkSecurity = null; bool bEfsEncrypted = false; #endif if(IOConnection.FileExists(m_iocBase)) { -#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT) +#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT) if(m_iocBase.IsLocalFile()) { try @@ -133,7 +133,7 @@ namespace ModernKeePassLibPCL.Serialization IOConnection.RenameFile(m_iocTemp, m_iocBase); -#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT) +#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT) if(m_iocBase.IsLocalFile()) { try diff --git a/ModernKeePassLib/Serialization/HashedBlockStream.cs b/ModernKeePassLib/Serialization/HashedBlockStream.cs index 5de0916..5749603 100644 --- a/ModernKeePassLib/Serialization/HashedBlockStream.cs +++ b/ModernKeePassLib/Serialization/HashedBlockStream.cs @@ -19,7 +19,7 @@ using System; using System.IO; -#if ModernKeePassLibPCL +#if ModernKeePassLib using System.Linq; using Windows.Security.Cryptography; #else @@ -28,15 +28,15 @@ using System.Security.Cryptography; using System.Diagnostics; using System.Text; -using ModernKeePassLibPCL.Native; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Native; +using ModernKeePassLib.Utility; using Windows.Security.Cryptography.Core; #if KeePassLibSD using KeePassLibSD; #endif -namespace ModernKeePassLibPCL.Serialization +namespace ModernKeePassLib.Serialization { public sealed class HashedBlockStream : Stream { @@ -136,7 +136,7 @@ namespace ModernKeePassLibPCL.Serialization if(m_bWriting) m_bwOutput.Flush(); } -#if ModernKeePassLibPCL || KeePassRT +#if ModernKeePassLib || KeePassRT protected override void Dispose(bool disposing) { if(!disposing) return; @@ -251,7 +251,7 @@ namespace ModernKeePassLibPCL.Serialization if(m_bVerify) { -#if ModernKeePassLibPCL +#if ModernKeePassLib /*var sha256 = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha256); var pbComputedHash = sha256.HashData(m_pbBuffer);*/ var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256); @@ -302,7 +302,7 @@ namespace ModernKeePassLibPCL.Serialization if(m_nBufferPos > 0) { -#if ModernKeePassLibPCL +#if ModernKeePassLib /*var sha256 = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha256); var pbHash = sha256.HashData(m_pbBuffer.Where((x, i) => i < m_nBufferPos).ToArray());*/ var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256); diff --git a/ModernKeePassLib/Serialization/IOConnection.cs b/ModernKeePassLib/Serialization/IOConnection.cs index 1f0601d..62dc88f 100644 --- a/ModernKeePassLib/Serialization/IOConnection.cs +++ b/ModernKeePassLib/Serialization/IOConnection.cs @@ -24,24 +24,24 @@ using System.Net; using System.Diagnostics; using Windows.Storage.Streams; using System.Threading.Tasks; -#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT) +#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT) using System.Net.Cache; using System.Net.Security; #endif -#if !ModernKeePassLibPCL && !KeePassRT +#if !ModernKeePassLib && !KeePassRT using System.Security.Cryptography.X509Certificates; #endif -#if ModernKeePassLibPCL +#if ModernKeePassLib using Windows.Storage; //using PCLStorage; #endif -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL.Serialization +namespace ModernKeePassLib.Serialization { -#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT) +#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT) internal sealed class IOWebClient : WebClient { protected override WebRequest GetWebRequest(Uri address) @@ -53,7 +53,7 @@ namespace ModernKeePassLibPCL.Serialization } #endif -#if !ModernKeePassLibPCL +#if !ModernKeePassLib internal abstract class WrapperStream : Stream { private readonly Stream m_s; @@ -226,7 +226,7 @@ namespace ModernKeePassLibPCL.Serialization public static class IOConnection { -#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT) +#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT) private static ProxyServerType m_pstProxyType = ProxyServerType.System; private static string m_strProxyAddr = string.Empty; private static string m_strProxyPort = string.Empty; @@ -250,7 +250,7 @@ namespace ModernKeePassLibPCL.Serialization public static event EventHandler IOAccessPre; -#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT) +#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT) // Allow self-signed certificates, expired certificates, etc. private static bool AcceptCertificate(object sender, X509Certificate certificate, X509Chain chain, @@ -435,7 +435,7 @@ namespace ModernKeePassLibPCL.Serialization return ioc.StorageFile.OpenAsync(FileAccessMode.Read).GetAwaiter().GetResult().AsStream(); } -#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT) +#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT) public static Stream OpenWrite(IOConnectionInfo ioc) { if(ioc == null) { Debug.Assert(false); return null; } @@ -511,7 +511,7 @@ namespace ModernKeePassLibPCL.Serialization iocFrom.StorageFile?.RenameAsync(iocTo.Path).GetAwaiter().GetResult(); } -#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT) +#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT) private static bool SendCommand(IOConnectionInfo ioc, string strMethod) { try @@ -525,7 +525,7 @@ namespace ModernKeePassLibPCL.Serialization return true; } #endif -#if !ModernKeePassLibPCL +#if !ModernKeePassLib internal static void DisposeResponse(WebResponse wr, bool bGetStream) { if(wr == null) return; diff --git a/ModernKeePassLib/Serialization/IOConnectionInfo.cs b/ModernKeePassLib/Serialization/IOConnectionInfo.cs index 6b0b1aa..cffd85a 100644 --- a/ModernKeePassLib/Serialization/IOConnectionInfo.cs +++ b/ModernKeePassLib/Serialization/IOConnectionInfo.cs @@ -25,16 +25,16 @@ using System.Net; using System.ComponentModel; using System.Xml.Serialization; using System.Diagnostics; -#if ModernKeePassLibPCL +#if ModernKeePassLib using Windows.Storage; //using PCLStorage; #endif -using ModernKeePassLibPCL.Interfaces; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Interfaces; +using ModernKeePassLib.Utility; using System.Threading.Tasks; -namespace ModernKeePassLibPCL.Serialization +namespace ModernKeePassLib.Serialization { public enum IOCredSaveMode { @@ -309,7 +309,7 @@ namespace ModernKeePassLibPCL.Serialization public async Task CanProbablyAccess() { -#if ModernKeePassLibPCL +#if ModernKeePassLib if (IsLocalFile()) { //return (FileSystem.Current.GetFileFromPathAsync(m_strUrl).Result != null); diff --git a/ModernKeePassLib/Serialization/KdbxFile.Read.Streamed.cs b/ModernKeePassLib/Serialization/KdbxFile.Read.Streamed.cs index bc1977f..0105e32 100644 --- a/ModernKeePassLib/Serialization/KdbxFile.Read.Streamed.cs +++ b/ModernKeePassLib/Serialization/KdbxFile.Read.Streamed.cs @@ -26,16 +26,16 @@ using System.Xml; using System.IO; using System.Diagnostics; -using ModernKeePassLibPCL; -using ModernKeePassLibPCL.Collections; -using ModernKeePassLibPCL.Cryptography; -using ModernKeePassLibPCL.Cryptography.Cipher; -using ModernKeePassLibPCL.Interfaces; -using ModernKeePassLibPCL.Resources; -using ModernKeePassLibPCL.Security; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib; +using ModernKeePassLib.Collections; +using ModernKeePassLib.Cryptography; +using ModernKeePassLib.Cryptography.Cipher; +using ModernKeePassLib.Interfaces; +using ModernKeePassLib.Resources; +using ModernKeePassLib.Security; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL.Serialization +namespace ModernKeePassLib.Serialization { /// /// Serialization to KeePass KDBX files. @@ -99,7 +99,7 @@ namespace ModernKeePassLibPCL.Serialization xrs.IgnoreProcessingInstructions = true; xrs.IgnoreWhitespace = true; -#if !ModernKeePassLibPCL +#if !ModernKeePassLib // these are default values, so no need to set them #if !KeePassRT #if !KeePassLibSD @@ -690,7 +690,7 @@ namespace ModernKeePassLibPCL.Serialization } m_bReadNextNode = false; // ReadElementString skips end tag -#if ModernKeePassLibPCL +#if ModernKeePassLib return xr.ReadElementContentAsString(); #else return xr.ReadElementString(); @@ -700,7 +700,7 @@ namespace ModernKeePassLibPCL.Serialization private string ReadStringRaw(XmlReader xr) { m_bReadNextNode = false; // ReadElementString skips end tag -#if ModernKeePassLibPCL +#if ModernKeePassLib return xr.ReadElementContentAsString(); #else return xr.ReadElementString(); diff --git a/ModernKeePassLib/Serialization/KdbxFile.Read.cs b/ModernKeePassLib/Serialization/KdbxFile.Read.cs index e46759c..f27ab3d 100644 --- a/ModernKeePassLib/Serialization/KdbxFile.Read.cs +++ b/ModernKeePassLib/Serialization/KdbxFile.Read.cs @@ -23,7 +23,7 @@ using System.Text; using System.IO; using System.Diagnostics; using System.Security; -#if ModernKeePassLibPCL +#if ModernKeePassLib using Windows.Security.Cryptography; #else using System.Security.Cryptography; @@ -36,16 +36,16 @@ using System.IO.Compression; using KeePassLibSD; #endif -using ModernKeePassLibPCL.Cryptography; -using ModernKeePassLibPCL.Cryptography.Cipher; -using ModernKeePassLibPCL.Interfaces; -using ModernKeePassLibPCL.Keys; -using ModernKeePassLibPCL.Resources; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Cryptography; +using ModernKeePassLib.Cryptography.Cipher; +using ModernKeePassLib.Interfaces; +using ModernKeePassLib.Keys; +using ModernKeePassLib.Resources; +using ModernKeePassLib.Utility; using Windows.Security.Cryptography.Core; using Windows.Storage.Streams; -namespace ModernKeePassLibPCL.Serialization +namespace ModernKeePassLib.Serialization { /// /// Serialization to KeePass KDBX files. @@ -156,7 +156,7 @@ namespace ModernKeePassLibPCL.Serialization // GC.KeepAlive(br); // GC.KeepAlive(brDecrypted); } -#if !ModernKeePassLibPCL +#if !ModernKeePassLib catch(CryptographicException) // Thrown on invalid padding { throw new CryptographicException(KLRes.FileCorrupted); @@ -222,7 +222,7 @@ namespace ModernKeePassLibPCL.Serialization byte[] pbHeader = msHeader.ToArray(); msHeader.Dispose(); -#if ModernKeePassLibPCL +#if ModernKeePassLib /*var sha256 = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha256); m_pbHashOfHeader = sha256.HashData(pbHeader);*/ var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256); @@ -352,7 +352,7 @@ namespace ModernKeePassLibPCL.Serialization throw new SecurityException(KLRes.InvalidCompositeKey); ms.Write(pKey32, 0, 32); -#if ModernKeePassLibPCL +#if ModernKeePassLib /*var sha256 = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha256); var aesKey = sha256.HashData(ms.ToArray());*/ var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256); diff --git a/ModernKeePassLib/Serialization/KdbxFile.Write.cs b/ModernKeePassLib/Serialization/KdbxFile.Write.cs index cb9f75e..afc496b 100644 --- a/ModernKeePassLib/Serialization/KdbxFile.Write.cs +++ b/ModernKeePassLib/Serialization/KdbxFile.Write.cs @@ -23,7 +23,7 @@ using System.Text; using System.IO; using System.Xml; using System.Security; -#if ModernKeePassLibPCL +#if ModernKeePassLib using Windows.Security.Cryptography; #else using System.Security.Cryptography; @@ -38,19 +38,19 @@ using System.IO.Compression; using KeePassLibSD; #endif -using ModernKeePassLibPCL.Collections; -using ModernKeePassLibPCL.Cryptography; -using ModernKeePassLibPCL.Cryptography.Cipher; -using ModernKeePassLibPCL.Delegates; -using ModernKeePassLibPCL.Interfaces; -using ModernKeePassLibPCL.Keys; -using ModernKeePassLibPCL.Resources; -using ModernKeePassLibPCL.Security; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Collections; +using ModernKeePassLib.Cryptography; +using ModernKeePassLib.Cryptography.Cipher; +using ModernKeePassLib.Delegates; +using ModernKeePassLib.Interfaces; +using ModernKeePassLib.Keys; +using ModernKeePassLib.Resources; +using ModernKeePassLib.Security; +using ModernKeePassLib.Utility; using Windows.Security.Cryptography.Core; using Windows.Storage.Streams; -namespace ModernKeePassLibPCL.Serialization +namespace ModernKeePassLib.Serialization { /// /// Serialization to KeePass KDBX files. @@ -126,7 +126,7 @@ namespace ModernKeePassLibPCL.Serialization writerStream = hashedStream; else { Debug.Assert(false); throw new FormatException("KdbFormat"); } -#if ModernKeePassLibPCL +#if ModernKeePassLib var settings = new XmlWriterSettings() { Encoding = encNoBom, Indent = true, @@ -192,7 +192,7 @@ namespace ModernKeePassLibPCL.Serialization byte[] pbHeader = ms.ToArray(); -#if ModernKeePassLibPCL +#if ModernKeePassLib /*var sha256 = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha256); m_pbHashOfHeader = sha256.HashData(pbHeader);*/ var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256); @@ -243,7 +243,7 @@ namespace ModernKeePassLibPCL.Serialization throw new SecurityException(KLRes.InvalidCompositeKey); ms.Write(pKey32, 0, 32); -#if ModernKeePassLibPCL +#if ModernKeePassLib /*var sha256 = WinRTCrypto.HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha256); var aesKey = sha256.HashData(ms.ToArray());*/ var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha256); @@ -275,7 +275,7 @@ namespace ModernKeePassLibPCL.Serialization BinPoolBuild(pgRoot); -#if !ModernKeePassLibPCL +#if !ModernKeePassLib m_xmlWriter.Formatting = Formatting.Indented; m_xmlWriter.IndentChar = '\t'; m_xmlWriter.Indentation = 1; diff --git a/ModernKeePassLib/Serialization/KdbxFile.cs b/ModernKeePassLib/Serialization/KdbxFile.cs index e25ad3c..e5c9c25 100644 --- a/ModernKeePassLib/Serialization/KdbxFile.cs +++ b/ModernKeePassLib/Serialization/KdbxFile.cs @@ -29,19 +29,19 @@ using System.Diagnostics; using System.IO.Compression; #endif -#if ModernKeePassLibPCL +#if ModernKeePassLib //using PCLStorage; using Windows.Storage; #endif -using ModernKeePassLibPCL.Collections; -using ModernKeePassLibPCL.Cryptography; -using ModernKeePassLibPCL.Delegates; -using ModernKeePassLibPCL.Interfaces; -using ModernKeePassLibPCL.Security; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Collections; +using ModernKeePassLib.Cryptography; +using ModernKeePassLib.Delegates; +using ModernKeePassLib.Interfaces; +using ModernKeePassLib.Security; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL.Serialization +namespace ModernKeePassLib.Serialization { /// /// The KdbxFile class supports saving the data to various @@ -196,7 +196,7 @@ namespace ModernKeePassLibPCL.Serialization private PwDatabase m_pwDatabase; // Not null, see constructor -#if ModernKeePassLibPCL +#if ModernKeePassLib private XmlWriter m_xmlWriter = null; #else private XmlTextWriter m_xmlWriter = null; @@ -384,14 +384,14 @@ namespace ModernKeePassLibPCL.Serialization ++iTry; } -#if ModernKeePassLibPCL +#if ModernKeePassLib //while(FileSystem.Current.GetFileFromPathAsync(strPath).Result != null); while (StorageFile.GetFileFromPathAsync(strPath).GetResults() != null); #else while(File.Exists(strPath)); #endif -#if ModernKeePassLibPCL +#if ModernKeePassLib byte[] pbData = pb.ReadData(); /*var file = FileSystem.Current.GetFileFromPathAsync(strPath).Result; using (var stream = file.OpenAsync(FileAccess.ReadAndWrite).Result) {*/ diff --git a/ModernKeePassLib/Serialization/OldFormatException.cs b/ModernKeePassLib/Serialization/OldFormatException.cs index 4984025..46a8aa6 100644 --- a/ModernKeePassLib/Serialization/OldFormatException.cs +++ b/ModernKeePassLib/Serialization/OldFormatException.cs @@ -21,10 +21,10 @@ using System; using System.Collections.Generic; using System.Text; -using ModernKeePassLibPCL.Resources; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Resources; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL.Serialization +namespace ModernKeePassLib.Serialization { public sealed class OldFormatException : Exception { diff --git a/ModernKeePassLib/Translation/KPControlCustomization.cs b/ModernKeePassLib/Translation/KPControlCustomization.cs index 60d849b..b66bb49 100644 --- a/ModernKeePassLib/Translation/KPControlCustomization.cs +++ b/ModernKeePassLib/Translation/KPControlCustomization.cs @@ -29,9 +29,9 @@ using System.IO; using System.Security.Cryptography; using System.Drawing; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Utility; -namespace ModernKeePassLibPCL.Translation +namespace ModernKeePassLib.Translation { public sealed class KpccLayout { diff --git a/ModernKeePassLib/Translation/KPFormCustomization.cs b/ModernKeePassLib/Translation/KPFormCustomization.cs index 4e4c705..4d0f7dc 100644 --- a/ModernKeePassLib/Translation/KPFormCustomization.cs +++ b/ModernKeePassLib/Translation/KPFormCustomization.cs @@ -25,7 +25,7 @@ using System.Xml.Serialization; using System.Diagnostics; using System.Reflection; -namespace ModernKeePassLibPCL.Translation +namespace ModernKeePassLib.Translation { public sealed class KPFormCustomization { diff --git a/ModernKeePassLib/Translation/KPStringTable.cs b/ModernKeePassLib/Translation/KPStringTable.cs index 9cd5c37..ea55bac 100644 --- a/ModernKeePassLib/Translation/KPStringTable.cs +++ b/ModernKeePassLib/Translation/KPStringTable.cs @@ -24,7 +24,7 @@ using System.Xml.Serialization; using System.Windows.Forms; using System.Diagnostics; -namespace ModernKeePassLibPCL.Translation +namespace ModernKeePassLib.Translation { public sealed class KPStringTable { diff --git a/ModernKeePassLib/Translation/KPStringTableItem.cs b/ModernKeePassLib/Translation/KPStringTableItem.cs index 5ebd341..4bdb234 100644 --- a/ModernKeePassLib/Translation/KPStringTableItem.cs +++ b/ModernKeePassLib/Translation/KPStringTableItem.cs @@ -22,7 +22,7 @@ using System.Collections.Generic; using System.Text; using System.Xml.Serialization; -namespace ModernKeePassLibPCL.Translation +namespace ModernKeePassLib.Translation { public sealed class KPStringTableItem { diff --git a/ModernKeePassLib/Translation/KPTranslation.cs b/ModernKeePassLib/Translation/KPTranslation.cs index 107afa1..6e16d28 100644 --- a/ModernKeePassLib/Translation/KPTranslation.cs +++ b/ModernKeePassLib/Translation/KPTranslation.cs @@ -28,8 +28,8 @@ using System.ComponentModel; using System.Drawing; using System.Diagnostics; -using ModernKeePassLibPCL.Interfaces; -using ModernKeePassLibPCL.Utility; +using ModernKeePassLib.Interfaces; +using ModernKeePassLib.Utility; #if !KeePassLibSD using System.IO.Compression; @@ -37,7 +37,7 @@ using System.IO.Compression; using ICSharpCode.SharpZipLib.GZip; #endif -namespace ModernKeePassLibPCL.Translation +namespace ModernKeePassLib.Translation { [XmlRoot("Translation")] public sealed class KPTranslation diff --git a/ModernKeePassLib/Translation/KPTranslationProperties.cs b/ModernKeePassLib/Translation/KPTranslationProperties.cs index 1255357..0d0e721 100644 --- a/ModernKeePassLib/Translation/KPTranslationProperties.cs +++ b/ModernKeePassLib/Translation/KPTranslationProperties.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace ModernKeePassLibPCL.Translation +namespace ModernKeePassLib.Translation { public sealed class KPTranslationProperties { diff --git a/ModernKeePassLib/Utility/AppLogEx.cs b/ModernKeePassLib/Utility/AppLogEx.cs index 8a6d141..0e2dc56 100644 --- a/ModernKeePassLib/Utility/AppLogEx.cs +++ b/ModernKeePassLib/Utility/AppLogEx.cs @@ -27,7 +27,7 @@ using System.Diagnostics; using System.IO.Compression; #endif -namespace ModernKeePassLibPCL.Utility +namespace ModernKeePassLib.Utility { /// /// Application-wide logging services. diff --git a/ModernKeePassLib/Utility/ColorTranslator.cs b/ModernKeePassLib/Utility/ColorTranslator.cs index 4153d7a..842345c 100644 --- a/ModernKeePassLib/Utility/ColorTranslator.cs +++ b/ModernKeePassLib/Utility/ColorTranslator.cs @@ -3,7 +3,7 @@ using System.Drawing; using System.Globalization; using System.Text.RegularExpressions; -namespace ModernKeePassLibPCL.Utility +namespace ModernKeePassLib.Utility { /// /// Replacement for System.Drawing.ColorTranslator. diff --git a/ModernKeePassLib/Utility/GfxUtil.cs b/ModernKeePassLib/Utility/GfxUtil.cs index 4975f96..7e17462 100644 --- a/ModernKeePassLib/Utility/GfxUtil.cs +++ b/ModernKeePassLib/Utility/GfxUtil.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic; using System.Text; using System.IO; -#if ModernKeePassLibPCL +#if ModernKeePassLib using Splat; #else using System.Drawing; @@ -29,7 +29,7 @@ using System.Drawing.Imaging; #endif using System.Diagnostics; -namespace ModernKeePassLibPCL.Utility +namespace ModernKeePassLib.Utility { public static class GfxUtil { @@ -40,7 +40,7 @@ namespace ModernKeePassLibPCL.Utility try { return Image.FromStream(ms); } finally { ms.Close(); } } -#elif ModernKeePassLibPCL +#elif ModernKeePassLib public static IBitmap LoadImage(byte[] pb) { using (var ms = new MemoryStream(pb, false)) { diff --git a/ModernKeePassLib/Utility/MemUtil.cs b/ModernKeePassLib/Utility/MemUtil.cs index 62cff19..0ff5093 100644 --- a/ModernKeePassLib/Utility/MemUtil.cs +++ b/ModernKeePassLib/Utility/MemUtil.cs @@ -29,7 +29,7 @@ using System.IO.Compression; using KeePassLibSD; #endif -namespace ModernKeePassLibPCL.Utility +namespace ModernKeePassLib.Utility { /// /// Contains static buffer manipulation and string conversion routines. diff --git a/ModernKeePassLib/Utility/MessageService.cs b/ModernKeePassLib/Utility/MessageService.cs index c10296e..77e087b 100644 --- a/ModernKeePassLib/Utility/MessageService.cs +++ b/ModernKeePassLib/Utility/MessageService.cs @@ -24,10 +24,10 @@ using System.Text; using System.Windows.Forms; using System.Diagnostics; -using ModernKeePassLibPCL.Resources; -using ModernKeePassLibPCL.Serialization; +using ModernKeePassLib.Resources; +using ModernKeePassLib.Serialization; -namespace ModernKeePassLibPCL.Utility +namespace ModernKeePassLib.Utility { public sealed class MessageServiceEventArgs : EventArgs { diff --git a/ModernKeePassLib/Utility/MonoWorkarounds.cs b/ModernKeePassLib/Utility/MonoWorkarounds.cs index 83f5d3d..53f362c 100644 --- a/ModernKeePassLib/Utility/MonoWorkarounds.cs +++ b/ModernKeePassLib/Utility/MonoWorkarounds.cs @@ -25,9 +25,9 @@ using System.ComponentModel; using System.Reflection; using System.Diagnostics; -using ModernKeePassLibPCL.Native; +using ModernKeePassLib.Native; -namespace ModernKeePassLibPCL.Utility +namespace ModernKeePassLib.Utility { public static class MonoWorkarounds { diff --git a/ModernKeePassLib/Utility/StrUtil.cs b/ModernKeePassLib/Utility/StrUtil.cs index 6453e52..5a0a6bc 100644 --- a/ModernKeePassLib/Utility/StrUtil.cs +++ b/ModernKeePassLib/Utility/StrUtil.cs @@ -24,7 +24,7 @@ using System.Text; using System.Drawing; using System.IO; using System.Text.RegularExpressions; -#if ModernKeePassLibPCL +#if ModernKeePassLib using Windows.Security.Cryptography; #else using System.Security.Cryptography; @@ -32,13 +32,13 @@ using System.Security.Cryptography; using System.Globalization; using System.Diagnostics; -using ModernKeePassLibPCL.Collections; -using ModernKeePassLibPCL.Cryptography.PasswordGenerator; -using ModernKeePassLibPCL.Native; -using ModernKeePassLibPCL.Security; -using ModernKeePassLibPCL.Resources; +using ModernKeePassLib.Collections; +using ModernKeePassLib.Cryptography.PasswordGenerator; +using ModernKeePassLib.Native; +using ModernKeePassLib.Security; +using ModernKeePassLib.Resources; -namespace ModernKeePassLibPCL.Utility +namespace ModernKeePassLib.Utility { /// /// Character stream class. @@ -223,7 +223,7 @@ namespace ModernKeePassLibPCL.Utility List l = new List(); l.Add(new StrEncodingInfo(StrEncodingType.Default, -#if ModernKeePassLibPCL || KeePassRT +#if ModernKeePassLib || KeePassRT StrUtil.Utf8.WebName, StrUtil.Utf8, 1, null)); #else #if !KeePassLibSD @@ -234,7 +234,7 @@ namespace ModernKeePassLibPCL.Utility Encoding.Default, (uint)Encoding.Default.GetBytes("a").Length, null)); #endif -#if !ModernKeePassLibPCL && !KeePassRT +#if !ModernKeePassLib && !KeePassRT l.Add(new StrEncodingInfo(StrEncodingType.Ascii, "ASCII", Encoding.ASCII, 1, null)); l.Add(new StrEncodingInfo(StrEncodingType.Utf7, @@ -248,7 +248,7 @@ namespace ModernKeePassLibPCL.Utility l.Add(new StrEncodingInfo(StrEncodingType.Utf16BE, "Unicode (UTF-16 BE)", new UnicodeEncoding(true, false), 2, new byte[] { 0xFE, 0xFF })); -#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT) +#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT) l.Add(new StrEncodingInfo(StrEncodingType.Utf32LE, "Unicode (UTF-32 LE)", new UTF32Encoding(false, false), 4, new byte[] { 0xFF, 0xFE, 0x0, 0x0 })); @@ -499,7 +499,7 @@ namespace ModernKeePassLibPCL.Utility if(excp.StackTrace != null) strText += excp.StackTrace + Environment.NewLine; #if !KeePassLibSD -#if !ModernKeePassLibPCL && !KeePassRT +#if !ModernKeePassLib && !KeePassRT if(excp.TargetSite != null) strText += excp.TargetSite.ToString() + MessageService.NewLine; #endif @@ -525,7 +525,7 @@ namespace ModernKeePassLibPCL.Utility if(excp.InnerException.StackTrace != null) strText += excp.InnerException.StackTrace + Environment.NewLine; #if !KeePassLibSD -#if !ModernKeePassLibPCL && !KeePassRT +#if !ModernKeePassLib && !KeePassRT if(excp.InnerException.TargetSite != null) strText += excp.InnerException.TargetSite.ToString(); #endif @@ -778,7 +778,7 @@ namespace ModernKeePassLibPCL.Utility if(m_rxNaturalSplit == null) m_rxNaturalSplit = new Regex(@"([0-9]+)", -#if ModernKeePassLibPCL || KeePassRT +#if ModernKeePassLib || KeePassRT RegexOptions.None); #else RegexOptions.Compiled); @@ -1192,7 +1192,7 @@ namespace ModernKeePassLibPCL.Utility byte[] pbEnc = ProtectedData.Protect(pbPlain, m_pbOptEnt, DataProtectionScope.CurrentUser); -#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT) +#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT) return Convert.ToBase64String(pbEnc, Base64FormattingOptions.None); #else return Convert.ToBase64String(pbEnc); @@ -1305,7 +1305,7 @@ namespace ModernKeePassLibPCL.Utility Array.Reverse(pb); for(int i = 0; i < pb.Length; ++i) pb[i] = (byte)(pb[i] ^ 0x65); -#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT) +#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT) return Convert.ToBase64String(pb, Base64FormattingOptions.None); #else return Convert.ToBase64String(pb); @@ -1465,7 +1465,7 @@ namespace ModernKeePassLibPCL.Utility if(strMimeType == null) strMimeType = "application/octet-stream"; -#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT) +#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT) return ("data:" + strMimeType + ";base64," + Convert.ToBase64String( pbData, Base64FormattingOptions.None)); #else @@ -1496,7 +1496,7 @@ namespace ModernKeePassLibPCL.Utility MemoryStream ms = new MemoryStream(); -#if ModernKeePassLibPCL || KeePassRT +#if ModernKeePassLib || KeePassRT Encoding enc = StrUtil.Utf8; #else Encoding enc = Encoding.ASCII; diff --git a/ModernKeePassLib/Utility/TimeUtil.cs b/ModernKeePassLib/Utility/TimeUtil.cs index a8b7442..9963dc3 100644 --- a/ModernKeePassLib/Utility/TimeUtil.cs +++ b/ModernKeePassLib/Utility/TimeUtil.cs @@ -23,9 +23,9 @@ using System.Text; using System.Globalization; using System.Diagnostics; -using ModernKeePassLibPCL.Interfaces; +using ModernKeePassLib.Interfaces; -namespace ModernKeePassLibPCL.Utility +namespace ModernKeePassLib.Utility { /// /// Contains various static time structure manipulation and conversion diff --git a/ModernKeePassLib/Utility/UrlUtil.cs b/ModernKeePassLib/Utility/UrlUtil.cs index aa73ba7..5ac733a 100644 --- a/ModernKeePassLib/Utility/UrlUtil.cs +++ b/ModernKeePassLib/Utility/UrlUtil.cs @@ -24,14 +24,14 @@ using System.Runtime.InteropServices; using System.Text; using System.Diagnostics; -#if ModernKeePassLibPCL +#if ModernKeePassLib //using PCLStorage; using Windows.Storage; #endif -using ModernKeePassLibPCL.Native; +using ModernKeePassLib.Native; -namespace ModernKeePassLibPCL.Utility +namespace ModernKeePassLib.Utility { /// /// A class containing various static path utility helper methods (like @@ -41,7 +41,7 @@ namespace ModernKeePassLibPCL.Utility { private static readonly char[] m_vDirSeps = new char[] { '\\', '/', UrlUtil.LocalDirSepChar }; -#if !ModernKeePassLibPCL +#if !ModernKeePassLib private static readonly char[] m_vPathTrimCharsWs = new char[] { '\"', ' ', '\t', '\r', '\n' }; #endif @@ -50,7 +50,7 @@ namespace ModernKeePassLibPCL.Utility { #if KeePassRT get { return '\\'; } -#elif ModernKeePassLibPCL +#elif ModernKeePassLib //get { return PortablePath.DirectorySeparatorChar; } get { return '\\'; } #else @@ -267,7 +267,7 @@ namespace ModernKeePassLibPCL.Utility public static bool UnhideFile(string strFile) { -#if (ModernKeePassLibPCL || KeePassLibSD || KeePassRT) +#if (ModernKeePassLib || KeePassLibSD || KeePassRT) return false; #else if(strFile == null) throw new ArgumentNullException("strFile"); @@ -287,7 +287,7 @@ namespace ModernKeePassLibPCL.Utility public static bool HideFile(string strFile, bool bHide) { -#if (ModernKeePassLibPCL || KeePassLibSD || KeePassRT) +#if (ModernKeePassLib || KeePassLibSD || KeePassRT) return false; #else if(strFile == null) throw new ArgumentNullException("strFile"); @@ -328,7 +328,7 @@ namespace ModernKeePassLibPCL.Utility return strTargetFile; } -#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT) +#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT) if(NativeLib.IsUnix()) #endif { @@ -361,7 +361,7 @@ namespace ModernKeePassLibPCL.Utility return sbRel.ToString(); } -#if (!ModernKeePassLibPCL && !KeePassLibSD && !KeePassRT) +#if (!ModernKeePassLib && !KeePassLibSD && !KeePassRT) try // Windows { const int nMaxPath = NativeMethods.MAX_PATH * 2; @@ -458,7 +458,7 @@ namespace ModernKeePassLibPCL.Utility var dirT = Windows.Storage.StorageFolder.GetFolderFromPathAsync( strPath).AwaitEx(); str = dirT.Path; -#elif ModernKeePassLibPCL +#elif ModernKeePassLib var dirT = StorageFolder.GetFolderFromPathAsync( strPath).GetResults(); str = dirT.Path; @@ -636,7 +636,7 @@ namespace ModernKeePassLibPCL.Utility return false; } -#if !ModernKeePassLibPCL +#if !ModernKeePassLib public static string GetTempPath() { string strDir; @@ -659,7 +659,7 @@ namespace ModernKeePassLibPCL.Utility } #endif -#if !ModernKeePassLibPCL && !KeePassLibSD +#if !ModernKeePassLib && !KeePassLibSD // Structurally mostly equivalent to UrlUtil.GetFileInfos public static List GetFilePaths(string strDir, string strPattern, SearchOption opt) diff --git a/ModernKeePassLib/project.json b/ModernKeePassLib/project.json index 2764ad2..0c3f63e 100644 --- a/ModernKeePassLib/project.json +++ b/ModernKeePassLib/project.json @@ -2,9 +2,8 @@ "supports": {}, "dependencies": { "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "NETStandard.Library": "1.6.0", - "PInvoke.Windows.Core": "0.5.97", - "Portable.BouncyCastle": "1.8.1.1", + "NETStandard.Library": "2.0.0", + "Portable.BouncyCastle": "1.8.1.3", "Splat": "2.0.0", "System.Runtime.WindowsRuntime": "4.3.0", "System.Xml.ReaderWriter": "4.3.0", diff --git a/ModernKeePassLib/project.lock.json b/ModernKeePassLib/project.lock.json index 2f35586..2aa1075 100644 --- a/ModernKeePassLib/project.lock.json +++ b/ModernKeePassLib/project.lock.json @@ -69,82 +69,65 @@ "Microsoft.NETCore.Windows.ApiSets/1.0.1": { "type": "package" }, - "NETStandard.Library/1.6.0": { + "NETStandard.Library/2.0.0": { "type": "package", "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "System.Collections": "4.0.11", - "System.Collections.Concurrent": "4.0.12", - "System.Diagnostics.Debug": "4.0.11", - "System.Diagnostics.Tools": "4.0.1", - "System.Diagnostics.Tracing": "4.1.0", - "System.Globalization": "4.0.11", - "System.IO": "4.1.0", - "System.IO.Compression": "4.1.0", - "System.Linq": "4.1.0", - "System.Linq.Expressions": "4.1.0", - "System.Net.Http": "4.1.0", - "System.Net.Primitives": "4.0.11", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Extensions": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0", - "System.Runtime.Numerics": "4.0.1", - "System.Text.Encoding": "4.0.11", - "System.Text.Encoding.Extensions": "4.0.11", - "System.Text.RegularExpressions": "4.1.0", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11", - "System.Threading.Timer": "4.0.1", - "System.Xml.ReaderWriter": "4.0.11", - "System.Xml.XDocument": "4.0.11" + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Collections.Concurrent": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tools": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.IO.Compression": "4.3.0", + "System.Linq": "4.3.0", + "System.Linq.Expressions": "4.3.0", + "System.Net.Http": "4.3.2", + "System.Net.Primitives": "4.3.0", + "System.ObjectModel": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Text.RegularExpressions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Threading.Timer": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0", + "System.Xml.XDocument": "4.3.0" + }, + "compile": { + "lib/netstandard1.0/_._": {} + }, + "runtime": { + "lib/netstandard1.0/_._": {} } }, - "PInvoke.Windows.Core/0.5.97": { + "Portable.BouncyCastle/1.8.1.3": { "type": "package", "dependencies": { "NETStandard.Library": "1.6.1" }, "compile": { - "lib/netstandard1.1/PInvoke.Windows.Core.dll": {} + "lib/netstandard1.0/BouncyCastle.Crypto.dll": {} }, "runtime": { - "lib/netstandard1.1/PInvoke.Windows.Core.dll": {} + "lib/netstandard1.0/BouncyCastle.Crypto.dll": {} } }, - "Portable.BouncyCastle/1.8.1.1": { + "runtime.native.System/4.3.0": { "type": "package", "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Globalization": "4.0.11", - "System.IO": "4.1.0", - "System.Linq": "4.1.0", - "System.Reflection": "4.1.0", - "System.Reflection.Extensions": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Text.Encoding": "4.0.11", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11" - }, - "compile": { - "lib/netstandard1.0/crypto.dll": {} - }, - "runtime": { - "lib/netstandard1.0/crypto.dll": {} - } - }, - "runtime.native.System/4.0.0": { - "type": "package", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1" + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" }, "compile": { "lib/netstandard1.0/_._": {} @@ -162,66 +145,66 @@ "lib/netstandard1.1/Splat.dll": {} } }, - "System.Collections/4.0.11": { + "System.Collections/4.3.0": { "type": "package", "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" }, "compile": { "ref/netstandard1.0/System.Collections.dll": {} } }, - "System.Collections.Concurrent/4.0.12": { + "System.Collections.Concurrent/4.3.0": { "type": "package", "dependencies": { - "System.Runtime": "4.1.0", - "System.Threading.Tasks": "4.0.11" + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" }, "compile": { "ref/netstandard1.1/System.Collections.Concurrent.dll": {} } }, - "System.Diagnostics.Debug/4.0.11": { + "System.Diagnostics.Debug/4.3.0": { "type": "package", "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" }, "compile": { "ref/netstandard1.0/System.Diagnostics.Debug.dll": {} } }, - "System.Diagnostics.Tools/4.0.1": { + "System.Diagnostics.Tools/4.3.0": { "type": "package", "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" }, "compile": { "ref/netstandard1.0/System.Diagnostics.Tools.dll": {} } }, - "System.Diagnostics.Tracing/4.1.0": { + "System.Diagnostics.Tracing/4.3.0": { "type": "package", "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" }, "compile": { "ref/netstandard1.2/System.Diagnostics.Tracing.dll": {} } }, - "System.Globalization/4.0.11": { + "System.Globalization/4.3.0": { "type": "package", "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" }, "compile": { "ref/netstandard1.0/System.Globalization.dll": {} @@ -240,114 +223,114 @@ "ref/netstandard1.0/System.IO.dll": {} } }, - "System.IO.Compression/4.1.0": { + "System.IO.Compression/4.3.0": { "type": "package", "dependencies": { - "System.IO": "4.1.0", - "System.Runtime": "4.1.0", - "System.Text.Encoding": "4.0.11" + "System.IO": "4.3.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0" }, "compile": { "ref/netstandard1.1/System.IO.Compression.dll": {} } }, - "System.Linq/4.1.0": { + "System.Linq/4.3.0": { "type": "package", "dependencies": { - "System.Collections": "4.0.11", - "System.Runtime": "4.1.0" + "System.Collections": "4.3.0", + "System.Runtime": "4.3.0" }, "compile": { "ref/netstandard1.0/System.Linq.dll": {} } }, - "System.Linq.Expressions/4.1.0": { + "System.Linq.Expressions/4.3.0": { "type": "package", "dependencies": { - "System.Reflection": "4.1.0", - "System.Runtime": "4.1.0" + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" }, "compile": { "ref/netstandard1.0/System.Linq.Expressions.dll": {} } }, - "System.Net.Http/4.1.0": { + "System.Net.Http/4.3.2": { "type": "package", "dependencies": { - "System.IO": "4.1.0", - "System.Net.Primitives": "4.0.11", - "System.Runtime": "4.1.0", - "System.Text.Encoding": "4.0.11", - "System.Threading.Tasks": "4.0.11" + "System.IO": "4.3.0", + "System.Net.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" }, "compile": { "ref/netstandard1.1/System.Net.Http.dll": {} } }, - "System.Net.Primitives/4.0.11": { + "System.Net.Primitives/4.3.0": { "type": "package", "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" }, "compile": { "ref/netstandard1.1/System.Net.Primitives.dll": {} } }, - "System.ObjectModel/4.0.12": { + "System.ObjectModel/4.3.0": { "type": "package", "dependencies": { - "System.Runtime": "4.1.0" + "System.Runtime": "4.3.0" }, "compile": { "ref/netstandard1.0/System.ObjectModel.dll": {} } }, - "System.Reflection/4.1.0": { + "System.Reflection/4.3.0": { "type": "package", "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.IO": "4.1.0", - "System.Reflection.Primitives": "4.0.1", - "System.Runtime": "4.1.0" + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" }, "compile": { "ref/netstandard1.0/System.Reflection.dll": {} } }, - "System.Reflection.Extensions/4.0.1": { + "System.Reflection.Extensions/4.3.0": { "type": "package", "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Reflection": "4.1.0", - "System.Runtime": "4.1.0" + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" }, "compile": { "ref/netstandard1.0/System.Reflection.Extensions.dll": {} } }, - "System.Reflection.Primitives/4.0.1": { + "System.Reflection.Primitives/4.3.0": { "type": "package", "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" }, "compile": { "ref/netstandard1.0/System.Reflection.Primitives.dll": {} } }, - "System.Resources.ResourceManager/4.0.1": { + "System.Resources.ResourceManager/4.3.0": { "type": "package", "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Globalization": "4.0.11", - "System.Reflection": "4.1.0", - "System.Runtime": "4.1.0" + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" }, "compile": { "ref/netstandard1.0/System.Resources.ResourceManager.dll": {} @@ -363,44 +346,47 @@ "ref/netstandard1.2/System.Runtime.dll": {} } }, - "System.Runtime.Extensions/4.1.0": { + "System.Runtime.Extensions/4.3.0": { "type": "package", "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" }, "compile": { "ref/netstandard1.0/System.Runtime.Extensions.dll": {} } }, - "System.Runtime.InteropServices/4.1.0": { + "System.Runtime.InteropServices/4.3.0": { "type": "package", "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Reflection": "4.1.0", - "System.Reflection.Primitives": "4.0.1", - "System.Runtime": "4.1.0" + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Reflection": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" }, "compile": { "ref/netstandard1.2/System.Runtime.InteropServices.dll": {} } }, - "System.Runtime.InteropServices.RuntimeInformation/4.0.0": { + "System.Runtime.InteropServices.RuntimeInformation/4.3.0": { "type": "package", "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "System.Reflection": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Threading": "4.0.11", - "runtime.native.System": "4.0.0" + "System.Reflection": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Threading": "4.3.0", + "runtime.native.System": "4.3.0" }, "compile": { "ref/netstandard1.1/System.Runtime.InteropServices.RuntimeInformation.dll": {} }, + "runtime": { + "lib/netstandard1.1/System.Runtime.InteropServices.RuntimeInformation.dll": {} + }, "runtimeTargets": { "runtimes/unix/lib/netstandard1.1/System.Runtime.InteropServices.RuntimeInformation.dll": { "assetType": "runtime", @@ -412,10 +398,10 @@ } } }, - "System.Runtime.Numerics/4.0.1": { + "System.Runtime.Numerics/4.3.0": { "type": "package", "dependencies": { - "System.Runtime": "4.1.0" + "System.Runtime": "4.3.0" }, "compile": { "ref/netstandard1.1/System.Runtime.Numerics.dll": {} @@ -443,32 +429,32 @@ "ref/netstandard1.0/System.Text.Encoding.dll": {} } }, - "System.Text.Encoding.Extensions/4.0.11": { + "System.Text.Encoding.Extensions/4.3.0": { "type": "package", "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0", - "System.Text.Encoding": "4.0.11" + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0" }, "compile": { "ref/netstandard1.0/System.Text.Encoding.Extensions.dll": {} } }, - "System.Text.RegularExpressions/4.1.0": { + "System.Text.RegularExpressions/4.3.0": { "type": "package", "dependencies": { - "System.Runtime": "4.1.0" + "System.Runtime": "4.3.0" }, "compile": { "ref/netstandard1.0/System.Text.RegularExpressions.dll": {} } }, - "System.Threading/4.0.11": { + "System.Threading/4.3.0": { "type": "package", "dependencies": { - "System.Runtime": "4.1.0", - "System.Threading.Tasks": "4.0.11" + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" }, "compile": { "ref/netstandard1.0/System.Threading.dll": {} @@ -485,12 +471,12 @@ "ref/netstandard1.0/System.Threading.Tasks.dll": {} } }, - "System.Threading.Timer/4.0.1": { + "System.Threading.Timer/4.3.0": { "type": "package", "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" }, "compile": { "ref/netstandard1.2/System.Threading.Timer.dll": {} @@ -508,12 +494,12 @@ "ref/netstandard1.0/System.Xml.ReaderWriter.dll": {} } }, - "System.Xml.XDocument/4.0.11": { + "System.Xml.XDocument/4.3.0": { "type": "package", "dependencies": { - "System.IO": "4.1.0", - "System.Runtime": "4.1.0", - "System.Xml.ReaderWriter": "4.0.11" + "System.IO": "4.3.0", + "System.Runtime": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0" }, "compile": { "ref/netstandard1.0/System.Xml.XDocument.dll": {} @@ -680,60 +666,159 @@ "runtime.json" ] }, - "NETStandard.Library/1.6.0": { - "sha512": "jm2kphgr45o12LIu+N0VGATQnkOhTKVUmDT3tHCiO1FYlPH8p0RR9PSldA2+wLLJfofb260sBCnB6ZIywLm81w==", + "NETStandard.Library/2.0.0": { + "sha512": "7jnbRU+L08FXKMxqUflxEXtVymWvNOrS8yHgu9s6EM8Anr6T/wIX4nZ08j/u3Asz+tCufp3YVwFSEvFTPYmBPA==", "type": "package", "files": [ - "ThirdPartyNotices.txt", - "dotnet_library_license.txt", - "netstandard.library.1.6.0.nupkg.sha512", - "netstandard.library.nuspec" + "LICENSE.TXT", + "NETStandard.Library.2.0.0.nupkg.sha512", + "NETStandard.Library.nuspec", + "THIRD-PARTY-NOTICES.TXT", + "build/NETStandard.Library.targets", + "build/netstandard2.0/NETStandard.Library.targets", + "build/netstandard2.0/ref/Microsoft.Win32.Primitives.dll", + "build/netstandard2.0/ref/System.AppContext.dll", + "build/netstandard2.0/ref/System.Collections.Concurrent.dll", + "build/netstandard2.0/ref/System.Collections.NonGeneric.dll", + "build/netstandard2.0/ref/System.Collections.Specialized.dll", + "build/netstandard2.0/ref/System.Collections.dll", + "build/netstandard2.0/ref/System.ComponentModel.Composition.dll", + "build/netstandard2.0/ref/System.ComponentModel.EventBasedAsync.dll", + "build/netstandard2.0/ref/System.ComponentModel.Primitives.dll", + "build/netstandard2.0/ref/System.ComponentModel.TypeConverter.dll", + "build/netstandard2.0/ref/System.ComponentModel.dll", + "build/netstandard2.0/ref/System.Console.dll", + "build/netstandard2.0/ref/System.Core.dll", + "build/netstandard2.0/ref/System.Data.Common.dll", + "build/netstandard2.0/ref/System.Data.dll", + "build/netstandard2.0/ref/System.Diagnostics.Contracts.dll", + "build/netstandard2.0/ref/System.Diagnostics.Debug.dll", + "build/netstandard2.0/ref/System.Diagnostics.FileVersionInfo.dll", + "build/netstandard2.0/ref/System.Diagnostics.Process.dll", + "build/netstandard2.0/ref/System.Diagnostics.StackTrace.dll", + "build/netstandard2.0/ref/System.Diagnostics.TextWriterTraceListener.dll", + "build/netstandard2.0/ref/System.Diagnostics.Tools.dll", + "build/netstandard2.0/ref/System.Diagnostics.TraceSource.dll", + "build/netstandard2.0/ref/System.Diagnostics.Tracing.dll", + "build/netstandard2.0/ref/System.Drawing.Primitives.dll", + "build/netstandard2.0/ref/System.Drawing.dll", + "build/netstandard2.0/ref/System.Dynamic.Runtime.dll", + "build/netstandard2.0/ref/System.Globalization.Calendars.dll", + "build/netstandard2.0/ref/System.Globalization.Extensions.dll", + "build/netstandard2.0/ref/System.Globalization.dll", + "build/netstandard2.0/ref/System.IO.Compression.FileSystem.dll", + "build/netstandard2.0/ref/System.IO.Compression.ZipFile.dll", + "build/netstandard2.0/ref/System.IO.Compression.dll", + "build/netstandard2.0/ref/System.IO.FileSystem.DriveInfo.dll", + "build/netstandard2.0/ref/System.IO.FileSystem.Primitives.dll", + "build/netstandard2.0/ref/System.IO.FileSystem.Watcher.dll", + "build/netstandard2.0/ref/System.IO.FileSystem.dll", + "build/netstandard2.0/ref/System.IO.IsolatedStorage.dll", + "build/netstandard2.0/ref/System.IO.MemoryMappedFiles.dll", + "build/netstandard2.0/ref/System.IO.Pipes.dll", + "build/netstandard2.0/ref/System.IO.UnmanagedMemoryStream.dll", + "build/netstandard2.0/ref/System.IO.dll", + "build/netstandard2.0/ref/System.Linq.Expressions.dll", + "build/netstandard2.0/ref/System.Linq.Parallel.dll", + "build/netstandard2.0/ref/System.Linq.Queryable.dll", + "build/netstandard2.0/ref/System.Linq.dll", + "build/netstandard2.0/ref/System.Net.Http.dll", + "build/netstandard2.0/ref/System.Net.NameResolution.dll", + "build/netstandard2.0/ref/System.Net.NetworkInformation.dll", + "build/netstandard2.0/ref/System.Net.Ping.dll", + "build/netstandard2.0/ref/System.Net.Primitives.dll", + "build/netstandard2.0/ref/System.Net.Requests.dll", + "build/netstandard2.0/ref/System.Net.Security.dll", + "build/netstandard2.0/ref/System.Net.Sockets.dll", + "build/netstandard2.0/ref/System.Net.WebHeaderCollection.dll", + "build/netstandard2.0/ref/System.Net.WebSockets.Client.dll", + "build/netstandard2.0/ref/System.Net.WebSockets.dll", + "build/netstandard2.0/ref/System.Net.dll", + "build/netstandard2.0/ref/System.Numerics.dll", + "build/netstandard2.0/ref/System.ObjectModel.dll", + "build/netstandard2.0/ref/System.Reflection.Extensions.dll", + "build/netstandard2.0/ref/System.Reflection.Primitives.dll", + "build/netstandard2.0/ref/System.Reflection.dll", + "build/netstandard2.0/ref/System.Resources.Reader.dll", + "build/netstandard2.0/ref/System.Resources.ResourceManager.dll", + "build/netstandard2.0/ref/System.Resources.Writer.dll", + "build/netstandard2.0/ref/System.Runtime.CompilerServices.VisualC.dll", + "build/netstandard2.0/ref/System.Runtime.Extensions.dll", + "build/netstandard2.0/ref/System.Runtime.Handles.dll", + "build/netstandard2.0/ref/System.Runtime.InteropServices.RuntimeInformation.dll", + "build/netstandard2.0/ref/System.Runtime.InteropServices.dll", + "build/netstandard2.0/ref/System.Runtime.Numerics.dll", + "build/netstandard2.0/ref/System.Runtime.Serialization.Formatters.dll", + "build/netstandard2.0/ref/System.Runtime.Serialization.Json.dll", + "build/netstandard2.0/ref/System.Runtime.Serialization.Primitives.dll", + "build/netstandard2.0/ref/System.Runtime.Serialization.Xml.dll", + "build/netstandard2.0/ref/System.Runtime.Serialization.dll", + "build/netstandard2.0/ref/System.Runtime.dll", + "build/netstandard2.0/ref/System.Security.Claims.dll", + "build/netstandard2.0/ref/System.Security.Cryptography.Algorithms.dll", + "build/netstandard2.0/ref/System.Security.Cryptography.Csp.dll", + "build/netstandard2.0/ref/System.Security.Cryptography.Encoding.dll", + "build/netstandard2.0/ref/System.Security.Cryptography.Primitives.dll", + "build/netstandard2.0/ref/System.Security.Cryptography.X509Certificates.dll", + "build/netstandard2.0/ref/System.Security.Principal.dll", + "build/netstandard2.0/ref/System.Security.SecureString.dll", + "build/netstandard2.0/ref/System.ServiceModel.Web.dll", + "build/netstandard2.0/ref/System.Text.Encoding.Extensions.dll", + "build/netstandard2.0/ref/System.Text.Encoding.dll", + "build/netstandard2.0/ref/System.Text.RegularExpressions.dll", + "build/netstandard2.0/ref/System.Threading.Overlapped.dll", + "build/netstandard2.0/ref/System.Threading.Tasks.Parallel.dll", + "build/netstandard2.0/ref/System.Threading.Tasks.dll", + "build/netstandard2.0/ref/System.Threading.Thread.dll", + "build/netstandard2.0/ref/System.Threading.ThreadPool.dll", + "build/netstandard2.0/ref/System.Threading.Timer.dll", + "build/netstandard2.0/ref/System.Threading.dll", + "build/netstandard2.0/ref/System.Transactions.dll", + "build/netstandard2.0/ref/System.ValueTuple.dll", + "build/netstandard2.0/ref/System.Web.dll", + "build/netstandard2.0/ref/System.Windows.dll", + "build/netstandard2.0/ref/System.Xml.Linq.dll", + "build/netstandard2.0/ref/System.Xml.ReaderWriter.dll", + "build/netstandard2.0/ref/System.Xml.Serialization.dll", + "build/netstandard2.0/ref/System.Xml.XDocument.dll", + "build/netstandard2.0/ref/System.Xml.XPath.XDocument.dll", + "build/netstandard2.0/ref/System.Xml.XPath.dll", + "build/netstandard2.0/ref/System.Xml.XmlDocument.dll", + "build/netstandard2.0/ref/System.Xml.XmlSerializer.dll", + "build/netstandard2.0/ref/System.Xml.dll", + "build/netstandard2.0/ref/System.dll", + "build/netstandard2.0/ref/mscorlib.dll", + "build/netstandard2.0/ref/netstandard.dll", + "build/netstandard2.0/ref/netstandard.xml", + "lib/netstandard1.0/_._" ] }, - "PInvoke.Windows.Core/0.5.97": { - "sha512": "7ZZKOf/AxOzXV1WiaXHxqZgG1zTsqAF3vPEpJ4MLC13eA2eU/KeSo3T3KEIBsCYu96GHX0iKHCrAQoyFpEePZw==", + "Portable.BouncyCastle/1.8.1.3": { + "sha512": "imXKRLrhXlEoeus5w5h1t6E1uwSP45N1qn7Gz+kp8GaFKkNuN0GOMMlIWDQ0P0O6OmHL7odRyd+npNmJQTcgwg==", "type": "package", "files": [ - "PInvoke.Windows.Core.0.5.97.nupkg.sha512", - "PInvoke.Windows.Core.nuspec", - "lib/net20/PInvoke.Windows.Core.dll", - "lib/net20/PInvoke.Windows.Core.xml", - "lib/net35/PInvoke.Windows.Core.dll", - "lib/net35/PInvoke.Windows.Core.xml", - "lib/netstandard1.1/PInvoke.Windows.Core.dll", - "lib/netstandard1.1/PInvoke.Windows.Core.xml", - "lib/portable-net40+win8+wpa81/PInvoke.Windows.Core.dll", - "lib/portable-net40+win8+wpa81/PInvoke.Windows.Core.xml", - "lib/portable-net45+win8+wpa81/PInvoke.Windows.Core.dll", - "lib/portable-net45+win8+wpa81/PInvoke.Windows.Core.xml" - ] - }, - "Portable.BouncyCastle/1.8.1.1": { - "sha512": "rv/VIvOMhZaZ6iSyKeJiwrYWq4J05Td59VekLxmLD+nR0liHFLPtkUtPfJL2sMaVghy1PpF/HjSvvcoNZQtlGA==", - "type": "package", - "files": [ - "Portable.BouncyCastle.1.8.1.1.nupkg.sha512", + "Portable.BouncyCastle.1.8.1.3.nupkg.sha512", "Portable.BouncyCastle.nuspec", - "Readme.html", - "lib/netstandard1.0/crypto.dll", - "lib/netstandard1.0/crypto.pdb", - "lib/netstandard1.0/crypto.xml", - "lib/netstandard1.3/crypto.dll", - "lib/netstandard1.3/crypto.pdb", - "lib/netstandard1.3/crypto.xml", - "lib/portable-net4+sl5+wp8+win8+wpa81/crypto.dll", - "lib/portable-net4+sl5+wp8+win8+wpa81/crypto.pdb", - "lib/portable-net4+sl5+wp8+win8+wpa81/crypto.xml" + "lib/net40/BouncyCastle.Crypto.dll", + "lib/net40/BouncyCastle.Crypto.xml", + "lib/netstandard1.0/BouncyCastle.Crypto.dll", + "lib/netstandard1.0/BouncyCastle.Crypto.xml", + "lib/netstandard1.3/BouncyCastle.Crypto.dll", + "lib/netstandard1.3/BouncyCastle.Crypto.xml", + "lib/netstandard2.0/BouncyCastle.Crypto.dll", + "lib/netstandard2.0/BouncyCastle.Crypto.xml", + "lib/portable-net40+sl5+win8+wp8+wpa81/BouncyCastle.Crypto.dll", + "lib/portable-net40+sl5+win8+wp8+wpa81/BouncyCastle.Crypto.xml" ] }, - "runtime.native.System/4.0.0": { - "sha512": "QcQUghVj1shUpPVYepSVQL1K4hhN7Nu1orN0snxBVi+6x8+fHLPoqJQrH4cKAOX8Lr5JIFrIljv/rS3bfeSqQg==", + "runtime.native.System/4.3.0": { + "sha512": "HhykbX7CxJfRxeSnztqdszl4wvsxTi3Q5vhPitlPQt5LKBI6q2cvXrQjBS1FTBgdA3O+rliE86qsDCu1mzLXYg==", "type": "package", "files": [ "ThirdPartyNotices.txt", "dotnet_library_license.txt", "lib/netstandard1.0/_._", - "runtime.native.system.4.0.0.nupkg.sha512", + "runtime.native.system.4.3.0.nupkg.sha512", "runtime.native.system.nuspec" ] }, @@ -763,8 +848,8 @@ "src/TypeForwardedSystemDrawing.cs" ] }, - "System.Collections/4.0.11": { - "sha512": "gI47opqDjF8kqrCmjKuhLivUmd0wqU/Gtj7SgDQg8OGyVVbnMZfFM+q5NU8xLisSt8iPtgecS8sKBNmJKC9Mlw==", + "System.Collections/4.3.0": { + "sha512": "odtewSKaGFM1cRV0i2f+fF1wDTcPLisgZVNa1Jrm88mDNAxD52TRh0U51jwqs73RH91GYI4ogCkF9r7W0zVoDw==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -824,12 +909,12 @@ "ref/xamarinmac20/_._", "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", - "system.collections.4.0.11.nupkg.sha512", + "system.collections.4.3.0.nupkg.sha512", "system.collections.nuspec" ] }, - "System.Collections.Concurrent/4.0.12": { - "sha512": "GeDttrjKz39uj/KC6+uyI40Qp6hRgeI9BrBUwJTKSF15FklM5Zrq4gaWDQqzNP7kC3i+088+mwRr/o3BT3j7Cg==", + "System.Collections.Concurrent/4.3.0": { + "sha512": "574p/+ur5xdbM7fZCoFJLM2pqCO4B843KdXjrxYZC9AGSiDwAtlq90gkgg3xg5YwcDPa/C7Y0Uylh2n7QIZ5nQ==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -889,12 +974,12 @@ "ref/xamarinmac20/_._", "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", - "system.collections.concurrent.4.0.12.nupkg.sha512", + "system.collections.concurrent.4.3.0.nupkg.sha512", "system.collections.concurrent.nuspec" ] }, - "System.Diagnostics.Debug/4.0.11": { - "sha512": "pvtcqWa9XnPsIXfD8nF8aoU1TWE8RpMv/WnZiNG4CEmGJjRvCPTNaXFrA/lXPimAfZxiEocPwvz9caGdt6tpuA==", + "System.Diagnostics.Debug/4.3.0": { + "sha512": "1woBURpg50IpEZZ7BK8AZe1T24GsBY+e6MyEufMAPVMZoVzRDRwejOLLfIIkgY2hgw0bk6CXAFg4dB2iFF5IVQ==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -954,12 +1039,12 @@ "ref/xamarinmac20/_._", "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", - "system.diagnostics.debug.4.0.11.nupkg.sha512", + "system.diagnostics.debug.4.3.0.nupkg.sha512", "system.diagnostics.debug.nuspec" ] }, - "System.Diagnostics.Tools/4.0.1": { - "sha512": "5edPT/p4Vj3nu9d8cZ9nNojrbbzrFOMTBNTd/8k/y45AAJ8AP0fzKyGh1jFbggASl0tYqhAFj+GjdNBZUAE/kA==", + "System.Diagnostics.Tools/4.3.0": { + "sha512": "cNBqRhfTSwBU0OfXuTvV+sRaE8EfJRYrkh1giN74UvENZb6SHLJw23GroCIrvyV4j03gp0a1028I4dEsRi0XoQ==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -1008,12 +1093,12 @@ "ref/xamarinmac20/_._", "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", - "system.diagnostics.tools.4.0.1.nupkg.sha512", + "system.diagnostics.tools.4.3.0.nupkg.sha512", "system.diagnostics.tools.nuspec" ] }, - "System.Diagnostics.Tracing/4.1.0": { - "sha512": "T0fLVaiUHm48/lp0UdTDOpKARVjsLF3vgPLsQ39gbjcl8M86mBcuHByeUE/zWlmF+NG/sOLrpMvsoZcs0t8W5Q==", + "System.Diagnostics.Tracing/4.3.0": { + "sha512": "sE7+yUZUrkcebditDSxZLnsCwG/oI4RELRdhSmen0ig1AH1kW5b9ztJ7HQbK3sCIuY0Yd5OvqyX0pOie4T35fQ==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -1095,12 +1180,12 @@ "ref/xamarinmac20/_._", "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", - "system.diagnostics.tracing.4.1.0.nupkg.sha512", + "system.diagnostics.tracing.4.3.0.nupkg.sha512", "system.diagnostics.tracing.nuspec" ] }, - "System.Globalization/4.0.11": { - "sha512": "jKDAH5XVjHjweq8crjx3BSlUQgg7xAASK4pBQVX8xUn1mHZjw0Fm/s+Svih8PyI1hhpR8zZjvvxholEMV4OEaw==", + "System.Globalization/4.3.0": { + "sha512": "VqCYVd4WTRcRl/U08cJOFmyDFPs79CFfcEbav+p7Q5Sj7Lokf0R+mD0TEc+f8+GVBRtaff6b+mknJnIR44LvYQ==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -1160,7 +1245,7 @@ "ref/xamarinmac20/_._", "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", - "system.globalization.4.0.11.nupkg.sha512", + "system.globalization.4.3.0.nupkg.sha512", "system.globalization.nuspec" ] }, @@ -1242,8 +1327,8 @@ "system.io.nuspec" ] }, - "System.IO.Compression/4.1.0": { - "sha512": "j4zrCXlVjYGIp55UA34nhjpamFzfKDPImwlxlJetNJktbMTUta69sLOiWBeykFuBIYH/ejv1JpM6V+iyVyzflQ==", + "System.IO.Compression/4.3.0": { + "sha512": "+G+M250pfD6KOqeADMPvbO2jPqV0UMtE3YECosM/p5bU0Krytlo0qNBrqtbk7uHJS3kOle5kk3T7zlxd/z/pTA==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -1306,12 +1391,12 @@ "runtimes/unix/lib/netstandard1.3/System.IO.Compression.dll", "runtimes/win/lib/net46/System.IO.Compression.dll", "runtimes/win/lib/netstandard1.3/System.IO.Compression.dll", - "system.io.compression.4.1.0.nupkg.sha512", + "system.io.compression.4.3.0.nupkg.sha512", "system.io.compression.nuspec" ] }, - "System.Linq/4.1.0": { - "sha512": "EX0TJleLmwt3ZxxMBhVcOrtfRcLcfhC/U3aj/IgFMnk2ZEqSGIFv3XHdcgNzjUIahKGH7q7lJCRhvy+E3diclg==", + "System.Linq/4.3.0": { + "sha512": "w9wJuI2T9KXZmY/AS7E4PUVzGPS0jhlx1YlKsgzShgNj6Vk9iN7R8qRwWB2kvD+Ki58cpRwM87fVD5yivijJEg==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -1375,12 +1460,12 @@ "ref/xamarinmac20/_._", "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", - "system.linq.4.1.0.nupkg.sha512", + "system.linq.4.3.0.nupkg.sha512", "system.linq.nuspec" ] }, - "System.Linq.Expressions/4.1.0": { - "sha512": "ZwYLHQw/d7Gej9SlHzd1Y9RUGEIIj0hjb6Cbv+1m49N74PSYaSWkXuvCS50hA0AnpvoTQcS6S0cULw5FeiYU0Q==", + "System.Linq.Expressions/4.3.0": { + "sha512": "EjVvFE83n3Ih05PIJ611aMBS321nFT7FS1yIpcnVHLVB3GqaCWaVPMg7/kklhlohrUPXJ4PS5CeUlIBmXMva8w==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -1456,12 +1541,12 @@ "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", "runtimes/aot/lib/netcore50/System.Linq.Expressions.dll", - "system.linq.expressions.4.1.0.nupkg.sha512", + "system.linq.expressions.4.3.0.nupkg.sha512", "system.linq.expressions.nuspec" ] }, - "System.Net.Http/4.1.0": { - "sha512": "yCSes6ImS+SQV3IAQATC+sKIEZKTNhbVYPUZxtvlymVAPnyW2UhhyUFaWoEoVj5uLH+JXYoPk4o7onNAx+xOWg==", + "System.Net.Http/4.3.2": { + "sha512": "wMTk4xwcImunKYNGcMC35TFe/8LKBhzc1INgatMHmbGt6hNu3IsxcwpYD8r2zstiv64uKK+GTgfxJ7Lh91Qnqw==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -1482,49 +1567,9 @@ "ref/monotouch10/_._", "ref/net45/_._", "ref/net46/System.Net.Http.dll", - "ref/net46/System.Net.Http.xml", - "ref/net46/de/System.Net.Http.xml", - "ref/net46/es/System.Net.Http.xml", - "ref/net46/fr/System.Net.Http.xml", - "ref/net46/it/System.Net.Http.xml", - "ref/net46/ja/System.Net.Http.xml", - "ref/net46/ko/System.Net.Http.xml", - "ref/net46/ru/System.Net.Http.xml", - "ref/net46/zh-hans/System.Net.Http.xml", - "ref/net46/zh-hant/System.Net.Http.xml", "ref/netcore50/System.Net.Http.dll", - "ref/netcore50/System.Net.Http.xml", - "ref/netcore50/de/System.Net.Http.xml", - "ref/netcore50/es/System.Net.Http.xml", - "ref/netcore50/fr/System.Net.Http.xml", - "ref/netcore50/it/System.Net.Http.xml", - "ref/netcore50/ja/System.Net.Http.xml", - "ref/netcore50/ko/System.Net.Http.xml", - "ref/netcore50/ru/System.Net.Http.xml", - "ref/netcore50/zh-hans/System.Net.Http.xml", - "ref/netcore50/zh-hant/System.Net.Http.xml", "ref/netstandard1.1/System.Net.Http.dll", - "ref/netstandard1.1/System.Net.Http.xml", - "ref/netstandard1.1/de/System.Net.Http.xml", - "ref/netstandard1.1/es/System.Net.Http.xml", - "ref/netstandard1.1/fr/System.Net.Http.xml", - "ref/netstandard1.1/it/System.Net.Http.xml", - "ref/netstandard1.1/ja/System.Net.Http.xml", - "ref/netstandard1.1/ko/System.Net.Http.xml", - "ref/netstandard1.1/ru/System.Net.Http.xml", - "ref/netstandard1.1/zh-hans/System.Net.Http.xml", - "ref/netstandard1.1/zh-hant/System.Net.Http.xml", "ref/netstandard1.3/System.Net.Http.dll", - "ref/netstandard1.3/System.Net.Http.xml", - "ref/netstandard1.3/de/System.Net.Http.xml", - "ref/netstandard1.3/es/System.Net.Http.xml", - "ref/netstandard1.3/fr/System.Net.Http.xml", - "ref/netstandard1.3/it/System.Net.Http.xml", - "ref/netstandard1.3/ja/System.Net.Http.xml", - "ref/netstandard1.3/ko/System.Net.Http.xml", - "ref/netstandard1.3/ru/System.Net.Http.xml", - "ref/netstandard1.3/zh-hans/System.Net.Http.xml", - "ref/netstandard1.3/zh-hant/System.Net.Http.xml", "ref/portable-net45+win8+wpa81/_._", "ref/win8/_._", "ref/wpa81/_._", @@ -1535,12 +1580,12 @@ "runtimes/win/lib/net46/System.Net.Http.dll", "runtimes/win/lib/netcore50/System.Net.Http.dll", "runtimes/win/lib/netstandard1.3/System.Net.Http.dll", - "system.net.http.4.1.0.nupkg.sha512", + "system.net.http.4.3.2.nupkg.sha512", "system.net.http.nuspec" ] }, - "System.Net.Primitives/4.0.11": { - "sha512": "ZSrInO8QdqT1KMPpKzgcDGMG3Y3LnC/EI6wGvbegkPfeIFPgB+ZM0SUOu+jGbOVFWZYhi1tLmh6fVUMeNJXGpQ==", + "System.Net.Primitives/4.3.0": { + "sha512": "Ds2qmHelD5W4JYm+FOub7/4OWbVWKXXsL4+pVVhZxd3urA9yYI6UFPMEnIbK9mCG7rvoli+PVpbczlcy8H+Jmg==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -1611,12 +1656,12 @@ "ref/xamarinmac20/_._", "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", - "system.net.primitives.4.0.11.nupkg.sha512", + "system.net.primitives.4.3.0.nupkg.sha512", "system.net.primitives.nuspec" ] }, - "System.ObjectModel/4.0.12": { - "sha512": "WW6Li08eAvqWC2wuEL5rfcRj7MnkQmuvi33sCNQDO1FCEik1k2gjB9MRA3FCaZZXXoPBWlKgk48NRF1jtuGfXg==", + "System.ObjectModel/4.3.0": { + "sha512": "yXnz+D4S6l25VS9SuCrS8cyVKWgeAQJ/v2epBlTL1cM+Xs6rx0/6gUAXTTruCZiO1UjrhX56isX8DKL267D5gQ==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -1678,12 +1723,12 @@ "ref/xamarinmac20/_._", "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", - "system.objectmodel.4.0.12.nupkg.sha512", + "system.objectmodel.4.3.0.nupkg.sha512", "system.objectmodel.nuspec" ] }, - "System.Reflection/4.1.0": { - "sha512": "HpJ+0KwTFMMbUyw4wyFozfZOgRjTQc9XZ7gf+jGMZldTd/DE5x0A2hphJcr9GMugfk/varQj5eQV90fhhQHPXQ==", + "System.Reflection/4.3.0": { + "sha512": "gWKa+cLy5BkkDxp6iuKYNQVNlxir4VYpR7siMIW8vQI7lR9E5PsR+Fmm6h+ZzTCu2XFMf9sNvRYRw727QmJ0fw==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -1756,12 +1801,12 @@ "ref/xamarinmac20/_._", "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", - "system.reflection.4.1.0.nupkg.sha512", + "system.reflection.4.3.0.nupkg.sha512", "system.reflection.nuspec" ] }, - "System.Reflection.Extensions/4.0.1": { - "sha512": "zg11axddROZueNDNitrQ0owzvQlCLAjN9G/+/k6RMICrkPRUSiO6UQ/T9Ro6/IBPy0wcQsTdWgghbGj17hnZ3A==", + "System.Reflection.Extensions/4.3.0": { + "sha512": "MZ0vyVl3i7SpA8hLhKjb8wrJ9s4a/bggVHasDqNrbpbkbyMaaYxi8dUDduh5K7RFAHJaR45BAW7+TMbpoQ7Oqg==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -1810,12 +1855,12 @@ "ref/xamarinmac20/_._", "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", - "system.reflection.extensions.4.0.1.nupkg.sha512", + "system.reflection.extensions.4.3.0.nupkg.sha512", "system.reflection.extensions.nuspec" ] }, - "System.Reflection.Primitives/4.0.1": { - "sha512": "Pszp2aaEvrwJgXNVqa01yIturWLch/rQ0qAyK79JAFt67YmvRczQ/k/bL6BxNVsSKlllLqywK0eK1M+AoquCoQ==", + "System.Reflection.Primitives/4.3.0": { + "sha512": "QcIJSKt4ksNWnTWkNc7fqdnaARA4or2omXIXVi1hzccV8AixhcW4gVNfpdz/jE1cldDBRSeySM5PbF8M3GUHbA==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -1864,12 +1909,12 @@ "ref/xamarinmac20/_._", "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", - "system.reflection.primitives.4.0.1.nupkg.sha512", + "system.reflection.primitives.4.3.0.nupkg.sha512", "system.reflection.primitives.nuspec" ] }, - "System.Resources.ResourceManager/4.0.1": { - "sha512": "pGR3OtGJxTKLRTGwPvfoVc/oEKVcyIbRvvhrojBDlj9Jh2o35t5OAj4jME2K7xU61dy/ih6MtSq7oEXqfCW8tA==", + "System.Resources.ResourceManager/4.3.0": { + "sha512": "DRxdwZJGYZA+sp8Ht53dvNPr8NLsbBzctIrpbx4UFylYbDsoDQzJwchNarrRnwiIfsZHkXYA3HCKewNr62XiRw==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -1918,7 +1963,7 @@ "ref/xamarinmac20/_._", "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", - "system.resources.resourcemanager.4.0.1.nupkg.sha512", + "system.resources.resourcemanager.4.3.0.nupkg.sha512", "system.resources.resourcemanager.nuspec" ] }, @@ -2011,8 +2056,8 @@ "system.runtime.nuspec" ] }, - "System.Runtime.Extensions/4.1.0": { - "sha512": "6HJxJWJ7NqmB7URzrQ6wcAnMknVlTASGjSowDobDj8UBdwytwi68R11lsEx3u1hOwA5eLAsDk4zKQ8N/8RV5uw==", + "System.Runtime.Extensions/4.3.0": { + "sha512": "P78VOZ2fZUq3otcfcf+6zd+EhWijXhI/BWk/wd9RnWFAddhO4hnlpiqxAIw1yPTZJSWRG5VboYyUmB8xcmcHpQ==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -2085,12 +2130,12 @@ "ref/xamarinmac20/_._", "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", - "system.runtime.extensions.4.1.0.nupkg.sha512", + "system.runtime.extensions.4.3.0.nupkg.sha512", "system.runtime.extensions.nuspec" ] }, - "System.Runtime.InteropServices/4.1.0": { - "sha512": "iEbhIhq4zSmMaCq2i0iGN8UjSww+qjjciGlPwEJulxXawSFyvkWClYkRbQjuJBhp4e8QEdIcbQsijPsTYvin6g==", + "System.Runtime.InteropServices/4.3.0": { + "sha512": "6CC8BIjVaMtHM3OvOOO0cirqqF6CNluOPtc/DNBkieZhMiz676cszc5ciNCiIWcTcNW+Mb0Cs8LWZrhK7W+rdQ==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -2099,6 +2144,7 @@ "lib/MonoTouch10/_._", "lib/net45/_._", "lib/net462/System.Runtime.InteropServices.dll", + "lib/net463/System.Runtime.InteropServices.dll", "lib/portable-net45+win8+wpa81/_._", "lib/win8/_._", "lib/wpa81/_._", @@ -2110,6 +2156,7 @@ "ref/MonoTouch10/_._", "ref/net45/_._", "ref/net462/System.Runtime.InteropServices.dll", + "ref/net463/System.Runtime.InteropServices.dll", "ref/netcore50/System.Runtime.InteropServices.dll", "ref/netcore50/System.Runtime.InteropServices.xml", "ref/netcore50/de/System.Runtime.InteropServices.xml", @@ -2121,6 +2168,7 @@ "ref/netcore50/ru/System.Runtime.InteropServices.xml", "ref/netcore50/zh-hans/System.Runtime.InteropServices.xml", "ref/netcore50/zh-hant/System.Runtime.InteropServices.xml", + "ref/netcoreapp1.1/System.Runtime.InteropServices.dll", "ref/netstandard1.1/System.Runtime.InteropServices.dll", "ref/netstandard1.1/System.Runtime.InteropServices.xml", "ref/netstandard1.1/de/System.Runtime.InteropServices.xml", @@ -2172,12 +2220,12 @@ "ref/xamarinmac20/_._", "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", - "system.runtime.interopservices.4.1.0.nupkg.sha512", + "system.runtime.interopservices.4.3.0.nupkg.sha512", "system.runtime.interopservices.nuspec" ] }, - "System.Runtime.InteropServices.RuntimeInformation/4.0.0": { - "sha512": "vr3mNWma7l4pwFRuH+6qDzw8oNA3ds0vA2iArlsMiu5P6q+sPBb2dtrnBsosBzz9KxYyYmNHwLrTtfAteSXGGw==", + "System.Runtime.InteropServices.RuntimeInformation/4.3.0": { + "sha512": "rf6Ebmg9wgokWKK14uiVNdyBY7g4yLaZ4edbiE6XcNX5fyqtgHZTKuP2MFkkzQWL9NGX2LSIfodKQNVnOM+qCA==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -2185,6 +2233,7 @@ "lib/MonoAndroid10/_._", "lib/MonoTouch10/_._", "lib/net45/System.Runtime.InteropServices.RuntimeInformation.dll", + "lib/netstandard1.1/System.Runtime.InteropServices.RuntimeInformation.dll", "lib/win8/System.Runtime.InteropServices.RuntimeInformation.dll", "lib/wpa81/System.Runtime.InteropServices.RuntimeInformation.dll", "lib/xamarinios10/_._", @@ -2203,12 +2252,12 @@ "runtimes/win/lib/net45/System.Runtime.InteropServices.RuntimeInformation.dll", "runtimes/win/lib/netcore50/System.Runtime.InteropServices.RuntimeInformation.dll", "runtimes/win/lib/netstandard1.1/System.Runtime.InteropServices.RuntimeInformation.dll", - "system.runtime.interopservices.runtimeinformation.4.0.0.nupkg.sha512", + "system.runtime.interopservices.runtimeinformation.4.3.0.nupkg.sha512", "system.runtime.interopservices.runtimeinformation.nuspec" ] }, - "System.Runtime.Numerics/4.0.1": { - "sha512": "/o7jRC8CE9DNZLNRBrBo83xJSUUD4y7PN1nKat3AtyrQCnopV+wu/WVzOfxmpaaIezo79SJ6/B9m0vaWqOl+Jg==", + "System.Runtime.Numerics/4.3.0": { + "sha512": "H73WuUWJAH5UQE1MIxWLdqg+skdOBBwGA+fLu4JgPHJ+0tivNLBrN4TQdJGDvVeGPxrN229R5muocedVVAIfbA==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -2257,7 +2306,7 @@ "ref/xamarinmac20/_._", "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", - "system.runtime.numerics.4.0.1.nupkg.sha512", + "system.runtime.numerics.4.3.0.nupkg.sha512", "system.runtime.numerics.nuspec" ] }, @@ -2379,8 +2428,8 @@ "system.text.encoding.nuspec" ] }, - "System.Text.Encoding.Extensions/4.0.11": { - "sha512": "ENbXs99/jOY4tgo46ljaXBx9Bx8d2ql6ujhAkLeKRHIiBIFSHmZ6DHls2lglUubMrCC+ad4XOakiLVZGhEsfyw==", + "System.Text.Encoding.Extensions/4.3.0": { + "sha512": "q9p8y7bgIQR7IQJQBeOL3TT4H0vg634anhTKgbao9gHvFmmGJkJF6eNhX6Tfcu5vFbKqd+I1+kW/6hVdZXqPmQ==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -2440,12 +2489,12 @@ "ref/xamarinmac20/_._", "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", - "system.text.encoding.extensions.4.0.11.nupkg.sha512", + "system.text.encoding.extensions.4.3.0.nupkg.sha512", "system.text.encoding.extensions.nuspec" ] }, - "System.Text.RegularExpressions/4.1.0": { - "sha512": "v6JrJPeaPhlAp5V8u4Usk8W/+pgDqVTAt5oawH7scq1ycxYnLS2luEWQStZc+5WqGJS5qNLCh3Ygm/EUoLkbyg==", + "System.Text.RegularExpressions/4.3.0": { + "sha512": "SJ9qrjcnDx6YwpMpIgeKL1K/4/uDAHCT6Id3aey/z66H9SIX8PcG2TQ+gYNg7VGm7tI0wkLsV+8dMxbxTam7Yw==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -2479,6 +2528,7 @@ "ref/netcore50/ru/System.Text.RegularExpressions.xml", "ref/netcore50/zh-hans/System.Text.RegularExpressions.xml", "ref/netcore50/zh-hant/System.Text.RegularExpressions.xml", + "ref/netcoreapp1.1/System.Text.RegularExpressions.dll", "ref/netstandard1.0/System.Text.RegularExpressions.dll", "ref/netstandard1.0/System.Text.RegularExpressions.xml", "ref/netstandard1.0/de/System.Text.RegularExpressions.xml", @@ -2520,12 +2570,12 @@ "ref/xamarinmac20/_._", "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", - "system.text.regularexpressions.4.1.0.nupkg.sha512", + "system.text.regularexpressions.4.3.0.nupkg.sha512", "system.text.regularexpressions.nuspec" ] }, - "System.Threading/4.0.11": { - "sha512": "SPtgIenWg9xMMBKVpkAWCiebJ1posiEPYhMwT6eJpOmZiVJm73q8/4/z1QuD0C0iWLD3Dj8MbQ39hxH5VCUnCw==", + "System.Threading/4.3.0": { + "sha512": "cm4+iLU+Gvodk221rboVLwWguLuPOl/bkcCtr+k9hc4tvngnw/dJaoUPqIEsU/FWcCusXk4po3ydFxmRp2lXyw==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -2588,7 +2638,7 @@ "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", "runtimes/aot/lib/netcore50/System.Threading.dll", - "system.threading.4.0.11.nupkg.sha512", + "system.threading.4.3.0.nupkg.sha512", "system.threading.nuspec" ] }, @@ -2657,8 +2707,8 @@ "system.threading.tasks.nuspec" ] }, - "System.Threading.Timer/4.0.1": { - "sha512": "yl+mJ0W5KVBXZgrHE4DVfjI/QDJXuf5rTpCjtHuy+PKxqgrBsF1IZI2jZeHtmBGAgdG0TkJsCTT+4VqT9BSw1g==", + "System.Threading.Timer/4.3.0": { + "sha512": "BzzEELyI/Jct8o0jOeXisFR5uawc5yhFVlgboaxWWWV/Fjahi/ESRRaHlR1HMWAyZsNnybq7v57YgWTVd+NAkg==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -2705,7 +2755,7 @@ "ref/xamarinmac20/_._", "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", - "system.threading.timer.4.0.1.nupkg.sha512", + "system.threading.timer.4.3.0.nupkg.sha512", "system.threading.timer.nuspec" ] }, @@ -2778,8 +2828,8 @@ "system.xml.readerwriter.nuspec" ] }, - "System.Xml.XDocument/4.0.11": { - "sha512": "zjpx57E3HcPYBdHWFG7y7L15KmKv4O6vQXz/MwF9s3QEwIVZRsUrrCLx0ETHRfll9uXplN/HBdCNA6E/bjAd7w==", + "System.Xml.XDocument/4.3.0": { + "sha512": "WT8lBJSEINzk3c9dm3n0vlqb9Z9PoORD29n/rbkcNh3feSZTJeYQ5+xgSbJhdsyvpmsRsE56fdsH4fchJt65PQ==", "type": "package", "files": [ "ThirdPartyNotices.txt", @@ -2841,7 +2891,7 @@ "ref/xamarinmac20/_._", "ref/xamarintvos10/_._", "ref/xamarinwatchos10/_._", - "system.xml.xdocument.4.0.11.nupkg.sha512", + "system.xml.xdocument.4.3.0.nupkg.sha512", "system.xml.xdocument.nuspec" ] }, @@ -2946,9 +2996,8 @@ "projectFileDependencyGroups": { "": [ "Microsoft.NETCore.Portable.Compatibility >= 1.0.1", - "NETStandard.Library >= 1.6.0", - "PInvoke.Windows.Core >= 0.5.97", - "Portable.BouncyCastle >= 1.8.1.1", + "NETStandard.Library >= 2.0.0", + "Portable.BouncyCastle >= 1.8.1.3", "Splat >= 2.0.0", "System.Runtime.WindowsRuntime >= 4.3.0", "System.Xml.ReaderWriter >= 4.3.0",