Update for v9.2 and #3

Author: rappen

Plugin/CanaryTracer.cs

@@ -41,8 +41,7 @@ public static void TraceContext(this ITracingService tracingservice, IExecutionC
         {
             try
             {
-                tracingservice.TraceContext(context, parentcontext, attributetypes, convertqueries, expandcollections,
-                    service, 1);
+                tracingservice.TraceContext(context, parentcontext, attributetypes, convertqueries, expandcollections, service, 1);
             }
             catch (Exception ex)
             {
@@ -113,12 +112,16 @@ public static string ValueToString(object value, bool attributetypes, bool conve
             else if (value is EntityCollection collection)
             {
                 var result = $"{collection.EntityName} collection\n  Records: {collection.Entities.Count}\n  TotalRecordCount: {collection.TotalRecordCount}\n  MoreRecords: {collection.MoreRecords}\n  PagingCookie: {collection.PagingCookie}";
-                if (expandcollections)
+                if (expandcollections && collection.Entities.Count > 0)
                 {
-                    result += $"\n{indentstring}  {string.Join($"\n{indentstring}", collection.Entities.Select(e => ValueToString(e, attributetypes, convertqueries, expandcollections, service, indent + 1)))}";
+                    result += "\n" + ValueToString(collection.Entities, attributetypes, convertqueries, expandcollections, service, indent + 1);
                 }
                 return result;
             }
+            else if (value is IEnumerable<Entity> entities)
+            {
+                return expandcollections ? $"{indentstring}{string.Join($"\n{indentstring}", entities.Select(e => ValueToString(e, attributetypes, convertqueries, expandcollections, service, indent + 1)))}" : string.Empty;
+            }
             else if (value is Entity entity)
             {
                 var keylen = entity.Attributes.Count > 0 ? entity.Attributes.Max(p => p.Key.Length) : 50;
@@ -167,4 +170,4 @@ public static void Write(this ITracingService tracer, string text)
             tracer.Trace(DateTime.Now.ToString("HH:mm:ss.fff  ") + text);
         }
     }
-}
+}

Plugin/Plugin.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Rappen.Canary365.Plugin</RootNamespace>
     <AssemblyName>Rappen.Canary365.Plugin</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -34,7 +34,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>Rappen.pfx</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>Rappen free.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Crm.Sdk.Proxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -70,7 +70,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-    <None Include="Rappen.pfx" />
+    <None Include="Rappen free.snk" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Plugin/Properties/AssemblyInfo.cs

@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Rappen")]
 [assembly: AssemblyProduct("RappTracer365")]
-[assembly: AssemblyCopyright("Copyright © Jonas Rapp 2017-2020")]
+[assembly: AssemblyCopyright("Copyright © Jonas Rapp 2017-2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("9.1.0.4")]
-[assembly: AssemblyFileVersion("9.1.0.4")]
+[assembly: AssemblyVersion("9.1.0.5")]
+[assembly: AssemblyFileVersion("9.1.0.5")]