Merge pull request #1083 from 9rnsr/fixEmbeddedResourceLogicalName

fix EmbeddedResource access on net472
nissl-lab · May 20, 2023 · 3662d1f · 3662d1f
2 parents 05aa82b + 7c7abea
commit 3662d1f
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 12 deletions.
diff --git a/main/HSSF/UserModel/StaticFontMetrics.cs b/main/HSSF/UserModel/StaticFontMetrics.cs
@@ -34,11 +34,7 @@ namespace NPOI.HSSF.UserModel
  */
  class StaticFontMetrics
  {
-#if NETSTANDARD2_1 || NET6_0_OR_GREATER || 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";
-#endif
 
  /** The font metrics property file we're using */
  private static Properties fontMetricsProps;

diff --git a/main/SS/Formula/Function/FunctionMetadataReader.cs b/main/SS/Formula/Function/FunctionMetadataReader.cs
@@ -33,11 +33,7 @@ namespace NPOI.SS.Formula.Function
  */
  class FunctionMetadataReader
  {
-#if NETSTANDARD2_1 || NET6_0_OR_GREATER || NETSTANDARD2_0
  private const String METADATA_FILE_NAME = "NPOI.Resources.functionMetadata.txt";
-#else
- private const String METADATA_FILE_NAME = "functionMetadata.txt";
-#endif
 
  /** plain ASCII text metadata file uses three dots for ellipsis */
  private const string ELLIPSIS = "...";

diff --git a/ooxml/XSSF/UserModel/XSSFBuiltinTableStyle.cs b/ooxml/XSSF/UserModel/XSSFBuiltinTableStyle.cs
@@ -301,11 +301,7 @@ public enum XSSFBuiltinTableStyleEnum:int
  }
  public class XSSFBuiltinTableStyle
  {
-#if NETSTANDARD2_1 || NET6_0_OR_GREATER || NETSTANDARD2_0
  const string presetTableStylesResourceName = "NPOI.OOXML.Resources.presetTableStyles.xml";
-#else
- const string presetTableStylesResourceName= "presetTableStyles.xml";
-#endif
 
  private static Dictionary<XSSFBuiltinTableStyleEnum, ITableStyle> styleMap = new Dictionary<XSSFBuiltinTableStyleEnum, ITableStyle>();
  public static ITableStyle GetStyle(XSSFBuiltinTableStyleEnum style)