diff options
| author | Peter Dettman <peter.dettman@bouncycastle.org> | 2015-10-27 12:30:28 +0700 |
|---|---|---|
| committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2015-10-27 12:30:28 +0700 |
| commit | c1e603f741728fd570e30c46eb20ef8dfb23238a (patch) | |
| tree | 6c9e55973cd64b4f6ba5d12fcc2414aa41b14729 /crypto/src/bcpg | |
| parent | Exclude some tests for PORTABLE (diff) | |
| download | BouncyCastle.NET-ed25519-c1e603f741728fd570e30c46eb20ef8dfb23238a.tar.xz | |
Pull a few PORTABLE changes from BouncyCastle-PCL (with fixes)
Diffstat (limited to 'crypto/src/bcpg')
| -rw-r--r-- | crypto/src/bcpg/ArmoredOutputStream.cs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/crypto/src/bcpg/ArmoredOutputStream.cs b/crypto/src/bcpg/ArmoredOutputStream.cs index fb1f6eb29..253c5d1fe 100644 --- a/crypto/src/bcpg/ArmoredOutputStream.cs +++ b/crypto/src/bcpg/ArmoredOutputStream.cs @@ -101,16 +101,7 @@ namespace Org.BouncyCastle.Bcpg private static readonly string footerStart = "-----END PGP "; private static readonly string footerTail = "-----"; - private static readonly string version = "BCPG C# v" -#if PORTABLE - + Assembly.GetExecutingAssembly() - .GetCustomAttributes(typeof(AssemblyVersionAttribute), true) - .Cast<AssemblyVersionAttribute>() - .First() - .Version; -#else - + Assembly.GetExecutingAssembly().GetName().Version; -#endif + private static readonly string version = "BCPG C# v" + AssemblyInfo.Version; private readonly IDictionary headers; |