Update assembly info and related settings for updated dotnet standard version

OpenXmlFormats/Properties/AssemblyInfo.cs

@@ -36,10 +36,10 @@ using System.Security;
 [assembly: AssemblyVersion("2.5.1.0")]
 [assembly: AssemblyFileVersion("2.5.1.0")]
 [assembly: AssemblyInformationalVersion("2.0.0.0")]
-#if NETSTANDARD2_0 || NET40
+#if NETSTANDARD2_1 || NETSTANDARD2_0 || NET40
 [assembly: AllowPartiallyTrustedCallers]
 #endif
 [assembly: InternalsVisibleTo("NPOI.OOXML.TestCases, PublicKey=002400000480000094000000060200000024000052534131000400000100010095ccd95af3b39d8bc20544d3f47fd24b53ebc5ccb693eaed116290629f8cd882c827ebd511ad59449224f0718d3f9d03b64945a6c8b6644266001b8c8426185330e3d96da70ae16d4acc21b8d4d480f1385c7e924273179375aa88f81380a72fb115712a313379d16aed4aa36208ee3b4a5dd785b06a07b2d868e3227f4495b5", AllInternalsVisible = true)]
-#if NETSTANDARD2_0 || NET40 || NET45
+#if NETSTANDARD2_1 || NETSTANDARD2_0 || NET40 || NET45
 [assembly: SecurityRules(SecurityRuleSet.Level1)]
 #endif

main/HPSF/CodePageString.cs

@@ -57,7 +57,7 @@ namespace NPOI.HPSF
 
         public String GetJavaValue(int codepage)
         {
-#if NETSTANDARD2_0
+#if NETSTANDARD2_1 || NETSTANDARD2_0
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 #endif 
             String result;

main/HSSF/UserModel/StaticFontMetrics.cs

@@ -35,7 +35,7 @@ namespace NPOI.HSSF.UserModel
      */
     class StaticFontMetrics
     {
-#if NETSTANDARD2_0
+#if NETSTANDARD2_1 || NETSTANDARD2_0
         private const String FONT_METRICS_PROPERTIES_FILE_NAME = "NPOI.Resources.font_metrics.properties";
 #else
         private const String FONT_METRICS_PROPERTIES_FILE_NAME = "font_metrics.properties";

main/POIFS/Macros/VBAMacroReader.cs

@@ -142,7 +142,7 @@ namespace NPOI.POIFS.Macros
         {
             static ModuleMap()
             {
-#if NETSTANDARD2_0
+#if NETSTANDARD2_1 || NETSTANDARD2_0
                 Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 #endif
                 charset =Encoding.GetEncoding(1252);

main/Properties/AssemblyInfo.cs

@@ -38,9 +38,9 @@ using System.Security;
 [assembly: AssemblyInformationalVersion("2.0.0.0")]
 
 [assembly: InternalsVisibleTo("NPOI.TestCases, PublicKey=002400000480000094000000060200000024000052534131000400000100010095ccd95af3b39d8bc20544d3f47fd24b53ebc5ccb693eaed116290629f8cd882c827ebd511ad59449224f0718d3f9d03b64945a6c8b6644266001b8c8426185330e3d96da70ae16d4acc21b8d4d480f1385c7e924273179375aa88f81380a72fb115712a313379d16aed4aa36208ee3b4a5dd785b06a07b2d868e3227f4495b5", AllInternalsVisible = true)]
-#if NETSTANDARD2_0 || NET40
+#if NETSTANDARD2_1 || NETSTANDARD2_0 || NET40
 [assembly: AllowPartiallyTrustedCallers]
 #endif
-#if NETSTANDARD2_0 || NET40 || NET45
+#if NETSTANDARD2_1 || NETSTANDARD2_0 || NET40 || NET45
 [assembly: SecurityRules(SecurityRuleSet.Level1)]
 #endif

main/SS/Formula/Function/FunctionMetadataReader.cs

@@ -33,7 +33,7 @@ namespace NPOI.SS.Formula.Function
      */
     class FunctionMetadataReader
     {
-#if NETSTANDARD2_0
+#if NETSTANDARD2_1 || NETSTANDARD2_0
         private const String METADATA_FILE_NAME = "NPOI.Resources.functionMetadata.txt";
 #else
         private const String METADATA_FILE_NAME = "functionMetadata.txt";

ooxml/Properties/AssemblyInfo.cs

@@ -40,9 +40,9 @@ using System.Security;
 //[assembly: InternalsVisibleTo("ooxml.Testcases")]
 
 [assembly: InternalsVisibleTo("NPOI.OOXML.TestCases, PublicKey=002400000480000094000000060200000024000052534131000400000100010095ccd95af3b39d8bc20544d3f47fd24b53ebc5ccb693eaed116290629f8cd882c827ebd511ad59449224f0718d3f9d03b64945a6c8b6644266001b8c8426185330e3d96da70ae16d4acc21b8d4d480f1385c7e924273179375aa88f81380a72fb115712a313379d16aed4aa36208ee3b4a5dd785b06a07b2d868e3227f4495b5", AllInternalsVisible = true)]
-#if NETSTANDARD2_0 || NET40
+#if NETSTANDARD2_1 || NETSTANDARD2_0 || NET40
 [assembly: AllowPartiallyTrustedCallers]
 #endif
-#if NETSTANDARD2_0 || NET40 || NET45
+#if NETSTANDARD2_1 || NETSTANDARD2_0 || NET40 || NET45
 [assembly: SecurityRules(SecurityRuleSet.Level1)]
 #endif

openxml4Net/Properties/AssemblyInfo.cs

@@ -36,9 +36,9 @@ using System.Security;
 [assembly: AssemblyVersion("2.5.1.0")]
 [assembly: AssemblyFileVersion("2.5.1.0")]
 [assembly: AssemblyInformationalVersion("2.0.0.0")]
-#if NETSTANDARD2_0 || NET40
+#if NETSTANDARD2_1 || NETSTANDARD2_0 || NET40
 [assembly: AllowPartiallyTrustedCallers]
 #endif
-#if NETSTANDARD2_0 || NET40 || NET45
+#if NETSTANDARD2_1 || NETSTANDARD2_0 || NET40 || NET45
 [assembly: SecurityRules(SecurityRuleSet.Level1)]
 #endif