fix(NamedOptions): Switch to use KeyedService(Microsoft) instead of NamedServices (Uno) so the NamedOptions Resolution at runtime does Work finally

Author: DevTKSS

src/DevTKSS.Uno.Samples.MvuxGallery/App.xaml.cs

@@ -74,7 +74,7 @@ protected async override void OnLaunched(LaunchActivatedEventArgs args)
                             //.Section<CodeSampleOptions>("DashboardSamples")
                             .Section<CodeSampleOptions>("NavigationSamples")
                             .Section<CodeSampleOptions>("ListboardSamples")
-                            .Section<CodeSampleOptions>("SimpleCardsSamples")
+                            .Section<CodeSampleOptions>("SimpleCardSamples")
                             .Section<CodeSampleOptions>("CounterSamples");
 
                 })
@@ -87,10 +87,10 @@ protected async override void OnLaunched(LaunchActivatedEventArgs args)
                         .AddSingleton<IGalleryImageService, GalleryImageService>()
 
                         //.AddNamedConfiguredSingletonCodeService("DashboardSamples")
-                        .AddNamedConfiguredSingletonCodeService("NavigationSamples")
-                        .AddNamedConfiguredSingletonCodeService("ListboardSamples")
-                        .AddNamedConfiguredSingletonCodeService("SimpleCardsSamples")
-                        .AddNamedConfiguredSingletonCodeService("CounterSamples")
+                        .AddKeyedSingletonCodeService("NavigationSamples")
+                        .AddKeyedSingletonCodeService("ListboardSamples")
+                        .AddKeyedSingletonCodeService("SimpleCardSamples")
+                        .AddKeyedSingletonCodeService("CounterSamples")
                 )
                 .UseNavigation(ReactiveViewModelMappings.ViewModelMappings, RegisterRoutes)
                 .UseSerialization((context, services) =>

src/DevTKSS.Uno.Samples.MvuxGallery/DevTKSS.Uno.Samples.MvuxGallery.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Uno.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net9.0-desktop</TargetFrameworks>  <!--;net9.0-windows10.0.26100-->
+    <TargetFrameworks>net9.0-desktop;net9.0</TargetFrameworks>  <!--;net9.0-windows10.0.26100-->
     <!-- BUG: Windows target unable to build when using ResourcesDictionary imported in App.xaml see https://github.com/DevTKSS/DevTKSS.Uno.SampleApps/issues/15 for more information-->
     <!-- <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>-->
     <OutputType>Exe</OutputType>

src/DevTKSS.Uno.Samples.MvuxGallery/Models/CodeSamples/CodeSample.cs

@@ -6,16 +6,12 @@ public record CodeSample
     public string FilePath { get; init; } = string.Empty;
     public Lines[] LineRanges { get; init; } = [];
 }
-public record Lines
-{
-    public int Start { get; init; }
-    public int End { get; init; }
-}
 
 [JsonSerializable(typeof(CodeSampleOptions))]
 [JsonSerializable(typeof(CodeSample))]
 [JsonSerializable(typeof(Lines))]
 [JsonSerializable(typeof(CodeSample[]))]
+[JsonSerializable(typeof(IEnumerable<CodeSample>))]
 public partial class CodeSampleOptionsContext : JsonSerializerContext
 {
 }

src/DevTKSS.Uno.Samples.MvuxGallery/Models/CodeSamples/CodeSampleOptions.cs

@@ -2,6 +2,6 @@ namespace DevTKSS.Uno.Samples.MvuxGallery.Models.CodeSamples;
 
 public record CodeSampleOptions
 {
-    public CodeSample[] Samples { get; init; } = Array.Empty<CodeSample>();
+    public CodeSample[] Samples { get; init; } = [];
 }
 

src/DevTKSS.Uno.Samples.MvuxGallery/Models/CodeSamples/CodeSampleService.cs

@@ -3,31 +3,37 @@ public partial record CodeSampleService : ICodeSampleService
 { 
     private readonly IStorage _storage;
     private readonly ILogger<CodeSampleService> _logger;
-    private readonly string _serviceName;
+   
     private CodeSampleOptions _options;
-    public CodeSampleService(string serviceName,
+    
+    public string Name { get; init; }
+
+    public CodeSampleService(
+        string name,
         IOptionsMonitor<CodeSampleOptions> options,
         ILogger<CodeSampleService> logger,
         IStorage storage)
     {
-        _serviceName = serviceName;
-        _options = options.Get(_serviceName);
-         _logger = logger;
-        _storage = storage;
+        _logger = logger;
+        _storage = storage; 
+        Name = name;
+        _options = options.Get(Name);
+        if (_logger.IsEnabled(LogLevel.Information))
+        {
+            _logger.LogInformation("CodeSampleService created for '{ServiceName}', loaded {SampleCount} samples", Name, _options.Samples.Length);
+        }
 
         options.OnChange(UpdateOptions);
-        
     }
-
-   public void UpdateOptions(CodeSampleOptions newOptions, string? changedOption)
+    public void UpdateOptions(CodeSampleOptions newOptions, string? changedOption)
     {
         if (_logger.IsEnabled(LogLevel.Debug))
         {
             _logger.LogDebug("CodeSampleOptions changed for {name}", changedOption);
         }
-        if (changedOption == _serviceName)
+        if (changedOption == Name)
         {
-            _logger.LogInformation("Updating CodeSampleOptions for {serviceName}", _serviceName);
+            _logger.LogInformation("Updating CodeSampleOptions for {serviceName}", Name);
             _options = newOptions;
         }
     }
@@ -48,19 +54,19 @@ public void UpdateOptions(CodeSampleOptions newOptions, string? changedOption)
     /// <returns>An awaitable <see cref="ValueTask{TResult}"/> providing a <see cref="ImmutableList{T}"/> of <see langword="string"/> with the Sample Names to select from</returns>
     public async ValueTask<IImmutableList<string>> GetCodeSampleOptionsAsync(CancellationToken ct = default)
     {
-        await Task.Delay(1);
-        _logger.LogTrace("Collecting available code sample options from appsettings.sampledata.json...");
+        await Task.Delay(1, ct);
+        _logger.LogTrace("Collecting available code sample options for '{ServiceName}' from configuration...", Name );
         var sampleOptions = _options.Samples.Select(sample => sample.SampleID).ToImmutableList();
 
         if (_logger.IsEnabled(LogLevel.Debug))
         {
             // Log available options
-            _logger.LogDebug("Available Options:\n{options}", sampleOptions.JoinBy("," + Environment.NewLine));
+            _logger.LogDebug("Available Options for '{ServiceName}':\n{options}", Name, sampleOptions.JoinBy("," + Environment.NewLine));
         }
         else if (_logger.IsEnabled(LogLevel.Trace))
         {
             // Log available options
-            _logger.LogTrace("Gathered {count} Options", sampleOptions.Count);
+            _logger.LogTrace("Gathered {count} Options for '{ServiceName}'", sampleOptions.Count, Name);
         }
 
         return sampleOptions; 
@@ -72,7 +78,8 @@ public async ValueTask<string> GetCodeSampleAsync(string? sampleID, Cancellation
         {
             if(_logger.IsEnabled(LogLevel.Trace))
             {
-                _logger.LogTrace("Fetching Storage Data for SampleID: {sampleID},\nDescription: {description},\nFilePath: {filePath},\nLineRanges: {lineRanges}",
+                _logger.LogTrace("Fetching Storage Data for Service '{service}', SampleID: {sampleID},\nDescription: {description},\nFilePath: {filePath},\nLineRanges: {lineRanges}",
+                    Name,
                     sampleOption.SampleID,
                     sampleOption.Description,
                     sampleOption.FilePath,
@@ -82,7 +89,7 @@ public async ValueTask<string> GetCodeSampleAsync(string? sampleID, Cancellation
             return await _storage.ReadLinesFromPackageFile(sampleOption.FilePath,sampleOption.LineRanges.Select(lr => (lr.Start, lr.End)));
         }
 
-        _logger.LogError("Code sample with ID {sampleID} not found", sampleID);
+        _logger.LogError("Code sample with ID {sampleID} not found for service '{service}'", sampleID, Name);
         return string.Empty;
     }
 }

src/DevTKSS.Uno.Samples.MvuxGallery/Models/CodeSamples/ICodeSampleService.cs

@@ -3,6 +3,7 @@ namespace DevTKSS.Uno.Samples.MvuxGallery.Models.CodeSamples;
 
 public interface ICodeSampleService
 {
+    public string Name { get; }
     /// <summary>
     /// Get the content of a specific code sample asynchronously.
     /// </summary>

src/DevTKSS.Uno.Samples.MvuxGallery/Models/CodeSamples/Lines.cs

@@ -0,0 +1,7 @@
+namespace DevTKSS.Uno.Samples.MvuxGallery.Models.CodeSamples;
+
+public record Lines
+{
+    public int Start { get; init; }
+    public int End { get; init; }
+}

src/DevTKSS.Uno.Samples.MvuxGallery/Models/CodeSamples/ServiceCollectionExtension.cs

@@ -13,16 +13,18 @@ public static class ServiceCollectionExtension
     /// <param name="sectionName">The optional configuration section name. If not provided, <paramref name="serviceName"/> is used.</param>
     /// <returns>The <see cref="IServiceCollection"/> for chaining.</returns>
     /// <remarks>
-    /// This method binds <see cref="CodeSampleOptions"/> to the configuration section "CodeSamples:{sectionName}" and registers
-    /// a named singleton <see cref="ICodeSampleService"/> using the configured options.
+    /// This method assumes configuration for the named <see cref="CodeSampleOptions"/> is provided (e.g., via UseConfiguration().Section<T>()).
+    /// It registers a keyed singleton <see cref="ICodeSampleService"/> that consumes those named options.
     /// </remarks>
-    public static IServiceCollection AddNamedConfiguredSingletonCodeService(this IServiceCollection services, string serviceName, string? sectionName = null)
+    public static IServiceCollection AddKeyedSingletonCodeService(this IServiceCollection services, string serviceName, string? sectionName = null)
     {
-        Console.WriteLine($"ServiceName: {serviceName}");
-        Console.WriteLine($"SectionName: {sectionName}");
-       // services.AddOptions<CodeSampleOptions>(sectionName ?? serviceName).BindConfiguration<CodeSampleOptions>(sectionName ?? serviceName);
-        services.AddNamedSingleton<ICodeSampleService, CodeSampleService>(serviceName, sp => sp
-                .ConfigureCodeSampleService(sectionName ?? serviceName));
+        var name = sectionName ?? serviceName;
+        Console.WriteLine($"ServiceName (registration): {serviceName}");
+        Console.WriteLine($"Effective section/name: {name}");
+
+        // Register the keyed service instance that will consume the named options
+        services.AddKeyedSingleton<ICodeSampleService>(serviceName, (serviceProvider,_) =>
+            serviceProvider.ConfigureCodeSampleService(name));
 
         return services;
     }

src/DevTKSS.Uno.Samples.MvuxGallery/Models/CodeSamples/ServiceProviderExtensions.cs

@@ -8,20 +8,21 @@ public static class ServiceProviderExtensions
     /// Creates and configures an instance of <see cref="CodeSampleService"/> for the specified section.
     /// </summary>
     /// <param name="serviceProvider">The <see cref="IServiceProvider"/> instance used to resolve required services.</param>
-    /// <param name="sectionName">The name of the section for which the <see cref="CodeSampleService"/> should be configured.</param>
+    /// <param name="serviceName">The name of the section for which the <see cref="CodeSampleService"/> should be configured.</param>
     /// <returns>A configured instance of <see cref="CodeSampleService"/>.</returns>
     /// <remarks>
     /// This extension method retrieves the necessary dependencies from the service provider and constructs a <see cref="CodeSampleService"/>
     /// instance tailored for the given section. It is useful for scenarios where code samples are organized by sections and require
     /// contextual configuration.
     /// </remarks>
-    public static CodeSampleService ConfigureCodeSampleService(this IServiceProvider serviceProvider, string sectionName)
+    public static CodeSampleService ConfigureCodeSampleService(this IServiceProvider serviceProvider, string serviceName)
     {
-        Console.WriteLine($"ServiceName: {sectionName}");
+        
         var options = serviceProvider.GetRequiredService<IOptionsMonitor<CodeSampleOptions>>();
         var logger = serviceProvider.GetRequiredService<ILogger<CodeSampleService>>();
         var storage = serviceProvider.GetRequiredService<IStorage>();
-        return new (sectionName, options, logger, storage);
+        logger.LogInformation("ConfigureCodeSampleService -> Name: {serviceName}", serviceName);
+        return new (serviceName, options, logger, storage);
 
     }
 }

src/DevTKSS.Uno.Samples.MvuxGallery/Presentation/ViewModels/CounterModel.cs

@@ -1,4 +1,3 @@
-
 namespace DevTKSS.Uno.Samples.MvuxGallery.Presentation.ViewModels;
 
 public partial record CounterModel
@@ -12,7 +11,7 @@ public CounterModel(
         ILogger<CounterModel> logger)
     {
         _logger = logger;
-        _sampleService = serviceProvider.GetRequiredNamedService<ICodeSampleService>("CounterSamples");
+        _sampleService = serviceProvider.GetRequiredKeyedService<ICodeSampleService>("CounterSamples");
         _stringLocalizer = stringLocalizer;
     }