Switch multilevel app settings

Removed gpcl6win64 and LincPDFC just from proj file

Removed package.json to clean out publish directory
This commit is contained in:
2025-03-05 16:50:02 -07:00
parent 84d1b07301
commit 4e6504af7e
19 changed files with 161 additions and 466 deletions

View File

@ -1,9 +1,7 @@
using File_Watcher.Helpers.EDA;
using File_Watcher.Models;
using System.Globalization;
using System.Text;
using System.Text.Json;
using System.Text.RegularExpressions;
using System.Xml;
using System.Xml.Serialization;
@ -12,12 +10,8 @@ namespace File_Watcher.Helpers;
internal static partial class HelperEDADatabase
{
private static Calendar? _Calendar;
private static string? _EDADataCollectionPlansLastRun;
[GeneratedRegex("[a-zA-Z0-9]{1,}")]
private static partial Regex RegexAZ09();
private static Stream ToStream(string @this)
{
MemoryStream? stream = new();
@ -207,7 +201,7 @@ internal static partial class HelperEDADatabase
}
}
private static void DataCollectionPlans(AppSettings appSettings, ILogger<Worker> logger, Calendar calendar, CancellationToken cancellationToken)
private static void DataCollectionPlans(AppSettings appSettings, ILogger<Worker> logger, CancellationToken cancellationToken)
{
int fieldCount;
object @object;
@ -219,7 +213,7 @@ internal static partial class HelperEDADatabase
Array objectTypes = Enum.GetValues(typeof(ModuleInstanceTypeName));
#pragma warning restore IL3050
Dictionary<string, Dictionary<ModuleInstanceTypeName, List<List<object>>>> rows = [];
string decrypted = RijndaelEncryption.Decrypt(appSettings.EDADatabaseConfiguration.Password, appSettings.Company);
string decrypted = RijndaelEncryption.Decrypt(appSettings.EDADatabaseConfiguration.Password, appSettings.FileWatcherConfiguration.Company);
string connectionString = $"Data Source={appSettings.EDADatabaseConfiguration.TNS}; User Id={appSettings.EDADatabaseConfiguration.UserName}; Password={decrypted};";
rows.Add(appSettings.EDADatabaseConfiguration.Name, []);
foreach (ModuleInstanceTypeName objectType in objectTypes)
@ -278,8 +272,7 @@ internal static partial class HelperEDADatabase
internal static bool SaveDataCollectionPlans(AppSettings appSettings, ILogger<Worker> logger, CancellationToken cancellationToken)
{
_Calendar ??= new CultureInfo("en-US").Calendar;
DataCollectionPlans(appSettings, logger, _Calendar, cancellationToken);
DataCollectionPlans(appSettings, logger, cancellationToken);
return true;
}