Merge branch 'release/7.0.2.2'

itext · Mar 15, 2017 · b396e8f · b396e8f
2 parents 58b6bc8 + 1d6c72b
commit b396e8f
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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.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");

diff --git 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
@@ -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.
         /// </remarks>
-        private static String release = "7.0.2";
+        private static String release = "7.0.2.2";
 
         /// <summary>This String contains the iText version as shown in the producer line.</summary>
         /// <remarks>

diff --git 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
@@ -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
@@ -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
@@ -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")]