Merge pull request #2110 from EPPlusSoftware/fix/removoved-configmanager

OssianEPPlus · web-flow · commit 27d5aed3c871 · 2025-09-09T10:04:15.000+02:00
Removed change for ConfigurationManager in .NET 8/9 and .NET Standard
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -13,7 +13,6 @@
     <PackageVersion Include="System.Security.Cryptography.Xml" Version="8.0.2" />
     <PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" version="8.0.1" />
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="FakeItEasy" Version="8.0.0" />
diff --git a/src/EPPlus/EPPlus.csproj b/src/EPPlus/EPPlus.csproj
@@ -698,7 +698,6 @@
 		<PackageReference Include="System.ComponentModel.Annotations" />
 		<PackageReference Include="System.Text.Encoding.CodePages" />
 		<PackageReference Include="System.Security.Cryptography.Xml" />
-		<PackageReference Include="System.Configuration.ConfigurationManager" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
@@ -708,7 +707,6 @@
 		<PackageReference Include="System.ComponentModel.Annotations" />
 		<PackageReference Include="System.Text.Encoding.CodePages" VersionOverride="9.0.3"/>
 		<PackageReference Include="System.Security.Cryptography.Xml" VersionOverride="9.0.3"/>
-		<PackageReference Include="System.Configuration.ConfigurationManager" VersionOverride="9.0.8" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/EPPlus/EPPlusLicense.cs b/src/EPPlus/EPPlusLicense.cs
@@ -24,7 +24,7 @@ public class EPPlusLicense
         /// <summary>
         /// The name used for a commercial organization
         /// </summary>
-        public string LegalName 
+        public string LegalName
         {
             get;
             private set;
@@ -100,17 +100,17 @@ public void SetNonCommercialOrganization(string organizationName)
 
         private bool ValidateName(string name, out string msg)
         {
-            if(name.Length < 3)
+            if (name.Length < 3)
             {
                 msg = "The license holder name must be at least 3 characters.";
                 return false;
             }
-            if (name.Any(c => c=='/' || c=='\\' || c=='*' || char.IsControl(c) || c=='\t'))
+            if (name.Any(c => c == '/' || c == '\\' || c == '*' || char.IsControl(c) || c == '\t'))
             {
                 msg = "The license holder name contains invalid characters";
                 return false;
             }
-            if(name.Count(x=>char.IsLetter(x)) < 2)
+            if (name.Count(x => char.IsLetter(x)) < 2)
             {
                 msg = "The license holder name contains to few letters.";
                 return false;
@@ -136,9 +136,9 @@ public void SetCommercial(string licenseKey)
             LicenseKey = licenseKey;
             LicenseType = EPPlusLicenseType.Commercial;
             Source = EPPlusLicenseSource.Code;
-            if(_licenseSet==false)
+            if (_licenseSet == false)
             {
-                if(licenseInfo.Status==EPPlusLicenseStatus.InvalidLicenseKey)
+                if (licenseInfo.Status == EPPlusLicenseStatus.InvalidLicenseKey)
                 {
                     throw new InvalidLicenseKeyException(msg);
                 }
@@ -161,7 +161,7 @@ internal bool SetLicenseFromConfig(List<ExcelInitializationError> initErrors)
             else
             {
                 v = v.Trim();
-                var s = v.Split([':',',']);
+                var s = v.Split([':', ',']);
                 if (s[0].Equals("noncommercialorganization", StringComparison.OrdinalIgnoreCase))
                 {
                     if (s.Length == 1)
@@ -189,7 +189,7 @@ internal bool SetLicenseFromConfig(List<ExcelInitializationError> initErrors)
                 {
                     if (s.Length > 1 && v.StartsWith("commercial", StringComparison.OrdinalIgnoreCase))
                     {
-                        v = v.Substring(v.IndexOfAny([':',',']) + 1);
+                        v = v.Substring(v.IndexOfAny([':', ',']) + 1);
                     }
                     SetCommercial(v.Trim());
                     ExcelPackage.License.Source = inEnvironment ? EPPlusLicenseSource.EnvironmentVariable : EPPlusLicenseSource.ConfigFile;
@@ -212,16 +212,14 @@ private static string GetConfigValue(string key, List<ExcelInitializationError>
             {
 #if (Core)
                 v = ExcelConfigurationReader.GetJsonConfigValue($"EPPlus:ExcelPackage:{key}", _configuration, initErrors);
-#endif
-                if (string.IsNullOrEmpty(v))
-                {
 
+#else
                     v = ExcelConfigurationReader.GetValueFromAppSettings($"EPPlus:ExcelPackage:{key}", _configuration, initErrors);
-                }
-                if(string.IsNullOrEmpty(v))
-                {
-                    v = ExcelConfigurationReader.GetValueFromAppSettings($"EPPlus:ExcelPackage.{key}", _configuration, initErrors);
-                }
+                    if(string.IsNullOrEmpty(v))
+                    {
+                        v = ExcelConfigurationReader.GetValueFromAppSettings($"EPPlus:ExcelPackage.{key}", _configuration, initErrors);
+                    }
+#endif
                 inEnvironment = false;
             }
             else
@@ -239,7 +237,7 @@ public void RemoveActiveLicense()
             LicenseKey = null;
             Source = null;
             LegalName = null;
-            LicenseInfo = null;            
+            LicenseInfo = null;
             _licenseSet = false;
         }
     }
diff --git a/src/EPPlus/ExcelConfigurationReader.cs b/src/EPPlus/ExcelConfigurationReader.cs
@@ -12,11 +12,15 @@ Date               Author                       Change
  *************************************************************************************************/
 #if (Core)
 using Microsoft.Extensions.Configuration;
+#else
+using System.Configuration;
 #endif
-using Config=System.Configuration;
 using OfficeOpenXml.Configuration;
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
 
 namespace OfficeOpenXml
 {
@@ -62,7 +66,7 @@ internal static string GetJsonConfigValue(string key, ExcelPackageConfiguration
             var configRoot = default(IConfigurationRoot);
             try
             {
-                
+
                 var build = new ConfigurationBuilder()
                        .SetBasePath(basePath)
                        .AddJsonFile(configFileName, true, false);
@@ -104,13 +108,13 @@ internal static string GetJsonConfigValue(string key, ExcelPackageConfiguration
         }
 #endif
 
+#if (!Core)
         internal static string GetValueFromAppSettings(string key, ExcelPackageConfiguration config, List<ExcelInitializationError> initErrors)
         {
             var supressInitExceptions = config.SuppressInitializationExceptions;
             try
             {
-                
-                return Config.ConfigurationManager.AppSettings[key];
+                return ConfigurationManager.AppSettings[key];
             }
             catch(Exception ex)
             {
@@ -124,5 +128,6 @@ internal static string GetValueFromAppSettings(string key, ExcelPackageConfigura
                 throw;
             }
         }
+#endif
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public class EPPlusLicense`
`24`	`24`	`/// <summary>`
`25`	`25`	`/// The name used for a commercial organization`
`26`	`26`	`/// </summary>`
`27`		`- public string LegalName`
	`27`	`+ public string LegalName`
`28`	`28`	`{`
`29`	`29`	`get;`
`30`	`30`	`private set;`
`@@ -100,17 +100,17 @@ public void SetNonCommercialOrganization(string organizationName)`
`100`	`100`
`101`	`101`	`private bool ValidateName(string name, out string msg)`
`102`	`102`	`{`
`103`		`- if(name.Length < 3)`
	`103`	`+ if (name.Length < 3)`
`104`	`104`	`{`
`105`	`105`	`msg = "The license holder name must be at least 3 characters.";`
`106`	`106`	`return false;`
`107`	`107`	`}`
`108`		`- if (name.Any(c => c=='/' \|\| c=='\\' \|\| c=='*' \|\| char.IsControl(c) \|\| c=='\t'))`
	`108`	`+ if (name.Any(c => c == '/' \|\| c == '\\' \|\| c == '*' \|\| char.IsControl(c) \|\| c == '\t'))`
`109`	`109`	`{`
`110`	`110`	`msg = "The license holder name contains invalid characters";`
`111`	`111`	`return false;`
`112`	`112`	`}`
`113`		`- if(name.Count(x=>char.IsLetter(x)) < 2)`
	`113`	`+ if (name.Count(x => char.IsLetter(x)) < 2)`
`114`	`114`	`{`
`115`	`115`	`msg = "The license holder name contains to few letters.";`
`116`	`116`	`return false;`
`@@ -136,9 +136,9 @@ public void SetCommercial(string licenseKey)`
`136`	`136`	`LicenseKey = licenseKey;`
`137`	`137`	`LicenseType = EPPlusLicenseType.Commercial;`
`138`	`138`	`Source = EPPlusLicenseSource.Code;`
`139`		`- if(_licenseSet==false)`
	`139`	`+ if (_licenseSet == false)`
`140`	`140`	`{`
`141`		`- if(licenseInfo.Status==EPPlusLicenseStatus.InvalidLicenseKey)`
	`141`	`+ if (licenseInfo.Status == EPPlusLicenseStatus.InvalidLicenseKey)`
`142`	`142`	`{`
`143`	`143`	`throw new InvalidLicenseKeyException(msg);`
`144`	`144`	`}`
`@@ -161,7 +161,7 @@ internal bool SetLicenseFromConfig(List<ExcelInitializationError> initErrors)`
`161`	`161`	`else`
`162`	`162`	`{`
`163`	`163`	`v = v.Trim();`
`164`		`- var s = v.Split([':',',']);`
	`164`	`+ var s = v.Split([':', ',']);`
`165`	`165`	`if (s[0].Equals("noncommercialorganization", StringComparison.OrdinalIgnoreCase))`
`166`	`166`	`{`
`167`	`167`	`if (s.Length == 1)`
`@@ -189,7 +189,7 @@ internal bool SetLicenseFromConfig(List<ExcelInitializationError> initErrors)`
`189`	`189`	`{`
`190`	`190`	`if (s.Length > 1 && v.StartsWith("commercial", StringComparison.OrdinalIgnoreCase))`
`191`	`191`	`{`
`192`		`- v = v.Substring(v.IndexOfAny([':',',']) + 1);`
	`192`	`+ v = v.Substring(v.IndexOfAny([':', ',']) + 1);`
`193`	`193`	`}`
`194`	`194`	`SetCommercial(v.Trim());`
`195`	`195`	`ExcelPackage.License.Source = inEnvironment ? EPPlusLicenseSource.EnvironmentVariable : EPPlusLicenseSource.ConfigFile;`
`@@ -212,16 +212,14 @@ private static string GetConfigValue(string key, List<ExcelInitializationError>`
`212`	`212`	`{`
`213`	`213`	`#if (Core)`
`214`	`214`	`v = ExcelConfigurationReader.GetJsonConfigValue($"EPPlus:ExcelPackage:{key}", _configuration, initErrors);`
`215`		`-#endif`
`216`		`- if (string.IsNullOrEmpty(v))`
`217`		`- {`
`218`	`215`
	`216`	`+#else`
`219`	`217`	`v = ExcelConfigurationReader.GetValueFromAppSettings($"EPPlus:ExcelPackage:{key}", _configuration, initErrors);`
`220`		`- }`
`221`		`- if(string.IsNullOrEmpty(v))`
`222`		`- {`
`223`		`- v = ExcelConfigurationReader.GetValueFromAppSettings($"EPPlus:ExcelPackage.{key}", _configuration, initErrors);`
`224`		`- }`
	`218`	`+ if(string.IsNullOrEmpty(v))`
	`219`	`+ {`
	`220`	`+ v = ExcelConfigurationReader.GetValueFromAppSettings($"EPPlus:ExcelPackage.{key}", _configuration, initErrors);`
	`221`	`+ }`
	`222`	`+#endif`
`225`	`223`	`inEnvironment = false;`
`226`	`224`	`}`
`227`	`225`	`else`
`@@ -239,7 +237,7 @@ public void RemoveActiveLicense()`
`239`	`237`	`LicenseKey = null;`
`240`	`238`	`Source = null;`
`241`	`239`	`LegalName = null;`
`242`		`- LicenseInfo = null;`
	`240`	`+ LicenseInfo = null;`
`243`	`241`	`_licenseSet = false;`
`244`	`242`	`}`
`245`	`243`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,15 @@ Date Author Change`
`12`	`12`	`*************************************************************************************************/`
`13`	`13`	`#if (Core)`
`14`	`14`	`using Microsoft.Extensions.Configuration;`
	`15`	`+#else`
	`16`	`+using System.Configuration;`
`15`	`17`	`#endif`
`16`		`-using Config=System.Configuration;`
`17`	`18`	`using OfficeOpenXml.Configuration;`
`18`	`19`	`using System;`
`19`	`20`	`using System.Collections.Generic;`
	`21`	`+using System.IO;`
	`22`	`+using System.Linq;`
	`23`	`+using System.Text;`
`20`	`24`
`21`	`25`	`namespace OfficeOpenXml`
`22`	`26`	`{`
`@@ -62,7 +66,7 @@ internal static string GetJsonConfigValue(string key, ExcelPackageConfiguration`
`62`	`66`	`var configRoot = default(IConfigurationRoot);`
`63`	`67`	`try`
`64`	`68`	`{`
`65`		`-`
	`69`	`+`
`66`	`70`	`var build = new ConfigurationBuilder()`
`67`	`71`	`.SetBasePath(basePath)`
`68`	`72`	`.AddJsonFile(configFileName, true, false);`
`@@ -104,13 +108,13 @@ internal static string GetJsonConfigValue(string key, ExcelPackageConfiguration`
`104`	`108`	`}`
`105`	`109`	`#endif`
`106`	`110`
	`111`	`+#if (!Core)`
`107`	`112`	`internal static string GetValueFromAppSettings(string key, ExcelPackageConfiguration config, List<ExcelInitializationError> initErrors)`
`108`	`113`	`{`
`109`	`114`	`var supressInitExceptions = config.SuppressInitializationExceptions;`
`110`	`115`	`try`
`111`	`116`	`{`
`112`		`-`
`113`		`- return Config.ConfigurationManager.AppSettings[key];`
	`117`	`+ return ConfigurationManager.AppSettings[key];`
`114`	`118`	`}`
`115`	`119`	`catch(Exception ex)`
`116`	`120`	`{`
`@@ -124,5 +128,6 @@ internal static string GetValueFromAppSettings(string key, ExcelPackageConfigura`
`124`	`128`	`throw;`
`125`	`129`	`}`
`126`	`130`	`}`
	`131`	`+#endif`
`127`	`132`	`}`
`128`	`133`	`}`