From 9eb46c861b851837034969b201958a1b60e53f58 Mon Sep 17 00:00:00 2001 From: oblaise Date: Mon, 6 Mar 2017 09:36:22 +0100 Subject: [PATCH 1/2] Don't try to get location of dynamic (in-memory) assemblies --- itext/itext.io/itext/io/util/ResourceUtil.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/itext/itext.io/itext/io/util/ResourceUtil.cs b/itext/itext.io/itext/io/util/ResourceUtil.cs index d530539072..6c0136e9cf 100644 --- a/itext/itext.io/itext/io/util/ResourceUtil.cs +++ b/itext/itext.io/itext/io/util/ResourceUtil.cs @@ -202,7 +202,7 @@ private static Stream SearchResourceInAssembly(string key, Object obj) { private static void LoadITextResourceAssemblies() { #if !NETSTANDARD1_6 - var loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies().ToList(); + var loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies().Where( a=> !a.IsDynamic).ToList(); var loadedPaths = loadedAssemblies.Select(a => a.Location).ToArray(); var referencedPaths = Directory.GetFiles(FileUtil.GetBaseDirectory(), "*.dll"); From 1d6c72b1ca7b55e9cfb295a09ee02ba8c1c3285a Mon Sep 17 00:00:00 2001 From: Pavel Alay Date: Wed, 15 Mar 2017 14:32:56 +0300 Subject: [PATCH 2/2] 7.0.2 -> 7.0.2.2 --- itext/itext.barcodes/Properties/AssemblyInfo.cs | 4 ++-- itext/itext.font-asian/Properties/AssemblyInfo.cs | 4 ++-- itext/itext.forms/Properties/AssemblyInfo.cs | 4 ++-- itext/itext.hyph/Properties/AssemblyInfo.cs | 4 ++-- itext/itext.io/Properties/AssemblyInfo.cs | 4 ++-- itext/itext.kernel/Properties/AssemblyInfo.cs | 4 ++-- itext/itext.kernel/itext/kernel/Version.cs | 2 +- itext/itext.layout/Properties/AssemblyInfo.cs | 4 ++-- itext/itext.pdfa/Properties/AssemblyInfo.cs | 4 ++-- itext/itext.pdftest/Properties/AssemblyInfo.cs | 4 ++-- itext/itext.sign/Properties/AssemblyInfo.cs | 4 ++-- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/itext/itext.barcodes/Properties/AssemblyInfo.cs b/itext/itext.barcodes/Properties/AssemblyInfo.cs index ab545b0c31..5373fe2d06 100644 --- a/itext/itext.barcodes/Properties/AssemblyInfo.cs +++ b/itext/itext.barcodes/Properties/AssemblyInfo.cs @@ -21,5 +21,5 @@ [assembly: Guid("8694665a-5749-40c6-9e9c-53c686a77ad1")] -[assembly: AssemblyVersion("7.0.2.0")] -[assembly: AssemblyFileVersion("7.0.2.0")] +[assembly: AssemblyVersion("7.0.2.2")] +[assembly: AssemblyFileVersion("7.0.2.2")] diff --git a/itext/itext.font-asian/Properties/AssemblyInfo.cs b/itext/itext.font-asian/Properties/AssemblyInfo.cs index 194bc414d2..85689e7726 100644 --- a/itext/itext.font-asian/Properties/AssemblyInfo.cs +++ b/itext/itext.font-asian/Properties/AssemblyInfo.cs @@ -15,5 +15,5 @@ [assembly: Guid("0f10190c-7611-4378-a157-03bf2ed78e30")] -[assembly: AssemblyVersion("7.0.2.0")] -[assembly: AssemblyFileVersion("7.0.2.0")] +[assembly: AssemblyVersion("7.0.2.2")] +[assembly: AssemblyFileVersion("7.0.2.2")] diff --git a/itext/itext.forms/Properties/AssemblyInfo.cs b/itext/itext.forms/Properties/AssemblyInfo.cs index 8f027520b9..fc745042c5 100644 --- a/itext/itext.forms/Properties/AssemblyInfo.cs +++ b/itext/itext.forms/Properties/AssemblyInfo.cs @@ -20,5 +20,5 @@ [assembly: Guid("2257d7e6-2873-4cfb-ac3c-b24765a4b3b1")] -[assembly: AssemblyVersion("7.0.2.0")] -[assembly: AssemblyFileVersion("7.0.2.0")] +[assembly: AssemblyVersion("7.0.2.2")] +[assembly: AssemblyFileVersion("7.0.2.2")] diff --git a/itext/itext.hyph/Properties/AssemblyInfo.cs b/itext/itext.hyph/Properties/AssemblyInfo.cs index 84b4ecfcc1..0a39eab7f9 100644 --- a/itext/itext.hyph/Properties/AssemblyInfo.cs +++ b/itext/itext.hyph/Properties/AssemblyInfo.cs @@ -15,5 +15,5 @@ [assembly: Guid("56137079-541a-425a-ab97-43af63793c97")] -[assembly: AssemblyVersion("7.0.2.0")] -[assembly: AssemblyFileVersion("7.0.2.0")] +[assembly: AssemblyVersion("7.0.2.2")] +[assembly: AssemblyFileVersion("7.0.2.2")] diff --git a/itext/itext.io/Properties/AssemblyInfo.cs b/itext/itext.io/Properties/AssemblyInfo.cs index 26042f83ca..f3c7cd974b 100644 --- a/itext/itext.io/Properties/AssemblyInfo.cs +++ b/itext/itext.io/Properties/AssemblyInfo.cs @@ -21,5 +21,5 @@ [assembly: Guid("39631ecb-1d39-4eb2-b775-37bd34cbf5a4")] -[assembly: AssemblyVersion("7.0.2.0")] -[assembly: AssemblyFileVersion("7.0.2.0")] +[assembly: AssemblyVersion("7.0.2.2")] +[assembly: AssemblyFileVersion("7.0.2.2")] diff --git a/itext/itext.kernel/Properties/AssemblyInfo.cs b/itext/itext.kernel/Properties/AssemblyInfo.cs index d094ee2b45..1df4f80512 100644 --- a/itext/itext.kernel/Properties/AssemblyInfo.cs +++ b/itext/itext.kernel/Properties/AssemblyInfo.cs @@ -24,5 +24,5 @@ [assembly: KeyVersion("2.0.3.0")] -[assembly: AssemblyVersion("7.0.2.0")] -[assembly: AssemblyFileVersion("7.0.2.0")] +[assembly: AssemblyVersion("7.0.2.2")] +[assembly: AssemblyFileVersion("7.0.2.2")] diff --git a/itext/itext.kernel/itext/kernel/Version.cs b/itext/itext.kernel/itext/kernel/Version.cs index d208e82443..f2ed2bc84b 100644 --- a/itext/itext.kernel/itext/kernel/Version.cs +++ b/itext/itext.kernel/itext/kernel/Version.cs @@ -75,7 +75,7 @@ public sealed class Version { /// This String contains the version number of this iText release. /// For debugging purposes, we request you NOT to change this constant. /// - private static String release = "7.0.2"; + private static String release = "7.0.2.2"; /// This String contains the iText version as shown in the producer line. /// diff --git a/itext/itext.layout/Properties/AssemblyInfo.cs b/itext/itext.layout/Properties/AssemblyInfo.cs index 6e843787eb..82dd4b6d96 100644 --- a/itext/itext.layout/Properties/AssemblyInfo.cs +++ b/itext/itext.layout/Properties/AssemblyInfo.cs @@ -24,5 +24,5 @@ [assembly: TypographyVersion("1.0.2.0")] -[assembly: AssemblyVersion("7.0.2.0")] -[assembly: AssemblyFileVersion("7.0.2.0")] +[assembly: AssemblyVersion("7.0.2.2")] +[assembly: AssemblyFileVersion("7.0.2.2")] diff --git a/itext/itext.pdfa/Properties/AssemblyInfo.cs b/itext/itext.pdfa/Properties/AssemblyInfo.cs index f1fcadf400..74c914e058 100644 --- a/itext/itext.pdfa/Properties/AssemblyInfo.cs +++ b/itext/itext.pdfa/Properties/AssemblyInfo.cs @@ -21,5 +21,5 @@ [assembly: Guid("9fc2f0b3-a8d2-46da-8724-72e00e67a8fa")] -[assembly: AssemblyVersion("7.0.2.0")] -[assembly: AssemblyFileVersion("7.0.2.0")] +[assembly: AssemblyVersion("7.0.2.2")] +[assembly: AssemblyFileVersion("7.0.2.2")] diff --git a/itext/itext.pdftest/Properties/AssemblyInfo.cs b/itext/itext.pdftest/Properties/AssemblyInfo.cs index fe3bfa0c2a..260c531c5c 100644 --- a/itext/itext.pdftest/Properties/AssemblyInfo.cs +++ b/itext/itext.pdftest/Properties/AssemblyInfo.cs @@ -15,5 +15,5 @@ [assembly: Guid("f9880dc4-f015-4413-af86-66d0e9512774")] -[assembly: AssemblyVersion("7.0.2.0")] -[assembly: AssemblyFileVersion("7.0.2.0")] +[assembly: AssemblyVersion("7.0.2.2")] +[assembly: AssemblyFileVersion("7.0.2.2")] diff --git a/itext/itext.sign/Properties/AssemblyInfo.cs b/itext/itext.sign/Properties/AssemblyInfo.cs index ecbe810cc4..e8fb22acc5 100644 --- a/itext/itext.sign/Properties/AssemblyInfo.cs +++ b/itext/itext.sign/Properties/AssemblyInfo.cs @@ -21,5 +21,5 @@ [assembly: Guid("5092244a-a2ed-49d2-97fb-f513d965a8f7")] -[assembly: AssemblyVersion("7.0.2.0")] -[assembly: AssemblyFileVersion("7.0.2.0")] +[assembly: AssemblyVersion("7.0.2.2")] +[assembly: AssemblyFileVersion("7.0.2.2")]