Merge pull request #58 from ChartIQ/6.5final

6.5 public dotnet seed files - release update
InteropIO · Feb 14, 2022 · ce79423 · ce79423
2 parents 4fb1e98 + ddf3287
commit ce79423
Show file tree

Hide file tree

Showing 34 changed files with 102 additions and 76 deletions.
diff --git a/AuthenticationExample/App.xaml.cs b/AuthenticationExample/App.xaml.cs
@@ -16,6 +16,9 @@ public partial class App : Application
     {
         protected override void OnStartup(StartupEventArgs e)
         {
+#if DEBUG
+            Debugger.Launch();
+#endif
             var mainWindow = new MainWindow(e.Args);
         }
     }

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.4.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.6.4.1\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=6.5.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.6.5.0\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/MainWindow.xaml.cs b/AuthenticationExample/MainWindow.xaml.cs
@@ -35,8 +35,8 @@ public MainWindow(string[] args)
         {
             //Ensure that your window has been created (so that its window handle exists) before connecting to Finsemble.
             finsemble = new Finsemble(args, this);
-            finsemble.Connect("AuthenticationExample", JWK);
             finsemble.Connected += Finsemble_Connected;
+            finsemble.Connect();
         }
 
         private void Finsemble_Connected(object sender, EventArgs e)
@@ -53,6 +53,8 @@ private void Finsemble_Connected(object sender, EventArgs e)
         private void PublishCredentials_Click(object sender, RoutedEventArgs e)
         {
             finsemble.AuthenticationClient.PublishAuthorization(UserName.Text, JObject.FromObject(new Credentials(Guid.NewGuid().ToString())));
+            this.loggedIn = true;
+            Close();
         }
     }
 }
diff --git a/AuthenticationExample/Properties/AssemblyInfo.cs b/AuthenticationExample/Properties/AssemblyInfo.cs
@@ -12,7 +12,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Authentication")]
-[assembly: AssemblyCopyright("Copyright ©  2017 - 2020")]
+[assembly: AssemblyCopyright("Copyright ©  2017 - 2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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.4.1.0")]
-[assembly: AssemblyFileVersion("6.4.1.0")]
+[assembly: AssemblyVersion("6.5.0.0")]
+[assembly: AssemblyFileVersion("6.5.0.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.4.1" targetFramework="net452" />
+  <package id="Finsemble" version="6.5.0" 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.4.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.6.4.1\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=6.5.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.6.5.0\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/Properties/AssemblyInfo.cs b/FDC3WPFExample/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Cosaic")]
 [assembly: AssemblyProduct("FDC3WpfApp")]
-[assembly: AssemblyCopyright("Copyright ©  2017 - 2021")]
+[assembly: AssemblyCopyright("Copyright ©  2017 - 2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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.4.1.0")]
-[assembly: AssemblyFileVersion("6.4.1.0")]
+[assembly: AssemblyVersion("6.5.0.0")]
+[assembly: AssemblyFileVersion("6.5.0.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.4.1" targetFramework="net452" />
+  <package id="Finsemble" version="6.5.0" 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/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.4.1.0</AssemblyVersion>
-    <FileVersion>6.4.1.0</FileVersion>
-    <Version>6.4.1</Version>
+    <AssemblyVersion>6.5.0.0</AssemblyVersion>
+    <FileVersion>6.5.0.0</FileVersion>
+    <Version>6.5.0</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.4.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.6.4.1\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=6.5.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.6.5.0\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
@@ -12,7 +12,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("MultiWindowExample")]
-[assembly: AssemblyCopyright("Copyright ©  2018 - 2020")]
+[assembly: AssemblyCopyright("Copyright ©  2018 - 2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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.4.1.0")]
-[assembly: AssemblyFileVersion("6.4.1.0")]
+[assembly: AssemblyVersion("6.5.0.0")]
+[assembly: AssemblyFileVersion("6.5.0.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.4.1" targetFramework="net452" />
+  <package id="Finsemble" version="6.5.0" 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.cs b/WPFExample/MainWindow.xaml.cs
@@ -24,7 +24,8 @@ public partial class MainWindow : Window
 		/// The logger
 		/// </summary>
 
-		private Finsemble FSBL;
+		public Finsemble FSBL;
+		public event EventHandler WindowReady;
 
 		private JsonWebKey JWK = new JsonWebKey()
 		{
@@ -144,7 +145,7 @@ private void Send_Click(object sender, RoutedEventArgs e)
 				});
 			}
 
-			Application.Current.Dispatcher.Invoke(async delegate //main thread
+			FSBL.getDispatcher().Invoke(async delegate //main thread
 			{
 				DroppedData.Content = DataToSend.TextBox.Text;
 				DroppedDataSource.Content = "via Text entry";
@@ -176,7 +177,7 @@ public MainWindow(string[] args)
 
 		private void Finsemble_Connected(object sender, EventArgs e)
 		{
-			Application.Current.Dispatcher.Invoke(delegate //main thread
+			this.Dispatcher.Invoke(delegate //main thread
 			{
 				// Initialize this Window and show it
 				InitializeComponent(); // Initialize after Finsemble is connected
@@ -226,9 +227,9 @@ private void Finsemble_Connected(object sender, EventArgs e)
 							if(data.HasValues) {
 								data = data?["symbol"];
 							}
-							Application.Current.Dispatcher.Invoke((Action)delegate //main thread
+							FSBL.getDispatcher().Invoke((Action)delegate //main thread
 							{
-								Application.Current.Dispatcher.Invoke((Action)async delegate //main thread
+								FSBL.getDispatcher().Invoke((Action)async delegate //main thread
 								{
 									DroppedData.Content = data.ToString();
 									DataToSend.TextBox.Text = data.ToString();
@@ -246,7 +247,7 @@ private void Finsemble_Connected(object sender, EventArgs e)
 					new KeyValuePair<string, DragAndDropClient.emitter>("symbol", () =>
 					{
 						//set state on drag so correct symbol is displayed
-						Application.Current.Dispatcher.Invoke(async delegate //main thread
+						FSBL.getDispatcher().Invoke(async delegate //main thread
 						{
 							DroppedData.Content = DataToSend.TextBox.Text;
 							await SaveStateAsync();
@@ -277,7 +278,7 @@ private void Finsemble_Connected(object sender, EventArgs e)
 						object value = components?[property.Name]?["foreign"]?["components"]?["App Launcher"]?["launchableByUser"];
 						if ((value != null) && bool.Parse(value.ToString()))
 						{
-							Application.Current.Dispatcher.Invoke(delegate //main thread
+							FSBL.getDispatcher().Invoke(delegate //main thread
 							{
 								ComponentSelect.ItemsComboBox.Items.Add(property.Name);
 							});
@@ -294,7 +295,7 @@ private void Finsemble_Connected(object sender, EventArgs e)
 			if (FSBL.FDC3Client is object)
 			{
 				//FDC3 Usage example	
-				Application.Current.Dispatcher.Invoke(delegate //main thread	
+				FSBL.getDispatcher().Invoke(delegate //main thread	
 				{
 					//	FDC3Label.Visibility = Visibility.Visible;
 				});
@@ -305,7 +306,7 @@ private void Finsemble_Connected(object sender, EventArgs e)
 					FSBL.Logger.Log(new JToken[] { "WPF FDC3 Usage Example, context received by contextHandler.", context.Value });
 					if (context.Type.Equals("fdc3.instrument"))
 					{
-						Application.Current.Dispatcher.Invoke(async delegate //main thread
+						FSBL.getDispatcher().Invoke(async delegate //main thread
 						{
 							DataToSend.TextBox.Text = context.Id?["ticker"]?.ToString();
 							DroppedData.Content = context.Id?["ticker"]?.ToString();
@@ -323,7 +324,7 @@ private void Finsemble_Connected(object sender, EventArgs e)
 					FSBL.Logger.Log(new JToken[] { "WPF FDC3 Usage Example: context received by intentHandler.", context.Value });
 					if (context.Type !=null && context.Type.Equals("fdc3.instrument"))
 					{
-						Application.Current.Dispatcher.Invoke(async delegate //main thread
+						FSBL.getDispatcher().Invoke(async delegate //main thread
 						{
 							DataToSend.TextBox.Text = context.Id?["ticker"]?.ToString();
 							DroppedData.Content = context.Id?["ticker"]?.ToString();
@@ -340,7 +341,7 @@ private void Finsemble_Connected(object sender, EventArgs e)
 				//Subscribe to Finsemble Linker Channels
 				FSBL.LinkerClient?.Subscribe("symbol", (error, response) =>
 				{
-					Application.Current.Dispatcher.Invoke(async delegate //main thread
+					FSBL.getDispatcher().Invoke(async delegate //main thread
 					{
 						DataToSend.TextBox.Text = response.response?["data"]?.ToString();
 						DroppedData.Content = response.response?["data"]?.ToString();
@@ -372,6 +373,8 @@ private void Finsemble_Connected(object sender, EventArgs e)
 			//{
 			//	System.Diagnostics.Debug.Write(args.response.ToString());
 			//});
+
+			WindowReady?.Invoke(this, EventArgs.Empty);
 		}
 
 		private void Logger_OnLog(object sender, JObject e)
@@ -464,7 +467,7 @@ private void UpdateDisplayData()
 						string symbolTxt = state.response == null ? null : state.response?.ToString();
 						if (!string.IsNullOrEmpty(symbolTxt) && !symbolTxt.Equals("{}"))
 						{
-							Application.Current.Dispatcher.Invoke(async delegate //main thread
+							FSBL.getDispatcher().Invoke(async delegate //main thread
 							{
 								DataToSend.TextBox.Text = symbolTxt;
 								DroppedData.Content = symbolTxt;
@@ -477,7 +480,7 @@ private void UpdateDisplayData()
 							//Get SpawnData if no previous state
 							FSBL.WindowClient.GetSpawnData((sender, r) =>
 							{
-								Application.Current.Dispatcher.Invoke(async delegate //main thread
+								FSBL.getDispatcher().Invoke(async delegate //main thread
 								{
 									symbolTxt = r.response == null ? null : r.response?["symbol"]?.ToString();
 									if (!string.IsNullOrEmpty(symbolTxt) && !symbolTxt.Equals("{}"))
@@ -508,7 +511,7 @@ private void UpdateDisplayData()
 		private void Publish_Click(object sender, RoutedEventArgs e)
 		{
 			//set state on click
-			Application.Current.Dispatcher.Invoke(async delegate //main thread
+			FSBL.getDispatcher().Invoke(async delegate //main thread
 			{
 				DroppedData.Content = DataToSend.TextBox.Text;
 				await SaveStateAsync();
@@ -532,7 +535,7 @@ private void Subscribe_to_pubsub()
 					if (state.response != null)
 					{
 						var pubSubData = (JObject)state.response;
-						Application.Current.Dispatcher.Invoke(async delegate //main thread
+						FSBL.getDispatcher().Invoke(async delegate //main thread
 						{
 							// The initial publish will always be an empty object.
 							// Therefore, we need these null operators to handle that case.

diff --git a/WPFExample/Properties/AssemblyInfo.cs b/WPFExample/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("WpfApp2")]
-[assembly: AssemblyCopyright("Copyright ©  2017 - 2020")]
+[assembly: AssemblyCopyright("Copyright ©  2017 - 2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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.4.1.0")]
-[assembly: AssemblyFileVersion("6.4.1.0")]
+[assembly: AssemblyVersion("6.5.0.0")]
+[assembly: AssemblyFileVersion("6.5.0.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.4.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.6.4.1\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=6.5.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.6.5.0\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.4.1" targetFramework="net452" />
+  <package id="Finsemble" version="6.5.0" 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,15 +5,15 @@
     <TargetFramework>net5.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <Platforms>AnyCPU;x64</Platforms>
-    <Version>6.4.1</Version>
+    <Version>6.5.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
     <None Remove="Assets\ic_WPFLogo.png" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Finsemble.WPF.Core" Version="6.4.1" />
+    <PackageReference Include="Finsemble.WPF.Core" Version="6.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj b/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj
@@ -6,11 +6,11 @@
     <UseWPF>true</UseWPF>
     <StartupObject>WPFMultiWindowExampleCore.AppStartup</StartupObject>
     <Platforms>AnyCPU;x64</Platforms>
-    <Version>6.4.1</Version>
+    <Version>6.5.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Finsemble.WPF.Core" Version="6.4.1" />
+    <PackageReference Include="Finsemble.WPF.Core" Version="6.5.0" />
   </ItemGroup>
 
 </Project>