Merge pull request #171 from MarkMpn/variables

+semver: major
MarkMpn · Apr 9, 2022 · 14eff9b · 14eff9b
2 parents 1e2f5da + ae85952
commit 14eff9b
Show file tree

Hide file tree

Showing 206 changed files with 11,945 additions and 2,916 deletions.
diff --git a/AutocompleteMenu/AutocompleteMenu-ScintillaNET.csproj b/AutocompleteMenu/AutocompleteMenu-ScintillaNET.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AutocompleteMenuNS</RootNamespace>
     <AssemblyName>AutocompleteMenu-ScintillaNET</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

diff --git a/MarkMpn.Sql4Cds/ExecutionPlanView.cs → ...Mpn.Sql4Cds.Controls/ExecutionPlanView.cs b/MarkMpn.Sql4Cds/ExecutionPlanView.cs → ...Mpn.Sql4Cds.Controls/ExecutionPlanView.cs
@@ -11,9 +11,9 @@
 using MarkMpn.Sql4Cds.Engine;
 using MarkMpn.Sql4Cds.Engine.ExecutionPlan;
 
-namespace MarkMpn.Sql4Cds
+namespace MarkMpn.Sql4Cds.Controls
 {
-    class ExecutionPlanView : ScrollableControl
+    public class ExecutionPlanView : ScrollableControl
     {
         class Line
         {
@@ -44,8 +44,6 @@ public ExecutionPlanView()
 
         public IDictionary<string, DataSource> DataSources { get; set; }
 
-        public IQueryExecutionOptions Options { get; set; }
-
         public IExecutionPlanNode Plan
         {
             get { return _plan; }
@@ -108,7 +106,7 @@ private void LayoutChildren(IExecutionPlanNode parent)
 
                 _nodeLocations[child] = fullRect;
 
-                var rows = child is IDataExecutionPlanNode dataChild ? Executed ? dataChild.RowsOut : dataChild.EstimateRowsOut(DataSources.Values.Cast<Engine.DataSource>().ToDictionary(ds => ds.Name, StringComparer.OrdinalIgnoreCase), Options, null) : 1;
+                var rows = child is IDataExecutionPlanNode dataChild ? Executed ? dataChild.RowsOut : dataChild.EstimatedRowsOut : 1;
                 var width = rows == 0 ? 1 : (int)Math.Log10(rows);
                 _lines.Add(new Line { Source = child, Start = new Point(iconRect.Left, parentIconRect.Top == iconRect.Top ? (parentIconRect.Top + (i + 1) * lineYSpacing) : (iconRect.Top + iconRect.Height / 2)), End = new Point(parentIconRect.Right, parentIconRect.Top + (i + 1) * lineYSpacing), Width = width });
 
@@ -145,22 +143,21 @@ protected override void OnPaint(PaintEventArgs e)
                 {
                     using (var stream = GetType().Assembly.GetManifestResourceStream(GetType(), "Images." + kvp.Key.GetType().Name + ".ico"))
                     {
-                        if (stream == null)
-                        {
-                            e.Graphics.DrawRectangle(Pens.Black, iconRect);
+                        Image image;
 
-                            using (var x = new Pen(Color.Red, 4))
-                            {
-                                e.Graphics.DrawLine(x, iconRect.Left, iconRect.Top, iconRect.Right, iconRect.Bottom);
-                                e.Graphics.DrawLine(x, iconRect.Left, iconRect.Bottom, iconRect.Right, iconRect.Top);
-                            }
+                        if (stream != null)
+                        {
+                            image = Bitmap.FromStream(stream);
                         }
                         else
                         {
-                            var image = Bitmap.FromStream(stream);
-
-                            e.Graphics.DrawImage(image, iconRect);
+                            using (var fallbackStream = GetType().Assembly.GetManifestResourceStream(GetType(), "Images.FallbackNode.ico"))
+                            {
+                                image = Bitmap.FromStream(fallbackStream);
+                            }
                         }
+
+                        e.Graphics.DrawImage(image, iconRect);
                     }
 
                     if (Exception?.Node == kvp.Key)
@@ -177,7 +174,7 @@ protected override void OnPaint(PaintEventArgs e)
                     var label = GetLabel(kvp.Key);
                     var stringFormat = new StringFormat { Alignment = StringAlignment.Center };
 
-                    if (kvp.Key == Selected)
+                    if (Focused && kvp.Key == Selected)
                     {
                         e.Graphics.FillRectangle(SystemBrushes.Highlight, labelRect);
                         e.Graphics.DrawString(label, Font, SystemBrushes.HighlightText, labelRect, stringFormat);
@@ -281,6 +278,7 @@ private Rectangle OriginToClient(Rectangle rect)
         protected override void OnMouseClick(MouseEventArgs e)
         {
             base.OnMouseClick(e);
+            Focus();
 
             var hit = false;
 
@@ -310,6 +308,22 @@ protected override void OnMouseClick(MouseEventArgs e)
             }
         }
 
+        protected override void OnGotFocus(EventArgs e)
+        {
+            base.OnGotFocus(e);
+
+            if (Selected != null)
+                Invalidate(Selected);
+        }
+
+        protected override void OnLostFocus(EventArgs e)
+        {
+            base.OnLostFocus(e);
+
+            if (Selected != null)
+                Invalidate(Selected);
+        }
+
         private void Invalidate(IExecutionPlanNode node)
         {
             // Inflate the node rectangle by 1 pixel to allow for antialiasing

diff --git a/MarkMpn.Sql4Cds.Controls/Images/ActualFetchXml.png b/MarkMpn.Sql4Cds.Controls/Images/ActualFetchXml.png
diff --git a/MarkMpn.Sql4Cds/Images/AliasNode.ico → ...Mpn.Sql4Cds.Controls/Images/AliasNode.ico b/MarkMpn.Sql4Cds/Images/AliasNode.ico → ...Mpn.Sql4Cds.Controls/Images/AliasNode.ico
diff --git a/MarkMpn.Sql4Cds/Images/AssertNode.ico → ...pn.Sql4Cds.Controls/Images/AssertNode.ico b/MarkMpn.Sql4Cds/Images/AssertNode.ico → ...pn.Sql4Cds.Controls/Images/AssertNode.ico
diff --git a/MarkMpn.Sql4Cds/Images/BulkDeleteJobNode.ico → ...Cds.Controls/Images/BulkDeleteJobNode.ico b/MarkMpn.Sql4Cds/Images/BulkDeleteJobNode.ico → ...Cds.Controls/Images/BulkDeleteJobNode.ico
diff --git a/MarkMpn.Sql4Cds/Images/ComputeScalarNode.ico → ...Cds.Controls/Images/ComputeScalarNode.ico b/MarkMpn.Sql4Cds/Images/ComputeScalarNode.ico → ...Cds.Controls/Images/ComputeScalarNode.ico
diff --git a/MarkMpn.Sql4Cds/Images/ConcatenateNode.ico → ...l4Cds.Controls/Images/ConcatenateNode.ico b/MarkMpn.Sql4Cds/Images/ConcatenateNode.ico → ...l4Cds.Controls/Images/ConcatenateNode.ico
diff --git a/MarkMpn.Sql4Cds.Controls/Images/ConditionalNode.ico b/MarkMpn.Sql4Cds.Controls/Images/ConditionalNode.ico
diff --git a/MarkMpn.Sql4Cds/Images/ConstantScanNode.ico → ...4Cds.Controls/Images/ConstantScanNode.ico b/MarkMpn.Sql4Cds/Images/ConstantScanNode.ico → ...4Cds.Controls/Images/ConstantScanNode.ico
diff --git a/MarkMpn.Sql4Cds.Controls/Images/Currency.png b/MarkMpn.Sql4Cds.Controls/Images/Currency.png
diff --git a/MarkMpn.Sql4Cds.Controls/Images/DateOnly.png b/MarkMpn.Sql4Cds.Controls/Images/DateOnly.png
diff --git a/MarkMpn.Sql4Cds.Controls/Images/DateTime.png b/MarkMpn.Sql4Cds.Controls/Images/DateTime.png
diff --git a/MarkMpn.Sql4Cds.Controls/Images/Decimal.png b/MarkMpn.Sql4Cds.Controls/Images/Decimal.png
diff --git a/MarkMpn.Sql4Cds/Images/DeleteNode.ico → ...pn.Sql4Cds.Controls/Images/DeleteNode.ico b/MarkMpn.Sql4Cds/Images/DeleteNode.ico → ...pn.Sql4Cds.Controls/Images/DeleteNode.ico
diff --git a/MarkMpn.Sql4Cds/Images/DistinctNode.ico → ....Sql4Cds.Controls/Images/DistinctNode.ico b/MarkMpn.Sql4Cds/Images/DistinctNode.ico → ....Sql4Cds.Controls/Images/DistinctNode.ico
diff --git a/MarkMpn.Sql4Cds.Controls/Images/Entity.png b/MarkMpn.Sql4Cds.Controls/Images/Entity.png
diff --git a/MarkMpn.Sql4Cds.Controls/Images/Environment.png b/MarkMpn.Sql4Cds.Controls/Images/Environment.png
diff --git a/MarkMpn.Sql4Cds.Controls/Images/Execute.png b/MarkMpn.Sql4Cds.Controls/Images/Execute.png
diff --git a/MarkMpn.Sql4Cds/Images/ExecuteAsNode.ico → ...Sql4Cds.Controls/Images/ExecuteAsNode.ico b/MarkMpn.Sql4Cds/Images/ExecuteAsNode.ico → ...Sql4Cds.Controls/Images/ExecuteAsNode.ico
diff --git a/MarkMpn.Sql4Cds/Images/TryCatchNode.ico → ....Sql4Cds.Controls/Images/FallbackNode.ico b/MarkMpn.Sql4Cds/Images/TryCatchNode.ico → ....Sql4Cds.Controls/Images/FallbackNode.ico
diff --git a/MarkMpn.Sql4Cds/Images/FetchXmlScan.ico → ....Sql4Cds.Controls/Images/FetchXmlScan.ico b/MarkMpn.Sql4Cds/Images/FetchXmlScan.ico → ....Sql4Cds.Controls/Images/FetchXmlScan.ico
diff --git a/MarkMpn.Sql4Cds/Images/FilterNode.ico → ...pn.Sql4Cds.Controls/Images/FilterNode.ico b/MarkMpn.Sql4Cds/Images/FilterNode.ico → ...pn.Sql4Cds.Controls/Images/FilterNode.ico
diff --git a/MarkMpn.Sql4Cds.Controls/Images/Float.png b/MarkMpn.Sql4Cds.Controls/Images/Float.png
diff --git a/MarkMpn.Sql4Cds.Controls/Images/Folder.png b/MarkMpn.Sql4Cds.Controls/Images/Folder.png
diff --git a/MarkMpn.Sql4Cds.Controls/Images/Format.png b/MarkMpn.Sql4Cds.Controls/Images/Format.png
diff --git a/...l4Cds/Images/GlobalOptionSetQueryNode.ico → ...trols/Images/GlobalOptionSetQueryNode.ico b/...l4Cds/Images/GlobalOptionSetQueryNode.ico → ...trols/Images/GlobalOptionSetQueryNode.ico
diff --git a/MarkMpn.Sql4Cds/Images/HashJoinNode.ico → ....Sql4Cds.Controls/Images/HashJoinNode.ico b/MarkMpn.Sql4Cds/Images/HashJoinNode.ico → ....Sql4Cds.Controls/Images/HashJoinNode.ico
diff --git a/...Sql4Cds/Images/HashMatchAggregateNode.ico → ...ontrols/Images/HashMatchAggregateNode.ico b/...Sql4Cds/Images/HashMatchAggregateNode.ico → ...ontrols/Images/HashMatchAggregateNode.ico
diff --git a/MarkMpn.Sql4Cds.Controls/Images/Image.png b/MarkMpn.Sql4Cds.Controls/Images/Image.png
diff --git a/MarkMpn.Sql4Cds/Images/IndexSpoolNode.ico → ...ql4Cds.Controls/Images/IndexSpoolNode.ico b/MarkMpn.Sql4Cds/Images/IndexSpoolNode.ico → ...ql4Cds.Controls/Images/IndexSpoolNode.ico
diff --git a/MarkMpn.Sql4Cds/Images/InsertNode.ico → ...pn.Sql4Cds.Controls/Images/InsertNode.ico b/MarkMpn.Sql4Cds/Images/InsertNode.ico → ...pn.Sql4Cds.Controls/Images/InsertNode.ico
diff --git a/MarkMpn.Sql4Cds.Controls/Images/Integer.png b/MarkMpn.Sql4Cds.Controls/Images/Integer.png
diff --git a/MarkMpn.Sql4Cds.Controls/Images/LargeIcon.png b/MarkMpn.Sql4Cds.Controls/Images/LargeIcon.png
diff --git a/MarkMpn.Sql4Cds.Controls/Images/Lookup.png b/MarkMpn.Sql4Cds.Controls/Images/Lookup.png
diff --git a/MarkMpn.Sql4Cds.Controls/Images/ManyToMany.png b/MarkMpn.Sql4Cds.Controls/Images/ManyToMany.png
diff --git a/MarkMpn.Sql4Cds.Controls/Images/ManyToOne.png b/MarkMpn.Sql4Cds.Controls/Images/ManyToOne.png
diff --git a/MarkMpn.Sql4Cds/Images/MergeJoinNode.ico → ...Sql4Cds.Controls/Images/MergeJoinNode.ico b/MarkMpn.Sql4Cds/Images/MergeJoinNode.ico → ...Sql4Cds.Controls/Images/MergeJoinNode.ico
diff --git a/MarkMpn.Sql4Cds/Images/MetadataQueryNode.ico → ...Cds.Controls/Images/MetadataQueryNode.ico b/MarkMpn.Sql4Cds/Images/MetadataQueryNode.ico → ...Cds.Controls/Images/MetadataQueryNode.ico
diff --git a/MarkMpn.Sql4Cds.Controls/Images/Multiline.png b/MarkMpn.Sql4Cds.Controls/Images/Multiline.png
diff --git a/MarkMpn.Sql4Cds/Images/NestedLoopNode.ico → ...ql4Cds.Controls/Images/NestedLoopNode.ico b/MarkMpn.Sql4Cds/Images/NestedLoopNode.ico → ...ql4Cds.Controls/Images/NestedLoopNode.ico
diff --git a/MarkMpn.Sql4Cds.Controls/Images/NewQuery.png b/MarkMpn.Sql4Cds.Controls/Images/NewQuery.png
diff --git a/MarkMpn.Sql4Cds/Images/OffsetFetchNode.ico → ...l4Cds.Controls/Images/OffsetFetchNode.ico b/MarkMpn.Sql4Cds/Images/OffsetFetchNode.ico → ...l4Cds.Controls/Images/OffsetFetchNode.ico
diff --git a/MarkMpn.Sql4Cds.Controls/Images/OneToMany.png b/MarkMpn.Sql4Cds.Controls/Images/OneToMany.png
diff --git a/MarkMpn.Sql4Cds.Controls/Images/OptionSet.png b/MarkMpn.Sql4Cds.Controls/Images/OptionSet.png
diff --git a/MarkMpn.Sql4Cds.Controls/Images/Owner.png b/MarkMpn.Sql4Cds.Controls/Images/Owner.png
diff --git a/...l4Cds/Images/PartitionedAggregateNode.ico → ...trols/Images/PartitionedAggregateNode.ico b/...l4Cds/Images/PartitionedAggregateNode.ico → ...trols/Images/PartitionedAggregateNode.ico
diff --git a/MarkMpn.Sql4Cds.Controls/Images/PreviewFetchXMl.png b/MarkMpn.Sql4Cds.Controls/Images/PreviewFetchXMl.png
diff --git a/...s/Images/RetrieveTotalRecordCountNode.ico → ...s/Images/RetrieveTotalRecordCountNode.ico b/...s/Images/RetrieveTotalRecordCountNode.ico → ...s/Images/RetrieveTotalRecordCountNode.ico
diff --git a/MarkMpn.Sql4Cds/Images/RevertNode.ico → ...pn.Sql4Cds.Controls/Images/RevertNode.ico b/MarkMpn.Sql4Cds/Images/RevertNode.ico → ...pn.Sql4Cds.Controls/Images/RevertNode.ico
diff --git a/MarkMpn.Sql4Cds.Controls/Images/SQL4CDS Icon.png b/MarkMpn.Sql4Cds.Controls/Images/SQL4CDS Icon.png
diff --git a/MarkMpn.Sql4Cds/Images/SelectNode.ico → ...pn.Sql4Cds.Controls/Images/SelectNode.ico b/MarkMpn.Sql4Cds/Images/SelectNode.ico → ...pn.Sql4Cds.Controls/Images/SelectNode.ico
diff --git a/MarkMpn.Sql4Cds.Controls/Images/SmallImage.png b/MarkMpn.Sql4Cds.Controls/Images/SmallImage.png
diff --git a/MarkMpn.Sql4Cds/Images/SortNode.ico → MarkMpn.Sql4Cds.Controls/Images/SortNode.ico b/MarkMpn.Sql4Cds/Images/SortNode.ico → MarkMpn.Sql4Cds.Controls/Images/SortNode.ico
diff --git a/MarkMpn.Sql4Cds/Images/SqlNode.ico → MarkMpn.Sql4Cds.Controls/Images/SqlNode.ico b/MarkMpn.Sql4Cds/Images/SqlNode.ico → MarkMpn.Sql4Cds.Controls/Images/SqlNode.ico
diff --git a/...pn.Sql4Cds/Images/StreamAggregateNode.ico → ...s.Controls/Images/StreamAggregateNode.ico b/...pn.Sql4Cds/Images/StreamAggregateNode.ico → ...s.Controls/Images/StreamAggregateNode.ico
diff --git a/MarkMpn.Sql4Cds/Images/TableSpoolNode.ico → ...ql4Cds.Controls/Images/TableSpoolNode.ico b/MarkMpn.Sql4Cds/Images/TableSpoolNode.ico → ...ql4Cds.Controls/Images/TableSpoolNode.ico
diff --git a/MarkMpn.Sql4Cds.Controls/Images/Text.png b/MarkMpn.Sql4Cds.Controls/Images/Text.png
diff --git a/MarkMpn.Sql4Cds/Images/TopNode.ico → MarkMpn.Sql4Cds.Controls/Images/TopNode.ico b/MarkMpn.Sql4Cds/Images/TopNode.ico → MarkMpn.Sql4Cds.Controls/Images/TopNode.ico
diff --git a/MarkMpn.Sql4Cds.Controls/Images/UniqueIdentifier.png b/MarkMpn.Sql4Cds.Controls/Images/UniqueIdentifier.png
diff --git a/MarkMpn.Sql4Cds/Images/UpdateNode.ico → ...pn.Sql4Cds.Controls/Images/UpdateNode.ico b/MarkMpn.Sql4Cds/Images/UpdateNode.ico → ...pn.Sql4Cds.Controls/Images/UpdateNode.ico
diff --git a/MarkMpn.Sql4Cds.Controls/Key.snk b/MarkMpn.Sql4Cds.Controls/Key.snk
diff --git a/MarkMpn.Sql4Cds.Controls/MarkMpn.Sql4Cds.Controls.csproj b/MarkMpn.Sql4Cds.Controls/MarkMpn.Sql4Cds.Controls.csproj
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{04C2D073-DE54-4628-B876-5965D0B75B6E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MarkMpn.Sql4Cds.Controls</RootNamespace>
+    <AssemblyName>MarkMpn.Sql4Cds.Controls</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\MarkMpn.Sql4Cds.Engine.Tests\bin\Debug\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ExecutionPlanView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MarkMpn.Sql4Cds.Engine.NetFx\MarkMpn.Sql4Cds.Engine.NetFx.csproj">
+      <Project>{23288bb2-0d6f-4329-9a5c-4c659567a652}</Project>
+      <Name>MarkMpn.Sql4Cds.Engine.NetFx</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Key.snk" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\AliasNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\AssertNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\BulkDeleteJobNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\ComputeScalarNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\ConcatenateNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\ConditionalNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\ConstantScanNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\DeleteNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\DistinctNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\ExecuteAsNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\FallbackNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\FetchXmlScan.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\FilterNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\GlobalOptionSetQueryNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\HashJoinNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\HashMatchAggregateNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\IndexSpoolNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\InsertNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\MergeJoinNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\MetadataQueryNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\NestedLoopNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\OffsetFetchNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\PartitionedAggregateNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\RetrieveTotalRecordCountNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\RevertNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\SelectNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\SortNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\SqlNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\StreamAggregateNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\TableSpoolNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\TopNode.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\UpdateNode.ico" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/MarkMpn.Sql4Cds.Controls/Properties/AssemblyInfo.cs b/MarkMpn.Sql4Cds.Controls/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("MarkMpn.Sql4Cds.Controls")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("MarkMpn.Sql4Cds.Controls")]
+[assembly: AssemblyCopyright("Copyright ©  2022")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("04c2d073-de54-4628-b876-5965d0b75b6e")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// 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("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/MarkMpn.Sql4Cds.Engine.FetchXml.Tests/MarkMpn.Sql4Cds.Engine.FetchXml.Tests.csproj b/MarkMpn.Sql4Cds.Engine.FetchXml.Tests/MarkMpn.Sql4Cds.Engine.FetchXml.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MarkMpn.Sql4Cds.Engine.FetchXml.Tests</RootNamespace>
     <AssemblyName>MarkMpn.Sql4Cds.Engine.FetchXml.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
@@ -20,6 +20,7 @@
     <TestProjectType>UnitTest</TestProjectType>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/MarkMpn.Sql4Cds.Engine.FetchXml.Tests/app.config b/MarkMpn.Sql4Cds.Engine.FetchXml.Tests/app.config
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Xrm.Tooling.Connector" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <assemblyIdentity name="Microsoft.Xrm.Tooling.Connector" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.3" newVersion="4.1.1.3" />
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.3" newVersion="4.1.1.3"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.8.0" newVersion="5.2.8.0" />
+        <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.2.8.0" newVersion="5.2.8.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
diff --git a/MarkMpn.Sql4Cds.Engine.FetchXml.Tests/packages.config b/MarkMpn.Sql4Cds.Engine.FetchXml.Tests/packages.config
@@ -12,7 +12,7 @@
   <package id="MSTest.TestFramework" version="2.1.1" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net462" />
   <package id="System.Net.Http" version="4.3.4" targetFramework="net462" />
-  <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" requireReinstallation="true" />
   <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
   <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
   <package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net462" />

diff --git a/MarkMpn.Sql4Cds.Engine.NetCore/MarkMpn.Sql4Cds.Engine.NetCore.csproj b/MarkMpn.Sql4Cds.Engine.NetCore/MarkMpn.Sql4Cds.Engine.NetCore.csproj
@@ -9,7 +9,8 @@
   <Import Project="..\MarkMpn.Sql4Cds.Engine\MarkMpn.Sql4Cds.Engine.projitems" Label="Shared" />
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.PowerPlatform.Dataverse.Client" Version="0.5.10" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.20.0" />
+    <PackageReference Include="Microsoft.PowerPlatform.Dataverse.Client" Version="0.6.1" />
     <PackageReference Include="Microsoft.SqlServer.TransactSql.ScriptDom" Version="150.4897.1" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
   </ItemGroup>