Merge branch 'develop'

Author: olivier-spinelli

.editorconfig

@@ -144,6 +144,7 @@ dotnet_diagnostic.IDE0090.severity = none
 dotnet_diagnostic.VSTHRD101.severity = error
 # VSTHRD003: Avoid awaiting foreign Tasks
 dotnet_diagnostic.VSTHRD003.severity = none
+csharp_prefer_system_threading_lock = true:suggestion
 
 # /Signature-Code .editorconfig
 

CK.ActivityMonitor.SimpleSender/ActivityMonitorSimpleSenderExtension.Group-Gen.cs

@@ -5,7 +5,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.ComponentModel;
-#nullable enable
+
 
 namespace CK.Core
 {

CK.ActivityMonitor.SimpleSender/ActivityMonitorSimpleSenderExtension.Group-Gen.tt

@@ -11,7 +11,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.ComponentModel;
-#nullable enable
+
 
 namespace CK.Core
 {

CK.ActivityMonitor.SimpleSender/ActivityMonitorSimpleSenderExtension.Log-Gen.cs

@@ -5,7 +5,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.ComponentModel;
-#nullable enable
+
 
 namespace CK.Core
 {

CK.ActivityMonitor.SimpleSender/ActivityMonitorSimpleSenderExtension.Log-Gen.tt

@@ -11,7 +11,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.ComponentModel;
-#nullable enable
+
 
 namespace CK.Core
 {

CK.ActivityMonitor/ActivityMonitorExternalLogData.cs

@@ -59,7 +59,7 @@ public sealed partial class ActivityMonitorExternalLogData
     /// <inheritdoc cref="ActivityMonitorLogData.IsParallel"/>
     public bool IsParallel => (_flags & 1) != 0;
 
-    /// <inheritdoc cref="ActivityMonitorLogData.IsParallel"/>
+    /// <inheritdoc cref="ActivityMonitorLogData.IsOpenGroup"/>
     public bool IsOpenGroup => (_flags & 2) != 0;
 
     /// <inheritdoc cref="ActivityMonitorLogData.GetLogKeyString"/>
@@ -106,6 +106,8 @@ public void Release()
             {
                 _text = null;
                 _exceptionData = null;
+                _fileName = null;
+                _lineNumber = 0;
                 Release( this );
                 return;
             }

CK.ActivityMonitor/CK.ActivityMonitor.csproj

@@ -10,6 +10,7 @@
     </Description>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CK.Core" Version="21.1.0" />
+    <PackageReference Include="CK.Core" Version="22.0.0" />
+    <PackageReference Include="Shouldly" Version="4.3.0" />
   </ItemGroup>
 </Project>

CK.ActivityMonitor/Client/ActivityMonitorSimpleCollector.cs

@@ -17,7 +17,7 @@ public sealed class ActivityMonitorSimpleCollector : IActivityMonitorClient
     /// <summary>
     /// Element of the <see cref="ActivityMonitorSimpleCollector.Entries">Entries</see>.
     /// </summary>
-    public class Entry
+    public sealed class Entry
     {
         /// <summary>
         /// The tags of the log entry.
@@ -34,6 +34,11 @@ public class Entry
         /// </summary>
         public readonly DateTimeStamp LogTime;
 
+        /// <summary>
+        /// Depth of the log entry.
+        /// </summary>
+        public readonly int Depth;
+
         /// <summary>
         /// The text of the log entry.
         /// </summary>
@@ -44,10 +49,11 @@ public class Entry
         /// </summary>
         public readonly Exception? Exception;
 
-        internal Entry( CKTrait tags, LogLevel level, string text, DateTimeStamp logTime, Exception? ex )
+        internal Entry( CKTrait tags, int depth, LogLevel level, string text, DateTimeStamp logTime, Exception? ex )
         {
             Throw.DebugAssert( (level & LogLevel.IsFiltered) == 0 );
             Tags = tags;
+            Depth = depth;
             MaskedLevel = level;
             LogTime = logTime;
             Text = text;
@@ -125,7 +131,7 @@ void OnLog( ref ActivityMonitorLogData data )
     {
         if( (int)data.MaskedLevel >= (int)_filter )
         {
-            _entries.Push( new Entry( data.Tags, data.MaskedLevel, data.Text, data.LogTime, data.Exception ) );
+            _entries.Push( new Entry( data.Tags, data.Depth, data.MaskedLevel, data.Text, data.LogTime, data.Exception ) );
         }
     }
 

CodeCakeBuilder/CodeCakeBuilder.csproj

@@ -9,15 +9,15 @@
     <Nullable>annotations</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CK.Core" Version="20.0.1" />
+    <PackageReference Include="CK.Core" Version="21.1.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NuGet.Credentials" Version="6.12.1" />
+    <PackageReference Include="NuGet.Credentials" Version="6.13.1" />
   </ItemGroup>
   <ItemGroup>
     <None Remove="TestResult.xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="SimpleGitVersion.Cake" Version="11.0.2" />
+    <PackageReference Include="SimpleGitVersion.Cake" Version="11.1.0" />
   </ItemGroup>
 </Project>

CodeCakeBuilder/dotnet/Build.NuGetHelper.cs

@@ -9,7 +9,6 @@
 using NuGet.Packaging.Core;
 using NuGet.Protocol;
 using NuGet.Protocol.Core.Types;
-using NuGet.Protocol.Plugins;
 using NuGet.Versioning;
 using System;
 using System.Collections.Generic;