Add Suppot for .net 5 so we can remove Microsoft.Extensions.DependencyModel 1.1.0

xrkolovos · xrkolovos · commit a6d1309ad41f · 2021-02-18T20:01:57.000+02:00
diff --git a/itext.tests/itext.io.tests/Properties/AssemblyInfo.cs b/itext.tests/itext.io.tests/Properties/AssemblyInfo.cs
@@ -19,6 +19,6 @@
 [assembly: AssemblyFileVersion("7.1.15.0")]
 [assembly: AssemblyInformationalVersion("7.1.15-SNAPSHOT")]
 
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET5_0
 [assembly: NUnit.Framework.Timeout(300000)]
 #endif
diff --git a/itext.tests/itext.io.tests/itext.io.tests.netstandard.csproj b/itext.tests/itext.io.tests/itext.io.tests.netstandard.csproj
@@ -5,7 +5,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net40</TargetFrameworks>
+    <TargetFrameworks>net5.0;netcoreapp2.0;net40</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net40' ">
     <OutputType>library</OutputType>
@@ -52,6 +52,14 @@
       <Version>4.3.0</Version>
     </PackageReference>
   </ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+		<PackageReference Include="Microsoft.NET.Test.Sdk">
+			<Version>15.0.0</Version>
+		</PackageReference>
+		<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation">
+			<Version>4.3.0</Version>
+		</PackageReference>
+	</ItemGroup>
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
diff --git a/itext/itext.io/Properties/AssemblyInfo.cs b/itext/itext.io/Properties/AssemblyInfo.cs
@@ -35,6 +35,6 @@
 
 [assembly: Guid("39631ecb-1d39-4eb2-b775-37bd34cbf5a4")]
 
-[assembly: AssemblyVersion("7.1.15.0")]
-[assembly: AssemblyFileVersion("7.1.15.0")]
-[assembly: AssemblyInformationalVersion("7.1.15-SNAPSHOT")]
+[assembly: AssemblyVersion("7.2.0.0")]
+[assembly: AssemblyFileVersion("7.2.0.0")]
+[assembly: AssemblyInformationalVersion("7.2.0-SNAPSHOT")]
diff --git a/itext/itext.io/itext.io.netstandard.csproj b/itext/itext.io/itext.io.netstandard.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+﻿<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup Label="Configuration">
     <SignAssembly>True</SignAssembly>
     <DelaySign>False</DelaySign>
     <DocumentationFile>$(TargetDir)bin\$(Configuration)\$(TargetFramework)\itext.io.xml</DocumentationFile>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
+    <TargetFrameworks>net5.0;netstandard2.0;net40</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
     <OutputType>library</OutputType>
@@ -81,9 +81,16 @@
     <PackageReference Include="System.Globalization.Extensions" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
     <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.1.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.3.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.1.9" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
   </ItemGroup>
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
+		<PackageReference Include="System.Globalization.Extensions" Version="4.3.0" />
+		<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
+		<PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="5.0.0" />
+		<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
+	</ItemGroup>
   <ItemGroup>
     <PackageReference Include="Common.Logging" Version="3.4.1" />
   </ItemGroup>
diff --git a/itext/itext.io/itext/io/IOExtensions.cs b/itext/itext.io/itext/io/IOExtensions.cs
@@ -197,7 +197,7 @@ public static T[] ToArray<T>(this ICollection<T> col) {
         }
 
         public static Assembly GetAssembly(this Type type) {
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET5_0
             return type.Assembly;
 #else
             return type.GetTypeInfo().Assembly;
diff --git a/itext/itext.io/itext/io/image/DrawingImageFactory.cs b/itext/itext.io/itext/io/image/DrawingImageFactory.cs
@@ -1,4 +1,4 @@
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET5_0
 /*
 
 This file is part of the iText (R) project.
diff --git a/itext/itext.io/itext/io/image/ImageDataFactory.cs b/itext/itext.io/itext/io/image/ImageDataFactory.cs
@@ -164,7 +164,7 @@ public static ImageData Create(int width, int height, int components, int bpc, b
             return image;
         }
 
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET5_0
         /// <summary>Gets an instance of an Image from a java.awt.Image</summary>
         /// <param name="image">the java.awt.Image to convert</param>
         /// <param name="color">if different from <c>null</c> the transparency pixels are replaced by this color</param>
@@ -174,7 +174,7 @@ public static ImageData Create(System.Drawing.Image image, Color? color) {
         }
 #endif // !NETSTANDARD2_0
 
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET5_0
         /// <summary>Gets an instance of an Image from a java.awt.Image.</summary>
         /// <param name="image">the <c>java.awt.Image</c> to convert</param>
         /// <param name="color">if different from <c>null</c> the transparency pixels are replaced by this color</param>
diff --git a/itext/itext.io/itext/io/util/AssemblyLoadContextUtil.cs b/itext/itext.io/itext/io/util/AssemblyLoadContextUtil.cs
@@ -48,7 +48,7 @@ source product.
 
 namespace iText.IO.Util
 {
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET5_0
     /// <summary>This file is a helper class for internal usage only.</summary>
     /// <remarks>
     /// This file is a helper class for internal usage only.
diff --git a/itext/itext.io/itext/io/util/EncodingUtil.cs b/itext/itext.io/itext/io/util/EncodingUtil.cs
@@ -54,7 +54,7 @@ namespace iText.IO.Util {
     public static class EncodingUtil {
 
         static EncodingUtil() {
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET5_0
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 #endif
         }
diff --git a/itext/itext.io/itext/io/util/IntHashtable.cs b/itext/itext.io/itext/io/util/IntHashtable.cs
@@ -58,7 +58,7 @@ namespace iText.IO.Util {
     /// <author>Bruno Lowagie (change Objects as keys into int values)</author>
     /// <author>Paulo Soares (added extra methods)</author>
     public class IntHashtable
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET5_0
  : ICloneable
 #endif
  {
diff --git a/itext/itext.io/itext/io/util/ResourceUtil.cs b/itext/itext.io/itext/io/util/ResourceUtil.cs
@@ -47,6 +47,10 @@ source product.
 using System.IO;
 using System.Linq;
 using System.Reflection;
+#if NET5_0
+using System.Runtime.InteropServices;
+using Microsoft.Extensions.DependencyModel;
+#endif
 #if NETSTANDARD2_0
 using Microsoft.DotNet.PlatformAbstractions;
 using Microsoft.Extensions.DependencyModel;
@@ -123,7 +127,7 @@ public static Stream GetResourceStream(string key, Type definedClassType) {
                 }
             }
 
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET5_0
             foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies()) {
                 if (assembly.GetName().Name.StartsWith("itext")) {
                     istr = SearchResourceInAssembly(key, assembly);
@@ -135,7 +139,12 @@ public static Stream GetResourceStream(string key, Type definedClassType) {
 #else
             try {
                 if (DependencyContext.Default != null) {
-                    string runtimeId = RuntimeEnvironment.GetRuntimeIdentifier();
+                    string runtimeId = "";
+#if NET5_0
+                    runtimeId = RuntimeInformation.RuntimeIdentifier;
+#else
+                    runtimeId = RuntimeEnvironment.GetRuntimeIdentifier();
+#endif
                     IEnumerable<AssemblyName> loadedAssemblies = DependencyContext.Default.GetRuntimeAssemblyNames(runtimeId).ToList();
                     foreach (AssemblyName assemblyName in loadedAssemblies) {
                         if (assemblyName.Name.StartsWith("itext")) {
@@ -151,7 +160,6 @@ public static Stream GetResourceStream(string key, Type definedClassType) {
                 }
             } catch { }
 #endif
-
             return istr;
         }
 
@@ -170,7 +178,7 @@ private static Stream SearchResourceInAssembly(string key, Object obj) {
                     string dir = (string)obj;
                     try
                     {
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET5_0
                         istr = Assembly.LoadFrom(dir).GetManifestResourceStream(key);
 #else
                         istr = AssemblyLoadContextUtil.LoadFromDefaultContextAssemblyPath(key).GetManifestResourceStream(key);
@@ -204,7 +212,7 @@ private static Stream SearchResourceInAssembly(string key, Object obj) {
         }
 
         private static void LoadITextResourceAssemblies() {
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET5_0
             var loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies().Where( a=> !a.IsDynamic).ToList();
             List<string> loadedPaths = new List<string>();
             foreach (var a in AppDomain.CurrentDomain.GetAssemblies())
@@ -236,7 +244,12 @@ private static void LoadITextResourceAssemblies() {
                 }
             }
 #else
-            string runtimeId = RuntimeEnvironment.GetRuntimeIdentifier();
+            string runtimeId = "";
+#if NET5_0
+            runtimeId = RuntimeInformation.RuntimeIdentifier;
+#else
+            runtimeId = RuntimeEnvironment.GetRuntimeIdentifier();
+#endif
             List<AssemblyName> loadedAssemblies = null;
             try {
                 loadedAssemblies = DependencyContext.Default?.GetRuntimeAssemblyNames(runtimeId).ToList();

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ public static T[] ToArray<T>(this ICollection<T> col) {`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`public static Assembly GetAssembly(this Type type) {`
`200`		`-#if !NETSTANDARD2_0`
	`200`	`+#if !NETSTANDARD2_0 && !NET5_0`
`201`	`201`	`return type.Assembly;`
`202`	`202`	`#else`
`203`	`203`	`return type.GetTypeInfo().Assembly;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if !NETSTANDARD2_0`
	`1`	`+#if !NETSTANDARD2_0 && !NET5_0`
`2`	`2`	`/*`
`3`	`3`
`4`	`4`	`This file is part of the iText (R) project.`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ source product.`
`48`	`48`
`49`	`49`	`namespace iText.IO.Util`
`50`	`50`	`{`
`51`		`-#if NETSTANDARD2_0`
	`51`	`+#if NETSTANDARD2_0 \|\| NET5_0`
`52`	`52`	`/// <summary>This file is a helper class for internal usage only.</summary>`
`53`	`53`	`/// <remarks>`
`54`	`54`	`/// This file is a helper class for internal usage only.`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ namespace iText.IO.Util {`
`54`	`54`	`public static class EncodingUtil {`
`55`	`55`
`56`	`56`	`static EncodingUtil() {`
`57`		`-#if NETSTANDARD2_0`
	`57`	`+#if NETSTANDARD2_0 \|\| NET5_0`
`58`	`58`	`Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);`
`59`	`59`	`#endif`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ namespace iText.IO.Util {`
`58`	`58`	`/// <author>Bruno Lowagie (change Objects as keys into int values)</author>`
`59`	`59`	`/// <author>Paulo Soares (added extra methods)</author>`
`60`	`60`	`public class IntHashtable`
`61`		`-#if !NETSTANDARD2_0`
	`61`	`+#if !NETSTANDARD2_0 && !NET5_0`
`62`	`62`	`: ICloneable`
`63`	`63`	`#endif`
`64`	`64`	`{`