Merge pull request #178 from BryanWilhite/dev/version-8.0.0

Dev/version 8.0.0

Author: BryanWilhite

.vscode/tasks.json

@@ -182,19 +182,19 @@
             "command": "dotnet",
             "type": "shell",
             "args": [
-                "${workspaceFolder}/Statiq.Docs.Shell/bin/Release/net6.0/Statiq.Docs.Shell.dll",
+                "${workspaceFolder}/Statiq.Docs.Shell/bin/Release/net8.0/Statiq.Docs.Shell.dll",
                 "--configuration",
                 "Release",
                 "--",
                 "--root",
-                "${workspaceFolder}/Statiq.Docs.Shell/bin/Release/net6.0/",
+                "${workspaceFolder}/Statiq.Docs.Shell/bin/Release/net8.0/",
                 "--log-level",
                 "Information",
                 "--log-file",
                 "${workspaceFolder}/Statiq.Docs.Shell/statiq-"
             ],
             "options": {
-                "cwd": "${workspaceRoot}/Statiq.Docs.Shell/bin/Release/net6.0/"
+                "cwd": "${workspaceRoot}/Statiq.Docs.Shell/bin/Release/net8.0/"
             },
             "problemMatcher": "$msCompile"
         },
@@ -207,10 +207,10 @@
                 "add",
                 "--force",
                 "git@github.com:statiqdev/Docable.git",
-                "${workspaceFolder}/Statiq.Docs.Shell/bin/Release/net6.0/theme/"
+                "${workspaceFolder}/Statiq.Docs.Shell/bin/Release/net8.0/theme/"
             ],
             "options": {
-                "cwd": "${workspaceRoot}/Statiq.Docs.Shell/bin/Release/net6.0/"
+                "cwd": "${workspaceRoot}/Statiq.Docs.Shell/bin/Release/net8.0/"
             },
             "problemMatcher": "$msCompile"
         },

LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Bryan Wilhite
+Copyright (c) 2025 Bryan Wilhite
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://songhay.visualstudio.com/SonghaySystem/_apis/build/status/songhay-core-yaml-build?branchName=master)](https://songhay.visualstudio.com/SonghaySystem/_build/latest?definitionId=16&branchName=master)
 
-The _Core_ code to install as [a NuGet package](https://www.nuget.org/packages/SonghayCore/) for all of my studio Solutions. Anyone who may be reading this 👀 is free to do the same. This package is based on [a project file](https://github.com/BryanWilhite/SonghayCore/blob/master/SonghayCore/SonghayCore.csproj) that supports [multi-targeting](http://gigi.nullneuron.net/gigilabs/multi-targeting-net-standard-class-libraries/), declaring support for `net6.0`.
+The _Core_ code to install as [a NuGet package](https://www.nuget.org/packages/SonghayCore/) for all of my studio Solutions. Anyone who may be reading this 👀 is free to do the same. This package is based on [a project file](https://github.com/BryanWilhite/SonghayCore/blob/master/SonghayCore/SonghayCore.csproj) that supports [multi-targeting](http://gigi.nullneuron.net/gigilabs/multi-targeting-net-standard-class-libraries/), declaring support for `net8.0`.
 
 **NuGet package 📦:** [`SonghayCore`](https://www.nuget.org/packages/SonghayCore/)
 

SonghayCore.OrderedTests/SonghayCore.OrderedTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
 
@@ -19,17 +19,17 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-        <PackageReference Include="xunit" Version="2.9.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="3.1.2">
+        <PackageReference Include="coverlet.collector" Version="6.0.4">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
+        <PackageReference Include="Xunit.SkippableFact" Version="1.5.23" />
     </ItemGroup>
 
     <ItemGroup>

SonghayCore.Tests/Abstractions/IActivityTaskTests.cs

@@ -0,0 +1,126 @@
+using Meziantou.Extensions.Logging.Xunit;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Songhay.Abstractions;
+
+namespace Songhay.Tests.Abstractions;
+
+public class MyActivityTaskWithInput(IConfiguration configuration, ILogger<MyActivityTaskWithInput> logger) : IActivityTask<string>
+{
+    public async Task StartAsync(string? input)
+    {
+        await Task.Run(() =>
+        {
+            const string key = "actual";
+
+            configuration[key] = $"Hello {input}!";
+
+            logger.LogInformation("{s}", configuration[key]);
+        });
+    }
+}
+
+public class MyActivityTaskWithInputAndOutput : IActivityTask<int, string>
+{
+    public async Task<string?> StartAsync(int input)
+    {
+        return await Task.FromResult(input switch
+        {
+            4 => "walls",
+            16 => "sweet",
+            42 => "meaning of life",
+            _ => null
+        });
+    }
+}
+
+public class MyOtherActivityTaskWithInputAndOutput : IActivityTask<int, string>
+{
+    public async Task<string?> StartAsync(int input)
+    {
+        return await Task.FromResult(input switch
+        {
+            4 => "four",
+            16 => "sixteen",
+            42 => "forty-two",
+            _ => null
+        });
+    }
+}
+
+public class MyOutputActivityTask(
+    [FromKeyedServices(nameof(MyActivityTaskWithInputAndOutput))]
+    IActivityTask<int, string> ioActivity,
+    [FromKeyedServices(nameof(MyOtherActivityTaskWithInputAndOutput))]
+    IActivityTask<int, string> otherIoActivity) : IActivityOutputOnlyTask<string[]>
+{
+    public async Task<string[]?> StartAsync()
+    {
+        var output = await Task.WhenAll(
+            otherIoActivity.StartAsync(4),
+            ioActivity.StartAsync(4),
+            ioActivity.StartAsync(16),
+            otherIoActivity.StartAsync(16),
+            otherIoActivity.StartAsync(42),
+            ioActivity.StartAsync(42)
+        );
+
+        return output.Where(s => !string.IsNullOrWhiteSpace(s)).ToArray()!;
+    }
+}
+
+public class IActivityTaskTestsIActivityTests(ITestOutputHelper testOutputHelper)
+{
+    [Theory]
+    [InlineData(null, "Hello !")]
+    [InlineData("world", "Hello world!")]
+    public async Task ShouldRunMyActivityWithInput(string? input, string? expected)
+    {
+        const string actual = "actual";
+
+        IConfiguration configuration = new ConfigurationBuilder()
+            .AddInMemoryCollection(new Dictionary<string, string?>
+            {
+                [actual] = null,
+            })
+            .Build();
+
+        ServiceCollection services = new();
+
+        services.AddSingleton(configuration);
+        services.AddLogging();
+        services.AddSingleton<ILoggerProvider>(new XUnitLoggerProvider(testOutputHelper, appendScope: false));
+        services.AddTransient<IActivityTask<string>, MyActivityTaskWithInput>();
+
+        ServiceProvider provider = services.BuildServiceProvider();
+
+        IActivityTask<string> activity = provider.GetRequiredService<IActivityTask<string>>();
+
+        await activity.StartAsync(input);
+
+        Assert.Equal(expected, configuration[actual]);
+    }
+
+    [Fact]
+    public async Task ShouldRunMyOutputActivity()
+    {
+        ServiceCollection services = new();
+
+        services.AddKeyedTransient<IActivityTask<int, string>, MyActivityTaskWithInputAndOutput>(nameof(MyActivityTaskWithInputAndOutput));
+        services.AddKeyedTransient<IActivityTask<int, string>, MyOtherActivityTaskWithInputAndOutput>(nameof(MyOtherActivityTaskWithInputAndOutput));
+        services.AddTransient<IActivityOutputOnlyTask<string[]>, MyOutputActivityTask>();
+
+        ServiceProvider provider = services.BuildServiceProvider();
+
+        IActivityOutputOnlyTask<string[]> activity = provider.GetRequiredService<IActivityOutputOnlyTask<string[]>>();
+        var actual = await activity.StartAsync();
+
+        Assert.NotNull(actual);
+
+        foreach (string s in actual)
+        {
+            testOutputHelper.WriteLine(s);
+        }
+    }
+}

SonghayCore.Tests/Abstractions/IActivityTests.cs

@@ -0,0 +1,121 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Configuration;
+using Meziantou.Extensions.Logging.Xunit;
+using Songhay.Abstractions;
+
+namespace Songhay.Tests.Abstractions;
+
+public class MyActivityWithInput(IConfiguration configuration, ILogger<MyActivityWithInput> logger) : IActivity<string>
+{
+    public void Start(string? input)
+    {
+        const string key = "actual";
+
+        configuration[key] = $"Hello {input}!";
+
+        logger.LogInformation("{s}", configuration[key]);
+    }
+}
+
+public class MyActivityWithInputAndOutput : IActivity<int, string>
+{
+    public string? Start(int input)
+    {
+        return input switch
+        {
+            4 => "walls",
+            16 => "sweet",
+            42 => "meaning of life",
+            _ => null
+        };
+    }
+}
+
+public class MyOtherActivityWithInputAndOutput : IActivity<int, string>
+{
+    public string? Start(int input)
+    {
+        return input switch
+        {
+            4 => "four",
+            16 => "sixteen",
+            42 => "forty-two",
+            _ => null
+        };
+    }
+}
+
+public class MyOutputActivity(
+    [FromKeyedServices(nameof(MyActivityWithInputAndOutput))] IActivity<int, string> ioActivity,
+    [FromKeyedServices(nameof(MyOtherActivityWithInputAndOutput))] IActivity<int, string> otherIoActivity) : IActivityOutputOnly<string[]>
+{
+    public string[] Start()
+    {
+        List<string?> output =
+        [
+            otherIoActivity.Start(4),
+            ioActivity.Start(4),
+            ioActivity.Start(16),
+            otherIoActivity.Start(16),
+            ioActivity.Start(42),
+            otherIoActivity.Start(42),
+        ];
+
+        return output.Where(s => !string.IsNullOrWhiteSpace(s)).ToArray()!;
+    }
+}
+
+public class IActivityTests(ITestOutputHelper testOutputHelper)
+{
+    [Theory]
+    [InlineData(null, "Hello !")]
+    [InlineData("world", "Hello world!")]
+    public void ShouldRunMyActivityWithInput(string? input, string? expected)
+    {
+        const string actual = "actual";
+
+        IConfiguration configuration = new ConfigurationBuilder()
+            .AddInMemoryCollection(new Dictionary<string, string?>
+            {
+                [actual] = null 
+            })
+            .Build();
+
+        ServiceCollection services = new();
+
+        services.AddSingleton(configuration);
+        services.AddLogging();
+        services.AddSingleton<ILoggerProvider>(new XUnitLoggerProvider(testOutputHelper, appendScope: false));
+        services.AddTransient<IActivity<string>, MyActivityWithInput>();
+
+        ServiceProvider provider = services.BuildServiceProvider();
+
+        IActivity<string> activity = provider.GetRequiredService<IActivity<string>>();
+
+        activity.Start(input);
+        Assert.Equal(expected, configuration[actual]);
+    }
+
+    [Fact]
+    public void ShouldRunMyOutputActivity()
+    {
+        ServiceCollection services = new();
+
+        services.AddKeyedTransient<IActivity<int, string>, MyActivityWithInputAndOutput>(nameof(MyActivityWithInputAndOutput));
+        services.AddKeyedTransient<IActivity<int, string>, MyOtherActivityWithInputAndOutput>(nameof(MyOtherActivityWithInputAndOutput));
+        services.AddTransient<IActivityOutputOnly<string[]>, MyOutputActivity>();
+
+        ServiceProvider provider = services.BuildServiceProvider();
+
+        IActivityOutputOnly<string[]> activity = provider.GetRequiredService<IActivityOutputOnly<string[]>>();
+        var actual = activity.Start();
+
+        Assert.NotNull(actual);
+
+        foreach (string s in actual)
+        {
+            testOutputHelper.WriteLine(s);
+        }
+    }
+}