refactor: relocate options classes to dedicated Options folders

Move configuration options from Core/DataAccess/DataSync/ExcelIO to
dedicated Options folders within each project for better organization.
Update all references and tests accordingly.

NEW/src/JdeScoping.Api/DependencyInjection.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 using JdeScoping.Api.Hubs;
-using JdeScoping.Core.Options;
+using JdeScoping.Api.Options;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;

NEW/src/JdeScoping.Api/Options/AuthOptions.cs

@@ -1,4 +1,4 @@
-namespace JdeScoping.Core.Options;
+namespace JdeScoping.Api.Options;
 
 /// <summary>
 /// Authentication configuration options
@@ -10,12 +10,6 @@ public class AuthOptions
     /// </summary>
     public const string SectionName = "Auth";
 
-    /// <summary>
-    /// Enable fake authentication for development.
-    /// When true, any credentials are accepted.
-    /// </summary>
-    public bool UseFakeAuth { get; set; } = false;
-
     /// <summary>
     /// Name of the authentication cookie.
     /// </summary>
@@ -25,10 +19,4 @@ public class AuthOptions
     /// Cookie expiration in minutes (default: 8 hours).
     /// </summary>
     public int CookieExpirationMinutes { get; set; } = 480;
-
-    /// <summary>
-    /// Optional list of usernames that bypass group check.
-    /// Use sparingly for admin/testing purposes.
-    /// </summary>
-    public string[] AdminBypassUsers { get; set; } = [];
 }

NEW/src/JdeScoping.Core/Options/DataSyncOptions.cs

@@ -1,32 +0,0 @@
-namespace JdeScoping.Core.Options;
-
-/// <summary>
-/// Configuration options for data synchronization background jobs.
-/// </summary>
-public class DataSyncOptions
-{
-    /// <summary>
-    /// Configuration section name in appsettings.json.
-    /// </summary>
-    public const string SectionName = "DataSync";
-
-    /// <summary>
-    /// Cron schedule for mass (full) data refresh. Empty string disables the schedule.
-    /// </summary>
-    public string MassRefreshCronSchedule { get; set; } = "0 0 6 * * SAT";
-
-    /// <summary>
-    /// Cron schedule for daily incremental data refresh. Empty string disables the schedule.
-    /// </summary>
-    public string DailyRefreshCronSchedule { get; set; } = "0 0 4 * * *";
-
-    /// <summary>
-    /// Cron schedule for hourly data refresh. Empty string disables the schedule.
-    /// </summary>
-    public string HourlyRefreshCronSchedule { get; set; } = "0 0 * * * *";
-
-    /// <summary>
-    /// Maximum number of concurrent update operations.
-    /// </summary>
-    public int MaxConcurrentUpdates { get; set; } = 4;
-}

NEW/src/JdeScoping.Core/Options/ExcelExportOptions.cs

@@ -1,27 +0,0 @@
-namespace JdeScoping.Core.Options;
-
-/// <summary>
-/// Configuration options for Excel export functionality.
-/// </summary>
-public class ExcelExportOptions
-{
-    /// <summary>
-    /// Configuration section name in appsettings.json.
-    /// </summary>
-    public const string SectionName = "ExcelExport";
-
-    /// <summary>
-    /// Directory for temporary Excel files.
-    /// </summary>
-    public string TempDirectory { get; set; } = "/tmp/lotfinder";
-
-    /// <summary>
-    /// Maximum number of rows per Excel sheet.
-    /// </summary>
-    public int MaxRowsPerSheet { get; set; } = 1048576;
-
-    /// <summary>
-    /// Default date format for Excel cells.
-    /// </summary>
-    public string DefaultDateFormat { get; set; } = "yyyy-MM-dd HH:mm:ss";
-}

NEW/src/JdeScoping.Core/Options/SearchOptions.cs

@@ -1,8 +0,0 @@
-namespace JdeScoping.Core.Options;
-
-public class SearchOptions
-{
-    public int MaxResultRows { get; set; } = 100000;
-    public int TimeoutSeconds { get; set; } = 300;
-    public int MaxConcurrentSearches { get; set; } = 5;
-}

NEW/src/JdeScoping.DataAccess/DependencyInjection.cs

@@ -1,7 +1,6 @@
 using JdeScoping.Core.Interfaces;
-using JdeScoping.Core.Options;
 using JdeScoping.DataAccess;
-using JdeScoping.DataAccess.Configuration;
+using JdeScoping.DataAccess.Options;
 using JdeScoping.DataAccess.FilterHandlers;
 using JdeScoping.DataAccess.Interfaces;
 using JdeScoping.DataAccess.QueryBuilders;

NEW/src/JdeScoping.DataAccess/Options/DataAccessOptions.cs

@@ -1,4 +1,4 @@
-namespace JdeScoping.DataAccess.Configuration;
+namespace JdeScoping.DataAccess.Options;
 
 /// <summary>
 /// Configuration options for the data access layer.

NEW/src/JdeScoping.DataAccess/Options/SearchOptions.cs

@@ -0,0 +1,27 @@
+namespace JdeScoping.DataAccess.Options;
+
+/// <summary>
+/// Configuration options for search operations.
+/// </summary>
+public class SearchOptions
+{
+    /// <summary>
+    /// Configuration section name in appsettings.json.
+    /// </summary>
+    public const string SectionName = "Search";
+
+    /// <summary>
+    /// Maximum number of result rows to return.
+    /// </summary>
+    public int MaxResultRows { get; set; } = 100000;
+
+    /// <summary>
+    /// Search query timeout in seconds.
+    /// </summary>
+    public int TimeoutSeconds { get; set; } = 300;
+
+    /// <summary>
+    /// Maximum number of concurrent search operations.
+    /// </summary>
+    public int MaxConcurrentSearches { get; set; } = 5;
+}

NEW/src/JdeScoping.DataAccess/Options/SearchProcessingConfiguration.cs

@@ -1,4 +1,4 @@
-namespace JdeScoping.DataAccess.Configuration;
+namespace JdeScoping.DataAccess.Options;
 
 /// <summary>
 /// Configuration options for search processing.

NEW/src/JdeScoping.DataAccess/Options/SearchProcessingOptions.cs

@@ -1,4 +1,4 @@
-namespace JdeScoping.Core.Options;
+namespace JdeScoping.DataAccess.Options;
 
 /// <summary>
 /// Configuration options for search processing background service.

NEW/src/JdeScoping.DataAccess/Repositories/CmsRepository.cs

@@ -2,7 +2,7 @@ using System.Runtime.CompilerServices;
 using Dapper;
 using JdeScoping.Core.Models;
 using JdeScoping.Core.Models.Quality;
-using JdeScoping.DataAccess.Configuration;
+using JdeScoping.DataAccess.Options;
 using JdeScoping.DataAccess.Interfaces;
 using JdeScoping.DataAccess.Queries;
 using Microsoft.Extensions.Logging;

NEW/src/JdeScoping.DataAccess/Repositories/JdeRepository.cs

@@ -1,6 +1,6 @@
 using System.Runtime.CompilerServices;
 using Dapper;
-using JdeScoping.DataAccess.Configuration;
+using JdeScoping.DataAccess.Options;
 using JdeScoping.DataAccess.Interfaces;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;

NEW/src/JdeScoping.DataAccess/Repositories/LotFinderRepository.cs

@@ -1,6 +1,6 @@
 using System.Data;
 using JdeScoping.Core.Interfaces;
-using JdeScoping.DataAccess.Configuration;
+using JdeScoping.DataAccess.Options;
 using JdeScoping.DataAccess.Exceptions;
 using JdeScoping.DataAccess.Interfaces;
 using Microsoft.Data.SqlClient;

NEW/src/JdeScoping.DataAccess/Services/SearchProcessor.cs

@@ -1,6 +1,6 @@
 using System.Runtime.CompilerServices;
 using Dapper;
-using JdeScoping.DataAccess.Configuration;
+using JdeScoping.DataAccess.Options;
 using JdeScoping.DataAccess.Interfaces;
 using JdeScoping.DataAccess.Models;
 using JdeScoping.DataAccess.Models.Results;

NEW/src/JdeScoping.DataSync/DataSyncService.cs

@@ -1,4 +1,4 @@
-using JdeScoping.DataSync.Configuration;
+using JdeScoping.DataSync.Options;
 using JdeScoping.DataSync.Contracts;
 using JdeScoping.DataSync.Telemetry;
 using Microsoft.Extensions.DependencyInjection;

NEW/src/JdeScoping.DataSync/DependencyInjection.cs

@@ -4,7 +4,7 @@ using JdeScoping.Core.Models.Organization;
 using JdeScoping.Core.Models.Quality;
 using JdeScoping.Core.Models.WorkOrders;
 using JdeScoping.DataSync;
-using JdeScoping.DataSync.Configuration;
+using JdeScoping.DataSync.Options;
 using JdeScoping.DataSync.Configuration.MergeConfigurations;
 using JdeScoping.DataSync.Contracts;
 using JdeScoping.DataSync.Fetchers.Cms;

NEW/src/JdeScoping.DataSync/Models/DataUpdateTask.cs

@@ -1,5 +1,5 @@
 using JdeScoping.Core.Models.Enums;
-using JdeScoping.DataSync.Configuration;
+using JdeScoping.DataSync.Options;
 
 namespace JdeScoping.DataSync.Models;
 

NEW/src/JdeScoping.DataSync/Options/DataSourceConfig.cs

@@ -1,4 +1,4 @@
-namespace JdeScoping.DataSync.Configuration;
+namespace JdeScoping.DataSync.Options;
 
 /// <summary>
 /// Configuration for a single data source table sync.

NEW/src/JdeScoping.DataSync/Options/DataSyncOptions.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace JdeScoping.DataSync.Configuration;
+namespace JdeScoping.DataSync.Options;
 
 /// <summary>
 /// Configuration options for the data synchronization service.

NEW/src/JdeScoping.DataSync/Services/ScheduleChecker.cs

@@ -1,7 +1,7 @@
 using JdeScoping.Core.Models;
 using JdeScoping.Core.Models.Enums;
 using JdeScoping.Core.Models.Infrastructure;
-using JdeScoping.DataSync.Configuration;
+using JdeScoping.DataSync.Options;
 using JdeScoping.DataSync.Contracts;
 using JdeScoping.DataSync.Models;
 using Microsoft.Extensions.Logging;

NEW/src/JdeScoping.DataSync/Services/SyncOrchestrator.cs

@@ -1,4 +1,4 @@
-using JdeScoping.DataSync.Configuration;
+using JdeScoping.DataSync.Options;
 using JdeScoping.DataSync.Contracts;
 using JdeScoping.DataSync.Telemetry;
 using Microsoft.Extensions.DependencyInjection;

NEW/src/JdeScoping.DataSync/Services/TableSyncOperation.cs

@@ -4,7 +4,7 @@ using JdeScoping.Core.Models;
 using JdeScoping.Core.Models.Enums;
 using JdeScoping.Core.Interfaces;
 using JdeScoping.DataAccess.Interfaces;
-using JdeScoping.DataSync.Configuration;
+using JdeScoping.DataSync.Options;
 using JdeScoping.DataSync.Contracts;
 using JdeScoping.DataSync.Models;
 using JdeScoping.DataSync.Telemetry;

NEW/src/JdeScoping.ExcelIO/DependencyInjection.cs

@@ -1,6 +1,6 @@
 using JdeScoping.Core.Interfaces;
 using JdeScoping.ExcelIO;
-using JdeScoping.ExcelIO.Configuration;
+using JdeScoping.ExcelIO.Options;
 using JdeScoping.ExcelIO.Generators;
 using JdeScoping.ExcelIO.Helpers;
 using JdeScoping.ExcelIO.Parsing;

NEW/src/JdeScoping.ExcelIO/ExcelExportService.cs

@@ -2,7 +2,7 @@ using System.Reflection;
 using ClosedXML.Excel;
 using JdeScoping.Core.Interfaces;
 using JdeScoping.ExcelIO.Attributes;
-using JdeScoping.ExcelIO.Configuration;
+using JdeScoping.ExcelIO.Options;
 using JdeScoping.ExcelIO.Formatting;
 using JdeScoping.ExcelIO.Generators;
 using JdeScoping.ExcelIO.Models.Reporting;

NEW/src/JdeScoping.ExcelIO/Generators/CriteriaSheetGenerator.cs

@@ -1,5 +1,5 @@
 using ClosedXML.Excel;
-using JdeScoping.ExcelIO.Configuration;
+using JdeScoping.ExcelIO.Options;
 using JdeScoping.ExcelIO.Formatting;
 using JdeScoping.ExcelIO.Models.Reporting;
 using Microsoft.Extensions.Options;

NEW/src/JdeScoping.ExcelIO/Options/ExcelExportOptions.cs

@@ -1,4 +1,4 @@
-namespace JdeScoping.ExcelIO.Configuration;
+namespace JdeScoping.ExcelIO.Options;
 
 /// <summary>
 /// Configuration options for Excel export functionality.

NEW/src/JdeScoping.Host/Program.cs

@@ -1,7 +1,9 @@
 using JdeScoping.Api;
 using JdeScoping.Core.Interfaces;
-using JdeScoping.Core.Options;
-using JdeScoping.DataAccess.Configuration;
+using JdeScoping.DataAccess.Options;
+using JdeScoping.DataSync.Options;
+using JdeScoping.ExcelIO.Options;
+using JdeScoping.Infrastructure.Options;
 using JdeScoping.Database;
 using Microsoft.Extensions.Options;
 
@@ -68,7 +70,6 @@ static void ValidateServices(IServiceProvider services)
     // Validate Options classes are bound
     _ = provider.GetRequiredService<IOptions<DataAccessOptions>>();
     _ = provider.GetRequiredService<IOptions<DataSyncOptions>>();
-    _ = provider.GetRequiredService<IOptions<JdeScoping.DataSync.Configuration.DataSyncOptions>>();
     _ = provider.GetRequiredService<IOptions<ExcelExportOptions>>();
     _ = provider.GetRequiredService<IOptions<SearchProcessingOptions>>();
     _ = provider.GetRequiredService<IOptions<DataSourceOptions>>();

NEW/src/JdeScoping.Host/appsettings.json

@@ -112,16 +112,16 @@
     ]
   },
   "Auth": {
-    "UseFakeAuth": false,
     "CookieName": "ScopingTool.Auth",
-    "CookieExpirationMinutes": 480,
-    "AdminBypassUsers": []
+    "CookieExpirationMinutes": 480
   },
   "Ldap": {
     "ServerUrls": ["ldap.corp.example.com"],
     "GroupDn": "CN=ScopingTool-Users,OU=Groups,DC=corp,DC=example,DC=com",
     "SearchBase": "DC=corp,DC=example,DC=com",
-    "ConnectionTimeoutSeconds": 30
+    "ConnectionTimeoutSeconds": 30,
+    "UseFakeAuth": false,
+    "AdminBypassUsers": []
   },
   "ExcelExport": {
     "TempDirectory": "/tmp/lotfinder",

NEW/src/JdeScoping.Infrastructure/Auth/LdapAuthService.cs

@@ -2,7 +2,7 @@ using System.DirectoryServices.Protocols;
 using System.Net;
 using JdeScoping.Core.Interfaces;
 using JdeScoping.Core.Models;
-using JdeScoping.Core.Options;
+using JdeScoping.Infrastructure.Options;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
@@ -16,16 +16,13 @@ public sealed class LdapAuthService : IAuthService
     private const string LdapLookupFormat = "(sAMAccountName={0})";
 
     private readonly LdapOptions _options;
-    private readonly AuthOptions _authOptions;
     private readonly ILogger<LdapAuthService> _logger;
 
     public LdapAuthService(
         IOptions<LdapOptions> options,
-        IOptions<AuthOptions> authOptions,
         ILogger<LdapAuthService> logger)
     {
         _options = options.Value;
-        _authOptions = authOptions.Value;
         _logger = logger;
     }
 
@@ -41,7 +38,7 @@ public sealed class LdapAuthService : IAuthService
         }
 
         // Check if user is in admin bypass list
-        var isAdminBypass = _authOptions.AdminBypassUsers
+        var isAdminBypass = _options.AdminBypassUsers
             .Any(u => string.Equals(u, username, StringComparison.OrdinalIgnoreCase));
 
         // Try each configured LDAP server

NEW/src/JdeScoping.Infrastructure/Options/DataSourceOptions.cs

@@ -1,4 +1,4 @@
-namespace JdeScoping.Core.Options;
+namespace JdeScoping.Infrastructure.Options;
 
 /// <summary>
 /// Configuration options for data source selection (Oracle vs file-based).

NEW/src/JdeScoping.Infrastructure/Options/LdapOptions.cs

@@ -1,4 +1,4 @@
-namespace JdeScoping.Core.Options;
+namespace JdeScoping.Infrastructure.Options;
 
 /// <summary>
 /// LDAP configuration options for authentication
@@ -32,4 +32,16 @@ public class LdapOptions
     /// Connection timeout in seconds.
     /// </summary>
     public int ConnectionTimeoutSeconds { get; set; } = 30;
+
+    /// <summary>
+    /// Enable fake authentication for development.
+    /// When true, any credentials are accepted.
+    /// </summary>
+    public bool UseFakeAuth { get; set; } = false;
+
+    /// <summary>
+    /// Optional list of usernames that bypass group check.
+    /// Use sparingly for admin/testing purposes.
+    /// </summary>
+    public string[] AdminBypassUsers { get; set; } = [];
 }

NEW/src/JdeScoping.Infrastructure/Sources/Cms/CmsFileDataSource.cs

@@ -3,7 +3,7 @@ using System.Text.Json;
 using JdeScoping.Core.Interfaces;
 using JdeScoping.Core.Models;
 using JdeScoping.Core.Models.Quality;
-using JdeScoping.Core.Options;
+using JdeScoping.Infrastructure.Options;
 using Microsoft.Extensions.Options;
 
 namespace JdeScoping.Infrastructure.Sources.Cms;

NEW/src/JdeScoping.Infrastructure/Sources/Jde/JdeFileDataSource.cs

@@ -5,7 +5,7 @@ using JdeScoping.Core.Models;
 using JdeScoping.Core.Models.Inventory;
 using JdeScoping.Core.Models.Organization;
 using JdeScoping.Core.Models.WorkOrders;
-using JdeScoping.Core.Options;
+using JdeScoping.Infrastructure.Options;
 using Microsoft.Extensions.Options;
 
 namespace JdeScoping.Infrastructure.Sources.Jde;

NEW/tests/JdeScoping.DataAccess.Tests/CmsRepositoryTests.cs

@@ -1,4 +1,4 @@
-using JdeScoping.DataAccess.Configuration;
+using JdeScoping.DataAccess.Options;
 using JdeScoping.DataAccess.Exceptions;
 using JdeScoping.DataAccess.Interfaces;
 using JdeScoping.DataAccess.Repositories;
@@ -24,7 +24,7 @@ public class CmsRepositoryTests
     {
         _connectionFactory = Substitute.For<IDbConnectionFactory>();
         _logger = Substitute.For<ILogger<CmsRepository>>();
-        _options = Options.Create(new DataAccessOptions
+        _options = Microsoft.Extensions.Options.Options.Create(new DataAccessOptions
         {
             DefaultTimeoutSeconds = 30,
             MisDataTimeoutSeconds = 60000
@@ -197,7 +197,7 @@ public class CmsRepositoryTests
     public void Constructor_UsesMisDataTimeout()
     {
         // Arrange
-        var customOptions = Options.Create(new DataAccessOptions
+        var customOptions = Microsoft.Extensions.Options.Options.Create(new DataAccessOptions
         {
             MisDataTimeoutSeconds = 999999
         });
@@ -214,7 +214,7 @@ public class CmsRepositoryTests
     public void Constructor_DefaultMisDataTimeout_Is60000Seconds()
     {
         // Arrange
-        var defaultOptions = Options.Create(new DataAccessOptions());
+        var defaultOptions = Microsoft.Extensions.Options.Options.Create(new DataAccessOptions());
 
         // Act
         var repository = new CmsRepository(_connectionFactory, _logger, defaultOptions);

NEW/tests/JdeScoping.DataAccess.Tests/JdeRepositoryTests.cs

@@ -1,4 +1,4 @@
-using JdeScoping.DataAccess.Configuration;
+using JdeScoping.DataAccess.Options;
 using JdeScoping.DataAccess.Exceptions;
 using JdeScoping.DataAccess.Interfaces;
 using JdeScoping.DataAccess.Repositories;
@@ -24,7 +24,7 @@ public class JdeRepositoryTests
     {
         _connectionFactory = Substitute.For<IDbConnectionFactory>();
         _logger = Substitute.For<ILogger<JdeRepository>>();
-        _options = Options.Create(new DataAccessOptions
+        _options = Microsoft.Extensions.Options.Options.Create(new DataAccessOptions
         {
             DefaultTimeoutSeconds = 30,
             LotUsageTimeoutSeconds = 60,
@@ -637,7 +637,7 @@ public class JdeRepositoryTests
     public void Constructor_UsesConfiguredSchemas()
     {
         // Arrange
-        var customOptions = Options.Create(new DataAccessOptions
+        var customOptions = Microsoft.Extensions.Options.Options.Create(new DataAccessOptions
         {
             ProductionSchema = "CUSTOM_PROD",
             ArchiveSchema = "CUSTOM_ARC",
@@ -656,7 +656,7 @@ public class JdeRepositoryTests
     public void Constructor_UsesConfiguredTimeouts()
     {
         // Arrange
-        var customOptions = Options.Create(new DataAccessOptions
+        var customOptions = Microsoft.Extensions.Options.Options.Create(new DataAccessOptions
         {
             DefaultTimeoutSeconds = 120,
             LotUsageTimeoutSeconds = 999999

NEW/tests/JdeScoping.DataAccess.Tests/LotFinderRepositoryTests.cs

@@ -3,7 +3,7 @@ using JdeScoping.Core.Models.Enums;
 using JdeScoping.Core.Models.Inventory;
 using JdeScoping.Core.Models.Search;
 using JdeScoping.Core.ViewModels;
-using JdeScoping.DataAccess.Configuration;
+using JdeScoping.DataAccess.Options;
 using JdeScoping.DataAccess.Exceptions;
 using JdeScoping.DataAccess.Interfaces;
 using JdeScoping.DataAccess.Repositories;
@@ -29,7 +29,7 @@ public class LotFinderRepositoryTests
     {
         _connectionFactory = Substitute.For<IDbConnectionFactory>();
         _logger = Substitute.For<ILogger<LotFinderRepository>>();
-        _options = Options.Create(new DataAccessOptions
+        _options = Microsoft.Extensions.Options.Options.Create(new DataAccessOptions
         {
             DefaultTimeoutSeconds = 30,
             RebuildIndexTimeoutSeconds = 60

NEW/tests/JdeScoping.DataSync.IntegrationTests/TableSyncOperationTests.cs

@@ -4,7 +4,7 @@ using System.Runtime.CompilerServices;
 using JdeScoping.Core.Interfaces;
 using JdeScoping.Core.Models.Enums;
 using JdeScoping.DataAccess.Interfaces;
-using JdeScoping.DataSync.Configuration;
+using JdeScoping.DataSync.Options;
 using JdeScoping.DataSync.Contracts;
 using JdeScoping.DataSync.IntegrationTests.Infrastructure;
 using JdeScoping.DataSync.Models;
@@ -316,7 +316,7 @@ public class TableSyncOperationTests : IAsyncLifetime
                 return new MassInsertResult(records.Count, TimeSpan.Zero, true);
             });
 
-        var options = Options.Create(new DataSyncOptions
+        var options = Microsoft.Extensions.Options.Options.Create(new DataSyncOptions
         {
             BatchSize = 1000,
             BulkCopyBatchSize = 100

NEW/tests/JdeScoping.DataSync.Tests/DataSyncServiceTests.cs

@@ -1,5 +1,5 @@
 using System.Diagnostics.Metrics;
-using JdeScoping.DataSync.Configuration;
+using JdeScoping.DataSync.Options;
 using JdeScoping.DataSync.Contracts;
 using JdeScoping.DataSync.Telemetry;
 using Microsoft.Extensions.DependencyInjection;
@@ -22,7 +22,7 @@ public class DataSyncServiceTests
     public async Task ExecuteAsync_WhenDisabled_ExitsImmediately()
     {
         // Arrange
-        var options = Options.Create(new DataSyncOptions
+        var options = Microsoft.Extensions.Options.Options.Create(new DataSyncOptions
         {
             Enabled = false
         });
@@ -56,7 +56,7 @@ public class DataSyncServiceTests
     public async Task ExecuteAsync_WhenEnabled_StartsAndCanBeStopped()
     {
         // Arrange
-        var options = Options.Create(new DataSyncOptions
+        var options = Microsoft.Extensions.Options.Options.Create(new DataSyncOptions
         {
             Enabled = true,
             CheckInterval = TimeSpan.FromMilliseconds(100)
@@ -106,7 +106,7 @@ public class DataSyncServiceTests
     public async Task ExecuteAsync_GracefulShutdown_CompletesCleanly()
     {
         // Arrange
-        var options = Options.Create(new DataSyncOptions
+        var options = Microsoft.Extensions.Options.Options.Create(new DataSyncOptions
         {
             Enabled = true,
             CheckInterval = TimeSpan.FromSeconds(10) // Long interval
@@ -152,7 +152,7 @@ public class DataSyncServiceTests
     public async Task ExecuteAsync_AtStartup_CallsCloseOpenUpdateEntries()
     {
         // Arrange
-        var options = Options.Create(new DataSyncOptions
+        var options = Microsoft.Extensions.Options.Options.Create(new DataSyncOptions
         {
             Enabled = true,
             CheckInterval = TimeSpan.FromMilliseconds(50)
@@ -199,7 +199,7 @@ public class DataSyncServiceTests
     public async Task ExecuteAsync_WhenCloseOpenEntriesFindsEntries_LogsAndContinues()
     {
         // Arrange
-        var options = Options.Create(new DataSyncOptions
+        var options = Microsoft.Extensions.Options.Options.Create(new DataSyncOptions
         {
             Enabled = true,
             CheckInterval = TimeSpan.FromMilliseconds(50)
@@ -248,7 +248,7 @@ public class DataSyncServiceTests
     public async Task ExecuteAsync_WhenCloseOpenEntriesThrows_ContinuesStarting()
     {
         // Arrange
-        var options = Options.Create(new DataSyncOptions
+        var options = Microsoft.Extensions.Options.Options.Create(new DataSyncOptions
         {
             Enabled = true,
             CheckInterval = TimeSpan.FromMilliseconds(50)
@@ -301,7 +301,7 @@ public class DataSyncServiceTests
     public async Task ExecuteAsync_CallsOrchestratorForParallelExecution()
     {
         // Arrange
-        var options = Options.Create(new DataSyncOptions
+        var options = Microsoft.Extensions.Options.Options.Create(new DataSyncOptions
         {
             Enabled = true,
             CheckInterval = TimeSpan.FromMilliseconds(50),
@@ -349,7 +349,7 @@ public class DataSyncServiceTests
     public async Task ExecuteAsync_WhenOrchestratorThrows_ContinuesNextCycle()
     {
         // Arrange
-        var options = Options.Create(new DataSyncOptions
+        var options = Microsoft.Extensions.Options.Options.Create(new DataSyncOptions
         {
             Enabled = true,
             CheckInterval = TimeSpan.FromMilliseconds(50)
@@ -404,7 +404,7 @@ public class DataSyncServiceTests
     public async Task ExecuteAsync_WhenCancelled_StopsGracefully()
     {
         // Arrange
-        var options = Options.Create(new DataSyncOptions
+        var options = Microsoft.Extensions.Options.Options.Create(new DataSyncOptions
         {
             Enabled = true,
             CheckInterval = TimeSpan.FromSeconds(10)
@@ -462,7 +462,7 @@ public class DataSyncServiceTests
     public async Task ExecuteAsync_PassesCancellationTokenToOrchestrator()
     {
         // Arrange
-        var options = Options.Create(new DataSyncOptions
+        var options = Microsoft.Extensions.Options.Options.Create(new DataSyncOptions
         {
             Enabled = true,
             CheckInterval = TimeSpan.FromMilliseconds(50)
@@ -510,7 +510,7 @@ public class DataSyncServiceTests
     public async Task ExecuteAsync_WhenCancelledDuringDelay_ExitsCleanly()
     {
         // Arrange
-        var options = Options.Create(new DataSyncOptions
+        var options = Microsoft.Extensions.Options.Options.Create(new DataSyncOptions
         {
             Enabled = true,
             CheckInterval = TimeSpan.FromMinutes(5) // Long delay
@@ -562,7 +562,7 @@ public class DataSyncServiceTests
     public async Task ExecuteAsync_UsesNewScopePerCycle()
     {
         // Arrange
-        var options = Options.Create(new DataSyncOptions
+        var options = Microsoft.Extensions.Options.Options.Create(new DataSyncOptions
         {
             Enabled = true,
             CheckInterval = TimeSpan.FromMilliseconds(50)
@@ -610,7 +610,7 @@ public class DataSyncServiceTests
     public async Task ExecuteAsync_WhenSyncFails_ContinuesRunning()
     {
         // Arrange
-        var options = Options.Create(new DataSyncOptions
+        var options = Microsoft.Extensions.Options.Options.Create(new DataSyncOptions
         {
             Enabled = true,
             CheckInterval = TimeSpan.FromMilliseconds(50)

NEW/tests/JdeScoping.DataSync.Tests/ScheduleCheckerTests.cs

@@ -1,7 +1,7 @@
 using JdeScoping.Core.Models;
 using JdeScoping.Core.Models.Enums;
 using JdeScoping.Core.Models.Infrastructure;
-using JdeScoping.DataSync.Configuration;
+using JdeScoping.DataSync.Options;
 using JdeScoping.DataSync.Contracts;
 using JdeScoping.DataSync.Services;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -23,7 +23,7 @@ public class ScheduleCheckerTests
     public ScheduleCheckerTests()
     {
         _repository = Substitute.For<IDataUpdateRepository>();
-        _options = Options.Create(new DataSyncOptions
+        _options = Microsoft.Extensions.Options.Options.Create(new DataSyncOptions
         {
             LookbackMultiplier = 3,
             DataSources = []

NEW/tests/JdeScoping.DataSync.Tests/SyncOrchestratorTests.cs

@@ -1,6 +1,6 @@
 using System.Diagnostics.Metrics;
 using JdeScoping.Core.Models.Enums;
-using JdeScoping.DataSync.Configuration;
+using JdeScoping.DataSync.Options;
 using JdeScoping.DataSync.Contracts;
 using JdeScoping.DataSync.Models;
 using JdeScoping.DataSync.Services;
@@ -27,7 +27,7 @@ public class SyncOrchestratorTests
     public SyncOrchestratorTests()
     {
         _scheduleChecker = Substitute.For<IScheduleChecker>();
-        _options = Options.Create(new DataSyncOptions
+        _options = Microsoft.Extensions.Options.Options.Create(new DataSyncOptions
         {
             MaxDegreeOfParallelism = 4
         });
@@ -176,7 +176,7 @@ public class SyncOrchestratorTests
     public async Task ExecutePendingSyncsAsync_RespectsMaxDegreeOfParallelism()
     {
         // Arrange: Create 10 tasks but limit parallelism to 2
-        var options = Options.Create(new DataSyncOptions
+        var options = Microsoft.Extensions.Options.Options.Create(new DataSyncOptions
         {
             MaxDegreeOfParallelism = 2
         });

NEW/tests/JdeScoping.DataSync.Tests/TableSyncOperationTests.cs

@@ -5,7 +5,7 @@ using JdeScoping.Core.Interfaces;
 using JdeScoping.Core.Models;
 using JdeScoping.Core.Models.Enums;
 using JdeScoping.DataAccess.Interfaces;
-using JdeScoping.DataSync.Configuration;
+using JdeScoping.DataSync.Options;
 using JdeScoping.DataSync.Contracts;
 using JdeScoping.DataSync.Models;
 using JdeScoping.DataSync.Services;
@@ -40,7 +40,7 @@ public class TableSyncOperationTests
         _bulkMergeHelper = Substitute.For<IBulkMergeHelper>();
         _configRegistry = Substitute.For<IMergeConfigurationRegistry>();
 
-        _options = Options.Create(new DataSyncOptions
+        _options = Microsoft.Extensions.Options.Options.Create(new DataSyncOptions
         {
             BatchSize = 1000,
             BulkCopyBatchSize = 100

NEW/tests/JdeScoping.ExcelIO.Tests/CriteriaSheetGeneratorTests.cs

@@ -1,5 +1,5 @@
 using ClosedXML.Excel;
-using JdeScoping.ExcelIO.Configuration;
+using JdeScoping.ExcelIO.Options;
 using JdeScoping.ExcelIO.Generators;
 using JdeScoping.ExcelIO.Helpers;
 using JdeScoping.ExcelIO.Models.Reporting;
@@ -16,7 +16,7 @@ public class CriteriaSheetGeneratorTests
 
     public CriteriaSheetGeneratorTests()
     {
-        _options = Options.Create(new ExcelExportOptions
+        _options = Microsoft.Extensions.Options.Options.Create(new ExcelExportOptions
         {
             CriteriaSheetPassword = "TestPassword"
         });

NEW/tests/JdeScoping.ExcelIO.Tests/ExcelExportIntegrationTests.cs

@@ -1,5 +1,5 @@
 using ClosedXML.Excel;
-using JdeScoping.ExcelIO.Configuration;
+using JdeScoping.ExcelIO.Options;
 using JdeScoping.ExcelIO.Generators;
 using JdeScoping.ExcelIO.Helpers;
 using JdeScoping.ExcelIO.Models.Reporting;
@@ -23,7 +23,7 @@ public class ExcelExportIntegrationTests
     public ExcelExportIntegrationTests()
     {
         _logger = Substitute.For<ILogger<ExcelExportService>>();
-        _options = Options.Create(new ExcelExportOptions
+        _options = Microsoft.Extensions.Options.Options.Create(new ExcelExportOptions
         {
             CriteriaSheetPassword = "TestCriteriaPass",
             DataSheetPassword = "TestDataPass"

NEW/tests/JdeScoping.ExcelIO.Tests/ExcelExportServiceTests.cs

@@ -1,5 +1,5 @@
 using ClosedXML.Excel;
-using JdeScoping.ExcelIO.Configuration;
+using JdeScoping.ExcelIO.Options;
 using JdeScoping.ExcelIO.Generators;
 using JdeScoping.ExcelIO.Helpers;
 using JdeScoping.ExcelIO.Models.Reporting;
@@ -20,7 +20,7 @@ public class ExcelExportServiceTests
     public ExcelExportServiceTests()
     {
         _logger = Substitute.For<ILogger<ExcelExportService>>();
-        _options = Options.Create(new ExcelExportOptions
+        _options = Microsoft.Extensions.Options.Options.Create(new ExcelExportOptions
         {
             CriteriaSheetPassword = "TestCriteriaPass",
             DataSheetPassword = "TestDataPass"

NEW/tests/JdeScoping.ExcelIO.Tests/LegacyComparisonTests.cs

@@ -1,5 +1,5 @@
 using ClosedXML.Excel;
-using JdeScoping.ExcelIO.Configuration;
+using JdeScoping.ExcelIO.Options;
 using JdeScoping.ExcelIO.Formatting;
 using JdeScoping.ExcelIO.Generators;
 using JdeScoping.ExcelIO.Helpers;
@@ -24,7 +24,7 @@ public class LegacyComparisonTests
     public LegacyComparisonTests()
     {
         var logger = Substitute.For<ILogger<ExcelExportService>>();
-        var options = Options.Create(new ExcelExportOptions
+        var options = Microsoft.Extensions.Options.Options.Create(new ExcelExportOptions
         {
             CriteriaSheetPassword = "JDE_SCOPING_TOOL_PASS",
             DataSheetPassword = "JDESCOPINGTOOL"

NEW/tests/JdeScoping.Infrastructure.Tests/Integration/LdapIntegrationTests.cs

@@ -1,4 +1,4 @@
-using JdeScoping.Core.Options;
+using JdeScoping.Infrastructure.Options;
 using JdeScoping.Infrastructure.Auth;
 using JdeScoping.Infrastructure.Tests.Helpers;
 using Microsoft.Extensions.Logging;
@@ -52,19 +52,16 @@ public class LdapIntegrationTests
     {
         // Arrange
         var testUser = MockLdapServer.ValidGroupMemberUser;
-        var ldapOptions = Options.Create(new LdapOptions
+        var ldapOptions = Microsoft.Extensions.Options.Options.Create(new LdapOptions
         {
             ServerUrls = MockLdapServer.FakeServerUrls,
             GroupDn = MockLdapServer.TestGroupDn,
             SearchBase = MockLdapServer.TestSearchBase,
-            ConnectionTimeoutSeconds = 1 // Fast timeout for test
-        });
-        var authOptions = Options.Create(new AuthOptions
-        {
+            ConnectionTimeoutSeconds = 1, // Fast timeout for test
             AdminBypassUsers = []
         });
 
-        var service = new LdapAuthService(ldapOptions, authOptions, _logger);
+        var service = new LdapAuthService(ldapOptions, _logger);
 
         // Act
         var result = await service.AuthenticateAsync(testUser.Username, testUser.Password);
@@ -105,19 +102,16 @@ public class LdapIntegrationTests
     {
         // Arrange
         var testUser = MockLdapServer.ValidNotInGroupUser;
-        var ldapOptions = Options.Create(new LdapOptions
+        var ldapOptions = Microsoft.Extensions.Options.Options.Create(new LdapOptions
         {
             ServerUrls = MockLdapServer.FakeServerUrls,
             GroupDn = MockLdapServer.TestGroupDn,
             SearchBase = MockLdapServer.TestSearchBase,
-            ConnectionTimeoutSeconds = 1
-        });
-        var authOptions = Options.Create(new AuthOptions
-        {
+            ConnectionTimeoutSeconds = 1,
             AdminBypassUsers = []
         });
 
-        var service = new LdapAuthService(ldapOptions, authOptions, _logger);
+        var service = new LdapAuthService(ldapOptions, _logger);
 
         // Act
         var result = await service.AuthenticateAsync(testUser.Username, testUser.Password);
@@ -152,19 +146,16 @@ public class LdapIntegrationTests
     {
         // Arrange
         var testUser = MockLdapServer.InvalidCredentialsUser;
-        var ldapOptions = Options.Create(new LdapOptions
+        var ldapOptions = Microsoft.Extensions.Options.Options.Create(new LdapOptions
         {
             ServerUrls = MockLdapServer.FakeServerUrls,
             GroupDn = MockLdapServer.TestGroupDn,
             SearchBase = MockLdapServer.TestSearchBase,
-            ConnectionTimeoutSeconds = 1
-        });
-        var authOptions = Options.Create(new AuthOptions
-        {
+            ConnectionTimeoutSeconds = 1,
             AdminBypassUsers = []
         });
 
-        var service = new LdapAuthService(ldapOptions, authOptions, _logger);
+        var service = new LdapAuthService(ldapOptions, _logger);
 
         // Act
         var result = await service.AuthenticateAsync(testUser.Username, testUser.Password);
@@ -205,19 +196,16 @@ public class LdapIntegrationTests
     public async Task AuthenticateAsync_AllServersFail_ReturnsConnectionError()
     {
         // Arrange
-        var ldapOptions = Options.Create(new LdapOptions
+        var ldapOptions = Microsoft.Extensions.Options.Options.Create(new LdapOptions
         {
             ServerUrls = MockLdapServer.FakeServerUrls, // 3 fake servers that will all fail
             GroupDn = MockLdapServer.TestGroupDn,
             SearchBase = MockLdapServer.TestSearchBase,
-            ConnectionTimeoutSeconds = 1 // Fast timeout for test
-        });
-        var authOptions = Options.Create(new AuthOptions
-        {
+            ConnectionTimeoutSeconds = 1, // Fast timeout for test
             AdminBypassUsers = []
         });
 
-        var service = new LdapAuthService(ldapOptions, authOptions, _logger);
+        var service = new LdapAuthService(ldapOptions, _logger);
 
         // Act
         var result = await service.AuthenticateAsync("anyuser", "anypassword");

NEW/tests/JdeScoping.Infrastructure.Tests/Unit/LdapAuthServiceTests.cs

@@ -1,5 +1,5 @@
-using JdeScoping.Core.Options;
 using JdeScoping.Infrastructure.Auth;
+using JdeScoping.Infrastructure.Options;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using NSubstitute;
@@ -10,20 +10,16 @@ namespace JdeScoping.Infrastructure.Tests.Unit;
 public class LdapAuthServiceTests
 {
     private readonly IOptions<LdapOptions> _ldapOptions;
-    private readonly IOptions<AuthOptions> _authOptions;
     private readonly ILogger<LdapAuthService> _logger;
 
     public LdapAuthServiceTests()
     {
-        _ldapOptions = Options.Create(new LdapOptions
+        _ldapOptions = Microsoft.Extensions.Options.Options.Create(new LdapOptions
         {
             ServerUrls = ["ldap.test.com"],
             GroupDn = "CN=TestGroup,DC=test,DC=com",
             SearchBase = "DC=test,DC=com",
-            ConnectionTimeoutSeconds = 5
-        });
-        _authOptions = Options.Create(new AuthOptions
-        {
+            ConnectionTimeoutSeconds = 5,
             AdminBypassUsers = []
         });
         _logger = Substitute.For<ILogger<LdapAuthService>>();
@@ -33,7 +29,7 @@ public class LdapAuthServiceTests
     public async Task AuthenticateAsync_EmptyUsername_ReturnsFailure()
     {
         // Arrange
-        var service = new LdapAuthService(_ldapOptions, _authOptions, _logger);
+        var service = new LdapAuthService(_ldapOptions, _logger);
 
         // Act
         var result = await service.AuthenticateAsync("", "password");
@@ -47,7 +43,7 @@ public class LdapAuthServiceTests
     public async Task AuthenticateAsync_EmptyPassword_ReturnsFailure()
     {
         // Arrange
-        var service = new LdapAuthService(_ldapOptions, _authOptions, _logger);
+        var service = new LdapAuthService(_ldapOptions, _logger);
 
         // Act
         var result = await service.AuthenticateAsync("user", "");
@@ -61,13 +57,14 @@ public class LdapAuthServiceTests
     public async Task AuthenticateAsync_NoServersConfigured_ReturnsConnectionError()
     {
         // Arrange
-        var emptyServerOptions = Options.Create(new LdapOptions
+        var emptyServerOptions = Microsoft.Extensions.Options.Options.Create(new LdapOptions
         {
             ServerUrls = [],
             GroupDn = "CN=TestGroup,DC=test,DC=com",
-            SearchBase = "DC=test,DC=com"
+            SearchBase = "DC=test,DC=com",
+            AdminBypassUsers = []
         });
-        var service = new LdapAuthService(emptyServerOptions, _authOptions, _logger);
+        var service = new LdapAuthService(emptyServerOptions, _logger);
 
         // Act
         var result = await service.AuthenticateAsync("user", "password");
@@ -81,7 +78,7 @@ public class LdapAuthServiceTests
     public void GetUserInfoAsync_ThrowsNotSupportedException()
     {
         // Arrange
-        var service = new LdapAuthService(_ldapOptions, _authOptions, _logger);
+        var service = new LdapAuthService(_ldapOptions, _logger);
 
         // Act & Assert
         Should.Throw<NotSupportedException>(() => service.GetUserInfoAsync("user").GetAwaiter().GetResult());
@@ -93,11 +90,15 @@ public class LdapAuthServiceTests
         // Arrange
         // Note: We can't fully test admin bypass without a real LDAP server since bind still happens.
         // This test verifies the configuration is recognized by checking that bypass users are configured.
-        var authOptionsWithBypass = Options.Create(new AuthOptions
+        var ldapOptionsWithBypass = Microsoft.Extensions.Options.Options.Create(new LdapOptions
         {
+            ServerUrls = ["ldap.test.com"],
+            GroupDn = "CN=TestGroup,DC=test,DC=com",
+            SearchBase = "DC=test,DC=com",
+            ConnectionTimeoutSeconds = 5,
             AdminBypassUsers = ["bypassuser", "adminuser"]
         });
-        var service = new LdapAuthService(_ldapOptions, authOptionsWithBypass, _logger);
+        var service = new LdapAuthService(ldapOptionsWithBypass, _logger);
 
         // Act - attempt to authenticate the bypass user (will fail LDAP connection, but config is exercised)
         var result = await service.AuthenticateAsync("bypassuser", "anypassword");
@@ -113,14 +114,15 @@ public class LdapAuthServiceTests
     public async Task AuthenticateAsync_MultipleServersConfigured_TriesEachUntilAllFail()
     {
         // Arrange
-        var multiServerOptions = Options.Create(new LdapOptions
+        var multiServerOptions = Microsoft.Extensions.Options.Options.Create(new LdapOptions
         {
             ServerUrls = ["ldap1.test.com", "ldap2.test.com", "ldap3.test.com"],
             GroupDn = "CN=TestGroup,DC=test,DC=com",
             SearchBase = "DC=test,DC=com",
-            ConnectionTimeoutSeconds = 1 // Fast timeout for test
+            ConnectionTimeoutSeconds = 1, // Fast timeout for test
+            AdminBypassUsers = []
         });
-        var service = new LdapAuthService(multiServerOptions, _authOptions, _logger);
+        var service = new LdapAuthService(multiServerOptions, _logger);
 
         // Act
         var result = await service.AuthenticateAsync("testuser", "testpassword");