Code cleanup, add serilog example

README.md

@@ -301,6 +301,7 @@ dotnet run
 - [Exposed roots via root arg](readme/exposed-roots-via-root-arg.md)
 - [Exposed generic roots](readme/exposed-generic-roots.md)
 - [Exposed generic roots with args](readme/exposed-generic-roots-with-args.md)
+- [Serilog](readme/serilog.md)
 ### Applications
 - Console
   - [Schrödinger's cat](readme/Console.md)

benchmarks/Pure.DI.Benchmarks/BaseAbstractContainer.cs

@@ -22,7 +22,7 @@ public abstract IAbstractContainer<TActualContainer> Bind(
         Type contractType,
         Type implementationType,
         AbstractLifetime lifetime = AbstractLifetime.Transient,
-        string? name = default);
+        string? name = null);
 
     public abstract T Resolve<T>() where T : class;
 

benchmarks/Pure.DI.Benchmarks/Benchmarks/Array.cs

@@ -6,12 +6,14 @@
 #pragma warning disable CA1822
 namespace Pure.DI.Benchmarks.Benchmarks;
 
+using System.Diagnostics.CodeAnalysis;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Order;
 using Model;
 
 [Orderer(SummaryOrderPolicy.FastestToSlowest)]
 [MemoryDiagnoser]
+[SuppressMessage("Usage", "CA2263:Предпочитать универсальную перегрузку, если тип известен")]
 public partial class Array : BenchmarkBase
 {
     private static void SetupDI() =>

benchmarks/Pure.DI.Benchmarks/Benchmarks/Enum.cs

@@ -6,12 +6,14 @@
 #pragma warning disable CA1822
 namespace Pure.DI.Benchmarks.Benchmarks;
 
+using System.Diagnostics.CodeAnalysis;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Order;
 using Model;
 
 [Orderer(SummaryOrderPolicy.FastestToSlowest)]
 [MemoryDiagnoser]
+[SuppressMessage("Usage", "CA2263:Предпочитать универсальную перегрузку, если тип известен")]
 public partial class Enum : BenchmarkBase
 {
     private static void SetupDI() =>

benchmarks/Pure.DI.Benchmarks/Benchmarks/Func.cs

@@ -6,12 +6,14 @@
 #pragma warning disable CA1822
 namespace Pure.DI.Benchmarks.Benchmarks;
 
+using System.Diagnostics.CodeAnalysis;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Order;
 using Model;
 
 [Orderer(SummaryOrderPolicy.FastestToSlowest)]
 [MemoryDiagnoser]
+[SuppressMessage("Usage", "CA2263:Предпочитать универсальную перегрузку, если тип известен")]
 public partial class Func : BenchmarkBase
 {
     private static void SetupDI() =>

benchmarks/Pure.DI.Benchmarks/Benchmarks/Singleton.cs

@@ -8,12 +8,14 @@
 #pragma warning disable CA1822
 namespace Pure.DI.Benchmarks.Benchmarks;
 
+using System.Diagnostics.CodeAnalysis;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Order;
 using Model;
 
 [Orderer(SummaryOrderPolicy.FastestToSlowest)]
 [MemoryDiagnoser]
+[SuppressMessage("Usage", "CA2263:Предпочитать универсальную перегрузку, если тип известен")]
 public partial class Singleton : BenchmarkBase
 {
     private static void SetupDI() =>

benchmarks/Pure.DI.Benchmarks/Benchmarks/Transient.cs

@@ -5,12 +5,14 @@
 #pragma warning disable CA1822
 namespace Pure.DI.Benchmarks.Benchmarks;
 
+using System.Diagnostics.CodeAnalysis;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Order;
 using Model;
 
 [Orderer(SummaryOrderPolicy.FastestToSlowest)]
 [MemoryDiagnoser]
+[SuppressMessage("Usage", "CA2263:Предпочитать универсальную перегрузку, если тип известен")]
 public partial class Transient : BenchmarkBase
 {
     private static void SetupDI() =>

benchmarks/Pure.DI.Benchmarks/Containers/Autofac.cs

@@ -17,7 +17,7 @@ public override IAbstractContainer<IContainer> Bind(
         Type contractType,
         Type implementationType,
         AbstractLifetime lifetime = AbstractLifetime.Transient,
-        string? name = default)
+        string? name = null)
     {
         var registration = _builder.RegisterType(implementationType).As(contractType);
         switch (lifetime)

benchmarks/Pure.DI.Benchmarks/Containers/CastleWindsor.cs

@@ -15,7 +15,7 @@ public override IAbstractContainer<WindsorContainer> Bind(
         Type contractType,
         Type implementationType,
         AbstractLifetime lifetime = AbstractLifetime.Transient,
-        string? name = default)
+        string? name = null)
     {
         var registration = Component.For(contractType).ImplementedBy(implementationType);
         switch (lifetime)

benchmarks/Pure.DI.Benchmarks/Containers/DryIoc.cs

@@ -13,7 +13,7 @@ public override IAbstractContainer<Container> Bind(
         Type contractType,
         Type implementationType,
         AbstractLifetime lifetime = AbstractLifetime.Transient,
-        string? name = default)
+        string? name = null)
     {
         var reuse = lifetime switch
         {

benchmarks/Pure.DI.Benchmarks/Containers/IoCContainer.cs

@@ -15,7 +15,7 @@ public override IAbstractContainer<Container> Bind(
         Type contractType,
         Type implementationType,
         AbstractLifetime lifetime = AbstractLifetime.Transient,
-        string? name = default)
+        string? name = null)
     {
         var bind = _container.Bind(contractType);
         switch (lifetime)

benchmarks/Pure.DI.Benchmarks/Containers/IoCContainerByCompositionRoot.cs

@@ -14,7 +14,7 @@ public override IAbstractContainer<Func<TContract>> Bind(
         Type contractType,
         Type implementationType,
         AbstractLifetime lifetime = AbstractLifetime.Transient,
-        string? name = default)
+        string? name = null)
     {
         _container.Bind(contractType, implementationType, lifetime, name);
         return this;

benchmarks/Pure.DI.Benchmarks/Containers/LightInject.cs

@@ -14,7 +14,7 @@ public override IAbstractContainer<ServiceContainer> Bind(
         Type contractType,
         Type implementationType,
         AbstractLifetime lifetime = AbstractLifetime.Transient,
-        string? name = default)
+        string? name = null)
     {
         switch (lifetime)
         {

benchmarks/Pure.DI.Benchmarks/Containers/MicrosoftDependencyInjection.cs

@@ -18,7 +18,7 @@ public override IAbstractContainer<ServiceProvider> Bind(
         Type contractType,
         Type implementationType,
         AbstractLifetime lifetime = AbstractLifetime.Transient,
-        string? name = default)
+        string? name = null)
     {
         switch (lifetime)
         {

benchmarks/Pure.DI.Benchmarks/Containers/Ninject.cs

@@ -14,7 +14,7 @@ public override IAbstractContainer<StandardKernel> Bind(
         Type contractType,
         Type implementationType,
         AbstractLifetime lifetime = AbstractLifetime.Transient,
-        string? name = default)
+        string? name = null)
     {
         var bind = _container.Bind(contractType).To(implementationType);
         switch (lifetime)

benchmarks/Pure.DI.Benchmarks/Containers/SimpleInjector.cs

@@ -33,7 +33,7 @@ public override IAbstractContainer<Container> Bind(
         Type contractType,
         Type implementationType,
         AbstractLifetime lifetime = AbstractLifetime.Transient,
-        string? name = default)
+        string? name = null)
     {
         switch (lifetime)
         {

benchmarks/Pure.DI.Benchmarks/Containers/Unity.cs

@@ -15,9 +15,9 @@ public override IAbstractContainer<UnityContainer> Bind(
         Type contractType,
         Type implementationType,
         AbstractLifetime lifetime = AbstractLifetime.Transient,
-        string? name = default)
+        string? name = null)
     {
-        ITypeLifetimeManager? lifetimeManager = default;
+        ITypeLifetimeManager? lifetimeManager = null;
         switch (lifetime)
         {
             case AbstractLifetime.Transient:
@@ -28,7 +28,7 @@ public override IAbstractContainer<UnityContainer> Bind(
                 break;
 
             default:
-                throw new ArgumentOutOfRangeException(nameof(lifetime), lifetime, default);
+                throw new ArgumentOutOfRangeException(nameof(lifetime), lifetime, null);
         }
 
         ((IUnityContainer)_container).RegisterType(contractType, implementationType, name, lifetimeManager);

benchmarks/Pure.DI.Benchmarks/IAbstractContainer.cs

@@ -8,5 +8,5 @@ IAbstractContainer<TActualContainer> Bind(
         Type contractType,
         Type implementationType,
         AbstractLifetime lifetime = AbstractLifetime.Transient,
-        string? name = default);
+        string? name = null);
 }

build/Benchmarks/Thresholds.cs

@@ -6,7 +6,7 @@ public readonly record struct Thresholds(
     string Type = "",
     string BaselineMethod = "",
     string BenchmarkMethod = "",
-    double? WarningTimeRatio = default,
-    double? WarningBytesAllocatedPerOperationRatio = default,
-    double? ErrorTimeRatio = default,
-    double? ErrorBytesAllocatedPerOperationRatio = default);
+    double? WarningTimeRatio = null,
+    double? WarningBytesAllocatedPerOperationRatio = null,
+    double? ErrorTimeRatio = null,
+    double? ErrorBytesAllocatedPerOperationRatio = null);

build/ReadmeTarget.cs

@@ -125,7 +125,7 @@ private static async Task AddContentAsync(string sourceFile, TextWriter readmeWr
         foreach (var file in files)
         {
             var relativePath = Path.GetRelativePath(Environment.CurrentDirectory, file);
-            Part? part = default;
+            Part? part = null;
             var vars = new Dictionary<string, string>
             {
                 [VisibleKey] = "False",
@@ -151,7 +151,7 @@ private static async Task AddContentAsync(string sourceFile, TextWriter readmeWr
 
                 if (str.StartsWith("*/"))
                 {
-                    part = default;
+                    part = null;
                     continue;
                 }
 
@@ -171,7 +171,7 @@ private static async Task AddContentAsync(string sourceFile, TextWriter readmeWr
                     body.AddRange(localBody.Select(i => i.Length > offset ? i[offset..].TrimEnd() : i));
                     offset = int.MaxValue;
                     localBody.Clear();
-                    part = default;
+                    part = null;
                     continue;
                 }
 
@@ -212,6 +212,12 @@ private static async Task AddContentAsync(string sourceFile, TextWriter readmeWr
                         }
                     }
 
+                    if (line.TrimStart().StartsWith("//# "))
+                    {
+                        localBody.Add(line.Replace("//# ", ""));
+                        continue;
+                    }
+
                     localBody.Add(line);
                 }
             }

build/Tools/Env.cs

@@ -16,8 +16,8 @@ public string GetPath(PathType pathType) =>
 
     private static string? TryFindFile(string? path, string searchPattern)
     {
-        string? target = default;
-        while (path != default && target == default)
+        string? target = null;
+        while (path != null && target == null)
         {
             target = Directory.EnumerateFileSystemEntries(path, searchPattern).FirstOrDefault();
             path = Path.GetDirectoryName(path);

build/Tools/Sdk.cs

@@ -15,7 +15,7 @@ internal class Sdk
 
     private static NuGetVersion[] GetVersions()
     {
-        bool? getVersions = default;
+        bool? getVersions = null;
         var versions = new List<NuGetVersion>();
         new DotNetCustom("--info").Run(output =>
         {

readme/async-root.md

@@ -36,7 +36,7 @@ partial class Composition
 {
   private readonly Composition _root;
 
-  [OrdinalAttribute(10)]
+  [OrdinalAttribute(128)]
   public Composition()
   {
     _root = this;

readme/build-up-of-an-existing-generic-object.md

@@ -64,7 +64,7 @@ partial class Composition
 {
   private readonly Composition _root;
 
-  [OrdinalAttribute(10)]
+  [OrdinalAttribute(128)]
   public Composition()
   {
     _root = this;

readme/build-up-of-an-existing-object.md

@@ -60,7 +60,7 @@ partial class Composition
 {
   private readonly Composition _root;
 
-  [OrdinalAttribute(10)]
+  [OrdinalAttribute(128)]
   public Composition()
   {
     _root = this;

readme/check-for-a-root.md

@@ -26,7 +26,7 @@ partial class Composition
     private static readonly HashSet<(Type type, object? tag)> Roots = [];
 
     // Check that the root can be resolved by Resolve methods
-    internal static bool HasRoot(Type type, object? key = default) =>
+    internal static bool HasRoot(Type type, object? key = null) =>
         Roots.Contains((type, key));
 
     static void Setup() =>

readme/class-arguments.md

@@ -77,7 +77,7 @@ partial class Composition
   private readonly string _argServiceName;
   private readonly string _argDependencyName;
 
-  [OrdinalAttribute(10)]
+  [OrdinalAttribute(128)]
   public Composition(int id, string serviceName, string dependencyName)
   {
     _argId = id;

readme/complex-generics.md

@@ -77,7 +77,7 @@ partial class Composition
   private DependencyStruct<int> _singletonDependencyStruct51;
   private bool _singletonDependencyStruct51Created;
 
-  [OrdinalAttribute(10)]
+  [OrdinalAttribute(128)]
   public Composition()
   {
     _root = this;

readme/constructor-ordinal-attribute.md

@@ -54,7 +54,7 @@ partial class Composition
 
   private readonly string _argServiceName;
 
-  [OrdinalAttribute(10)]
+  [OrdinalAttribute(128)]
   public Composition(string serviceName)
   {
     _argServiceName = serviceName ?? throw new ArgumentNullException(nameof(serviceName));

readme/custom-attributes.md

@@ -77,7 +77,7 @@ partial class PersonComposition
 
   private readonly int _argPersonId;
 
-  [OrdinalAttribute(10)]
+  [OrdinalAttribute(128)]
   public PersonComposition(int personId)
   {
     _argPersonId = personId;

readme/custom-universal-attribute.md

@@ -54,7 +54,7 @@ partial class PersonComposition
 
   private readonly int _argPersonId;
 
-  [OrdinalAttribute(10)]
+  [OrdinalAttribute(128)]
   public PersonComposition(int personId)
   {
     _argPersonId = personId;

readme/exposed-generic-roots-with-args.md

@@ -45,7 +45,7 @@ partial class Composition
 
   private Integration.CompositionWithGenericRootsAndArgsInOtherProject? _singletonCompositionWithGenericRootsAndArgsInOtherProject44;
 
-  [OrdinalAttribute(10)]
+  [OrdinalAttribute(128)]
   public Composition()
   {
     _root = this;

readme/exposed-roots-via-arg.md

@@ -41,7 +41,7 @@ partial class Composition
 
   private readonly Integration.CompositionInOtherProject _argBaseComposition;
 
-  [OrdinalAttribute(10)]
+  [OrdinalAttribute(128)]
   public Composition(Integration.CompositionInOtherProject baseComposition)
   {
     _argBaseComposition = baseComposition ?? throw new ArgumentNullException(nameof(baseComposition));

readme/exposed-roots-via-root-arg.md

@@ -40,7 +40,7 @@ partial class Composition
 {
   private readonly Composition _root;
 
-  [OrdinalAttribute(10)]
+  [OrdinalAttribute(128)]
   public Composition()
   {
     _root = this;

readme/factory.md

@@ -89,7 +89,7 @@ partial class Composition
 {
   private readonly Composition _root;
 
-  [OrdinalAttribute(10)]
+  [OrdinalAttribute(128)]
   public Composition()
   {
     _root = this;