More c# /.net8 clean up.

logicality-io · Nov 19, 2023 · da3e096 · da3e096
1 parent 3991e3a
commit da3e096
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 26 deletions.
diff --git a/libs/configuration/src/Configuration/ConfigurationRootExtensions.cs b/libs/configuration/src/Configuration/ConfigurationRootExtensions.cs
@@ -44,9 +44,8 @@ void RecurseChildren(
                     }
                     else
                     {
-                        using var sha256     = SHA256.Create();
                         var       bytes      = Encoding.UTF8.GetBytes(value!);
-                        var       hash       = sha256.ComputeHash(bytes);
+                        var       hash       = SHA256.HashData(bytes);
                         var       valueHash  = Convert.ToBase64String(hash);
                         var       configInfo = new ConfigItem(child.Path, valueHash, provider.ToString()!);
                         infos.Add(configInfo);

diff --git a/libs/eventsourcing-domain/src/EventSourcing.Domain.Testing/Scenario.cs b/libs/eventsourcing-domain/src/EventSourcing.Domain.Testing/Scenario.cs
@@ -80,7 +80,7 @@ IScenarioBuilder IScenarioThenNoEventsStateBuilder.Expect(object outcome)
 
     Scenario IScenarioBuilder.Build() => this;
 
-    public ScenarioPassed Pass(object result) => new(this);
+    public ScenarioPassed Pass(object _) => new(this);
 
     public ScenarioRecordedOtherEvents ButRecordedOtherEvents(IReadOnlyCollection<RecordedEvent> other) =>
         new(this, other);

diff --git a/libs/eventsourcing-domain/src/EventSourcing.Domain/NamespaceBasedGuidGenerator.cs b/libs/eventsourcing-domain/src/EventSourcing.Domain/NamespaceBasedGuidGenerator.cs
@@ -4,12 +4,12 @@ namespace Logicality.EventSourcing.Domain;
 
 public class NamespaceBasedGuidGenerator
 {
-    private static readonly Tuple<int, int>[] ByteOrderPairsToSwap = {
+    private static readonly Tuple<int, int>[] ByteOrderPairsToSwap = [
         Tuple.Create(0, 3),
         Tuple.Create(1, 2),
         Tuple.Create(4, 5),
-        Tuple.Create(6, 7),
-    };
+        Tuple.Create(6, 7)
+    ];
 
     private readonly byte[] _namespace;
 

diff --git a/libs/eventsourcing-domain/tests/EventSourcing.Domain.Tests/EventRecorderTests.cs b/libs/eventsourcing-domain/tests/EventSourcing.Domain.Tests/EventRecorderTests.cs
@@ -49,9 +49,7 @@ public void ResetHasExpectedResult()
         public class EventRecorderWithRecordedEvents
         {
             private readonly EventRecorder _sut;
-            private readonly object[] _recorded = {
-                new(), new(),
-            };
+            private readonly object[] _recorded = [new(), new()];
 
             public EventRecorderWithRecordedEvents()
             {

diff --git a/libs/eventsourcing-domain/tests/EventSourcing.Domain.Tests/EventSourcedEntityTests.cs b/libs/eventsourcing-domain/tests/EventSourcing.Domain.Tests/EventSourcedEntityTests.cs
@@ -55,12 +55,11 @@ public void ApplyHasExpectedResult()
 
             private class Entity : EventSourcedEntity
             {
-                private readonly List<object> _restoredFromEvents;
+                private readonly List<object> _restoredFromEvents = [];
 
                 public Entity()
                 {
-                    _restoredFromEvents = new List<object>();
-                    On<Event>(e => _restoredFromEvents.Add(e));
+                    On<Event>(_restoredFromEvents.Add);
                 }
 
                 public object[] RestoredFromEvents => _restoredFromEvents.ToArray();
@@ -121,12 +120,11 @@ public void ApplyHasExpectedResult()
 
             private class Entity : EventSourcedEntity
             {
-                private readonly List<object> _restoredFromEvents;
+                private readonly List<object> _restoredFromEvents = [];
 
                 public Entity()
                 {
-                    _restoredFromEvents = new List<object>();
-                    On<Event>(e => _restoredFromEvents.Add(e));
+                    On<Event>(_restoredFromEvents.Add);
                 }
 
                 public object[] RestoredFromEvents => _restoredFromEvents.ToArray();

diff --git a/libs/github/tests/Actions.Workflow.Tests/Example.cs b/libs/github/tests/Actions.Workflow.Tests/Example.cs
@@ -1,11 +1,7 @@
-using Xunit;
-using Xunit.Abstractions;
+namespace Logicality.GitHub.Actions.Workflow;
 
-namespace Logicality.GitHub.Actions.Workflow;
-
-public class Example(ITestOutputHelper outputHelper)
+public class Example()
 {
-    [Fact]
     public void ReadMeExample()
     {
         var workflow = new Workflow("my-workflow");
@@ -26,9 +22,8 @@ public void ReadMeExample()
             .Run("./build.ps1")
             .Shell(Shells.Pwsh);
 
-        var yaml = workflow.GetYaml();
         var fileName = "my-workflow.yaml";
-
-        outputHelper.WriteLine(yaml);
+        var filePath = $"../workflows/{fileName}";
+        workflow.WriteYaml(filePath);
     }
 }
diff --git a/libs/hosting/src/Hosting.SerilogConsoleLogging/LoggerConfigurationExtensions.cs b/libs/hosting/src/Hosting.SerilogConsoleLogging/LoggerConfigurationExtensions.cs
@@ -19,7 +19,7 @@ public static LoggerConfiguration WriteHostedServiceMessagesToConsole(this Logge
     {
         configuration
             .Filter
-            .ByIncludingOnly(e => Matching.FromSource(typeof(HostedServiceWrapper).FullName)(e))
+            .ByIncludingOnly(e => Matching.FromSource(typeof(HostedServiceWrapper).FullName!)(e))
             .WriteTo
             .Console(
                 outputTemplate:

diff --git a/libs/system-extensions/tests/SystemExtensions.Tests/Net/Sockets/PortFinderTests.cs b/libs/system-extensions/tests/SystemExtensions.Tests/Net/Sockets/PortFinderTests.cs
@@ -18,7 +18,7 @@ public async Task Parallel_calls_should_all_get_different_ports()
             tasks.Add(Task.Run(() =>
             {
                 var port = PortFinder.GetNext();
-                ports.AddOrUpdate(port, _ => null, (_, _) => null);
+                ports.AddOrUpdate(port, _ => null!, (_, _) => null!);
                 outputHelper.WriteLine(port.ToString());
             }));
         }