Merge pull request #57 from ChartIQ/6.4final

6.4 release update
InteropIO · Dec 23, 2021 · 4fb1e98 · 4fb1e98
2 parents 7be3a34 + 3f0c27a
commit 4fb1e98
Show file tree

Hide file tree

Showing 50 changed files with 1,265 additions and 111 deletions.
diff --git a/AuthenticationExample/AuthenticationExample.csproj b/AuthenticationExample/AuthenticationExample.csproj
@@ -57,8 +57,8 @@
     <Reference Include="EventHook, Version=1.4.105.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\EventHook.1.4.105\lib\net45\EventHook.dll</HintPath>
     </Reference>
-    <Reference Include="Finsemble, Version=6.2.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.6.3.0\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=6.4.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.6.4.1\lib\net452\Finsemble.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Logging, Version=6.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IdentityModel.Logging.6.12.1\lib\net45\Microsoft.IdentityModel.Logging.dll</HintPath>

diff --git a/AuthenticationExample/Properties/AssemblyInfo.cs b/AuthenticationExample/Properties/AssemblyInfo.cs
@@ -51,5 +51,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("6.3.0.0")]
-[assembly: AssemblyFileVersion("6.3.0.0")]
+[assembly: AssemblyVersion("6.4.1.0")]
+[assembly: AssemblyFileVersion("6.4.1.0")]
diff --git a/AuthenticationExample/packages.config b/AuthenticationExample/packages.config
@@ -3,7 +3,7 @@
   <package id="DotNetZip" version="1.13.7" targetFramework="net452" />
   <package id="EngineIoClientDotNet" version="1.0.7" targetFramework="net452" />
   <package id="EventHook" version="1.4.105" targetFramework="net452" />
-  <package id="Finsemble" version="6.3.0" targetFramework="net452" />
+  <package id="Finsemble" version="6.4.1" targetFramework="net452" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />

diff --git a/FDC3WPFExample/FDC3WPFExample.csproj b/FDC3WPFExample/FDC3WPFExample.csproj
@@ -57,8 +57,8 @@
     <Reference Include="EventHook, Version=1.4.105.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\EventHook.1.4.105\lib\net45\EventHook.dll</HintPath>
     </Reference>
-    <Reference Include="Finsemble, Version=6.2.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.6.3.0\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=6.4.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.6.4.1\lib\net452\Finsemble.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Logging, Version=6.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IdentityModel.Logging.6.12.1\lib\net45\Microsoft.IdentityModel.Logging.dll</HintPath>

diff --git a/FDC3WPFExample/MainWindow.xaml b/FDC3WPFExample/MainWindow.xaml
@@ -9,8 +9,8 @@
 	xmlns:Custom="http://schemas.microsoft.com/winfx/2006/xaml/presentation/ribbon" xmlns:Finsemble1="clr-namespace:ChartIQ.Finsemble.HeaderControl;assembly=Finsemble" x:Class="FDC3WPFExample.MainWindow" 
 	mc:Ignorable="d" 
 	Title="MainWindow" Height="600" 
-	Width="600" WindowStyle="None" Background="{x:Null}" 
-	AllowsTransparency="True">
+	Width="600" WindowStyle="None" 
+	Background="{x:Null}">
 
     <WindowChrome.WindowChrome>
         <WindowChrome 

diff --git a/FDC3WPFExample/MainWindow.xaml.cs b/FDC3WPFExample/MainWindow.xaml.cs
@@ -10,6 +10,7 @@
 using ChartIQ.Finsemble.FDC3.Types;
 using Newtonsoft.Json;
 using Microsoft.IdentityModel.Tokens;
+using System.Windows.Interop;
 
 namespace FDC3WPFExample
 {
@@ -39,7 +40,11 @@ public MainWindow(string[] args)
 		{
 			// Trigger actions on close when requested by Finsemble, e.g.:	
 			this.Closing += MainWindow_Closing;
-			//Ensure that your window has been created (so that its window handle exists) before connecting to Finsemble.
+			// If your window should support a transparency, AllowsTransparency and WindowStyle must be setted before EnsureHandle() call
+			this.AllowsTransparency = true;
+			this.WindowStyle = WindowStyle.None;
+			// Ensure that your window has been created (so that its window handle exists) before connecting to Finsemble.
+			new WindowInteropHelper(this).EnsureHandle();
 			FSBL = new Finsemble(args, this); // Finsemble needs the command line arguments to connect and also this Window to manage snapping, docking etc.
 			FSBL.Connected += Finsemble_Connected;
 			FSBL.Connect("FDC3WPFExample", JWK);

diff --git a/FDC3WPFExample/Properties/AssemblyInfo.cs b/FDC3WPFExample/Properties/AssemblyInfo.cs
@@ -49,5 +49,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("6.3.0.0")]
-[assembly: AssemblyFileVersion("6.3.0.0")]
+[assembly: AssemblyVersion("6.4.1.0")]
+[assembly: AssemblyFileVersion("6.4.1.0")]
diff --git a/FDC3WPFExample/packages.config b/FDC3WPFExample/packages.config
@@ -3,7 +3,7 @@
   <package id="DotNetZip" version="1.13.7" targetFramework="net452" />
   <package id="EngineIoClientDotNet" version="1.0.7" targetFramework="net452" />
   <package id="EventHook" version="1.4.105" targetFramework="net452" />
-  <package id="Finsemble" version="6.3.0" targetFramework="net452" />
+  <package id="Finsemble" version="6.4.1" targetFramework="net452" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />

diff --git a/FinsembleDemo.sln b/FinsembleDemo.sln
@@ -27,6 +27,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreestandingWPFExample", "F
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinformExampleCore", "WinformExampleCore\WinformExampleCore.csproj", "{0E0D48C5-CDDD-4A27-9FC3-982092B8096D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinformMultiWindowExampleCore", "WinformMultiWindowExampleCore\WinformMultiWindowExampleCore.csproj", "{B60B83D3-0D6F-447E-BBE2-29733EFDDC42}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -181,6 +183,18 @@ Global
 		{0E0D48C5-CDDD-4A27-9FC3-982092B8096D}.Release|x64.Build.0 = Release|x64
 		{0E0D48C5-CDDD-4A27-9FC3-982092B8096D}.Release|x86.ActiveCfg = Release|Any CPU
 		{0E0D48C5-CDDD-4A27-9FC3-982092B8096D}.Release|x86.Build.0 = Release|Any CPU
+		{B60B83D3-0D6F-447E-BBE2-29733EFDDC42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B60B83D3-0D6F-447E-BBE2-29733EFDDC42}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B60B83D3-0D6F-447E-BBE2-29733EFDDC42}.Debug|x64.ActiveCfg = Debug|x64
+		{B60B83D3-0D6F-447E-BBE2-29733EFDDC42}.Debug|x64.Build.0 = Debug|x64
+		{B60B83D3-0D6F-447E-BBE2-29733EFDDC42}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B60B83D3-0D6F-447E-BBE2-29733EFDDC42}.Debug|x86.Build.0 = Debug|Any CPU
+		{B60B83D3-0D6F-447E-BBE2-29733EFDDC42}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B60B83D3-0D6F-447E-BBE2-29733EFDDC42}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B60B83D3-0D6F-447E-BBE2-29733EFDDC42}.Release|x64.ActiveCfg = Release|x64
+		{B60B83D3-0D6F-447E-BBE2-29733EFDDC42}.Release|x64.Build.0 = Release|x64
+		{B60B83D3-0D6F-447E-BBE2-29733EFDDC42}.Release|x86.ActiveCfg = Release|Any CPU
+		{B60B83D3-0D6F-447E-BBE2-29733EFDDC42}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/FreestandingWPFExample/FreestandingWPFExample.csproj b/FreestandingWPFExample/FreestandingWPFExample.csproj
@@ -5,9 +5,9 @@
     <TargetFramework>net5.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <Platforms>AnyCPU;x64</Platforms>
-    <AssemblyVersion>6.3.0.0</AssemblyVersion>
-    <FileVersion>6.3.0.0</FileVersion>
-    <Version>6.3.0</Version>
+    <AssemblyVersion>6.4.1.0</AssemblyVersion>
+    <FileVersion>6.4.1.0</FileVersion>
+    <Version>6.4.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/MultiWindowExample/MultiWindowExample.csproj b/MultiWindowExample/MultiWindowExample.csproj
@@ -57,8 +57,8 @@
     <Reference Include="EventHook, Version=1.4.105.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\EventHook.1.4.105\lib\net45\EventHook.dll</HintPath>
     </Reference>
-    <Reference Include="Finsemble, Version=6.2.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.6.3.0\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=6.4.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.6.4.1\lib\net452\Finsemble.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Logging, Version=6.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IdentityModel.Logging.6.12.1\lib\net45\Microsoft.IdentityModel.Logging.dll</HintPath>

diff --git a/MultiWindowExample/Properties/AssemblyInfo.cs b/MultiWindowExample/Properties/AssemblyInfo.cs
@@ -51,5 +51,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("6.3.0.0")]
-[assembly: AssemblyFileVersion("6.3.0.0")]
+[assembly: AssemblyVersion("6.4.1.0")]
+[assembly: AssemblyFileVersion("6.4.1.0")]
diff --git a/MultiWindowExample/packages.config b/MultiWindowExample/packages.config
@@ -3,7 +3,7 @@
   <package id="DotNetZip" version="1.13.7" targetFramework="net452" />
   <package id="EngineIoClientDotNet" version="1.0.7" targetFramework="net452" />
   <package id="EventHook" version="1.4.105" targetFramework="net452" />
-  <package id="Finsemble" version="6.3.0" targetFramework="net452" />
+  <package id="Finsemble" version="6.4.1" targetFramework="net452" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />

diff --git a/WPFExample/MainWindow.xaml b/WPFExample/MainWindow.xaml
@@ -14,8 +14,7 @@
     Height="600" 
 	Width="600" 
     WindowStyle="None" 
-    Background="{x:Null}" 
-	AllowsTransparency="True">
+    Background="{x:Null}">
 
     <WindowChrome.WindowChrome>
         <WindowChrome 

diff --git a/WPFExample/MainWindow.xaml.cs b/WPFExample/MainWindow.xaml.cs
@@ -11,6 +11,7 @@
 using ChartIQ.Finsemble.TitlebarService.Models;
 using ChartIQ.Finsemble.FDC3.Types;
 using Microsoft.IdentityModel.Tokens;
+using System.Windows.Interop;
 
 namespace WPFExample
 {
@@ -159,10 +160,18 @@ public MainWindow(string[] args)
 		{
 			// Trigger actions on close when requested by Finsemble, e.g.:	
 			this.Closing += MainWindow_Closing;
-			//Ensure that your window has been created (so that its window handle exists) before connecting to Finsemble.
+
+			// If your window should support a transparency, AllowsTransparency and WindowStyle must be setted before EnsureHandle() call
+			this.AllowsTransparency = true;
+			this.WindowStyle = WindowStyle.None;
+
+			// Ensure that your window has been created (so that its window handle exists) before connecting to Finsemble.
+			new WindowInteropHelper(this).EnsureHandle();
+
 			FSBL = new Finsemble(args, this); // Finsemble needs the command line arguments to connect and also this Window to manage snapping, docking etc.
 			FSBL.Connected += Finsemble_Connected;
-			FSBL.Connect("WPFExample", JWK);
+			// For statitc authentication you may replace FSBL.appName by your app name from appd.json
+			FSBL.Connect(FSBL.appName, JWK);
 		}
 
 		private void Finsemble_Connected(object sender, EventArgs e)
@@ -455,11 +464,12 @@ private void UpdateDisplayData()
 						string symbolTxt = state.response == null ? null : state.response?.ToString();
 						if (!string.IsNullOrEmpty(symbolTxt) && !symbolTxt.Equals("{}"))
 						{
-							Application.Current.Dispatcher.Invoke(delegate //main thread
+							Application.Current.Dispatcher.Invoke(async delegate //main thread
 							{
 								DataToSend.TextBox.Text = symbolTxt;
 								DroppedData.Content = symbolTxt;
 								DroppedDataSource.Content = "via component state";
+								await SaveStateAsync();
 							});
 						}
 						else

diff --git a/WPFExample/Properties/AssemblyInfo.cs b/WPFExample/Properties/AssemblyInfo.cs
@@ -49,5 +49,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("6.3.0.0")]
-[assembly: AssemblyFileVersion("6.3.0.0")]
+[assembly: AssemblyVersion("6.4.1.0")]
+[assembly: AssemblyFileVersion("6.4.1.0")]
diff --git a/WPFExample/WPFExample.csproj b/WPFExample/WPFExample.csproj
@@ -57,8 +57,8 @@
     <Reference Include="EventHook, Version=1.4.105.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\EventHook.1.4.105\lib\net45\EventHook.dll</HintPath>
     </Reference>
-    <Reference Include="Finsemble, Version=6.2.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.6.3.0\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=6.4.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.6.4.1\lib\net452\Finsemble.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Logging, Version=6.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IdentityModel.Logging.6.12.1\lib\net45\Microsoft.IdentityModel.Logging.dll</HintPath>

diff --git a/WPFExample/packages.config b/WPFExample/packages.config
@@ -3,7 +3,7 @@
   <package id="DotNetZip" version="1.13.7" targetFramework="net452" />
   <package id="EngineIoClientDotNet" version="1.0.7" targetFramework="net452" />
   <package id="EventHook" version="1.4.105" targetFramework="net452" />
-  <package id="Finsemble" version="6.3.0" targetFramework="net452" />
+  <package id="Finsemble" version="6.4.1" targetFramework="net452" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />

diff --git a/WPFExampleCore/WPFExampleCore.csproj b/WPFExampleCore/WPFExampleCore.csproj
@@ -5,18 +5,15 @@
     <TargetFramework>net5.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <Platforms>AnyCPU;x64</Platforms>
-    <Version>6.3.0</Version>
+    <Version>6.4.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
     <None Remove="Assets\ic_WPFLogo.png" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Finsemble.Core" Version="6.3.0" />
-    <PackageReference Include="Finsemble.WPF.Core" Version="6.3.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.14.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Finsemble.WPF.Core" Version="6.4.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj b/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj
@@ -6,14 +6,11 @@
     <UseWPF>true</UseWPF>
     <StartupObject>WPFMultiWindowExampleCore.AppStartup</StartupObject>
     <Platforms>AnyCPU;x64</Platforms>
-    <Version>6.3.0</Version>
+    <Version>6.4.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Finsemble.Core" Version="6.3.0" />
-    <PackageReference Include="Finsemble.WPF.Core" Version="6.3.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.14.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Finsemble.WPF.Core" Version="6.4.1" />
   </ItemGroup>
 
 </Project>
diff --git a/WindowlessExample.Core/WindowlessExample.Core.csproj b/WindowlessExample.Core/WindowlessExample.Core.csproj
@@ -4,13 +4,11 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
     <Platforms>AnyCPU;x64</Platforms>
-    <Version>6.3.0</Version>
+    <Version>6.4.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Finsemble.Core" Version="6.3.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.14.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Finsemble.Core" Version="6.4.1" />
   </ItemGroup>
 
 </Project>
diff --git a/WindowlessExample/Properties/AssemblyInfo.cs b/WindowlessExample/Properties/AssemblyInfo.cs
@@ -51,5 +51,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("6.3.0.0")]
-[assembly: AssemblyFileVersion("6.3.0.0")]
+[assembly: AssemblyVersion("6.4.1.0")]
+[assembly: AssemblyFileVersion("6.4.1.0")]
diff --git a/WindowlessExample/WindowlessExample.csproj b/WindowlessExample/WindowlessExample.csproj
@@ -57,8 +57,8 @@
     <Reference Include="EventHook, Version=1.4.105.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\EventHook.1.4.105\lib\net45\EventHook.dll</HintPath>
     </Reference>
-    <Reference Include="Finsemble, Version=6.2.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.6.3.0\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=6.4.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.6.4.1\lib\net452\Finsemble.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.IdentityModel.Logging, Version=6.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

diff --git a/WindowlessExample/packages.config b/WindowlessExample/packages.config
@@ -3,7 +3,7 @@
   <package id="DotNetZip" version="1.13.7" targetFramework="net452" />
   <package id="EngineIoClientDotNet" version="1.0.7" targetFramework="net452" />
   <package id="EventHook" version="1.4.105" targetFramework="net452" />
-  <package id="Finsemble" version="6.3.0" targetFramework="net452" />
+  <package id="Finsemble" version="6.4.1" targetFramework="net452" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />

diff --git a/WinformExample/Properties/AssemblyInfo.cs b/WinformExample/Properties/AssemblyInfo.cs
@@ -32,5 +32,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("6.3.0.0")]
-[assembly: AssemblyFileVersion("6.3.0.0")]
+[assembly: AssemblyVersion("6.4.1.0")]
+[assembly: AssemblyFileVersion("6.4.1.0")]
diff --git a/WinformExample/WinformExample.csproj b/WinformExample/WinformExample.csproj
@@ -56,8 +56,8 @@
     <Reference Include="EventHook, Version=1.4.105.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\EventHook.1.4.105\lib\net45\EventHook.dll</HintPath>
     </Reference>
-    <Reference Include="Finsemble, Version=6.2.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.6.3.0\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=6.4.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.6.4.1\lib\net452\Finsemble.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Logging, Version=6.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IdentityModel.Logging.6.12.1\lib\net45\Microsoft.IdentityModel.Logging.dll</HintPath>

diff --git a/WinformExample/packages.config b/WinformExample/packages.config
@@ -3,7 +3,7 @@
   <package id="DotNetZip" version="1.13.7" targetFramework="net452" />
   <package id="EngineIoClientDotNet" version="1.0.7" targetFramework="net452" />
   <package id="EventHook" version="1.4.105" targetFramework="net452" />
-  <package id="Finsemble" version="6.3.0" targetFramework="net452" />
+  <package id="Finsemble" version="6.4.1" targetFramework="net452" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net461" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net461" />

diff --git a/WinformExampleCore/MainForm.cs b/WinformExampleCore/MainForm.cs
@@ -78,8 +78,9 @@ private async void Finsemble_Connected(object sender, EventArgs e)
 			SetUpLinkerChannels(systemChannels);
 
 			// Listen to Fdc3Client state change to render connected channels
-			_bridge.Clients.Fdc3Client.StateChanged += Fdc3Client_StateChanged; ;
-
+			_bridge.Clients.Fdc3Client.StateChanged += Fdc3Client_StateChanged;
+			// Show joined channels
+			Fdc3Client_StateChanged(null, _bridge.Clients.Fdc3Client.LastStateChangedArgs);
 
 			// Example for Fdc3Client subscribe to specific context. The "*" for subscription to all contexts.
 			_contextListenter = _bridge.Clients.Fdc3Client.DesktopAgentClient.AddContextListener("fdc3.instrument", HandleContext);
@@ -286,6 +287,7 @@ private void HandleDragAndDropReceive(object sender, FinsembleEventArgs args)
 
 		private void Fdc3Client_StateChanged(object sender, FinsembleEventArgs response)
 		{
+			if (response == null) return;
 			this.Invoke(new Action(async () =>
 			{
 				if (response.error != null)