Release/3.12.0 (#27)

InteropIO · Sep 12, 2019 · 34782bb · 34782bb
1 parent 20767e6
commit 34782bb
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 22 deletions.
diff --git a/AuthenticationExample/AuthenticationExample.csproj b/AuthenticationExample/AuthenticationExample.csproj
@@ -89,8 +89,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=3.11.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.3.11.0\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=3.12.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.3.12.0\lib\net452\Finsemble.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>

diff --git a/AuthenticationExample/packages.config b/AuthenticationExample/packages.config
@@ -3,7 +3,7 @@
   <package id="DotNetZip" version="1.13.0" targetFramework="net461" />
   <package id="EngineIoClientDotNet" version="1.0.7" targetFramework="net461" />
   <package id="EventHook" version="1.4.105" targetFramework="net461" />
-  <package id="Finsemble" version="3.11.0" targetFramework="net452" />
+  <package id="Finsemble" version="3.12.0" targetFramework="net452" />
   <package id="log4net" version="2.0.8" targetFramework="net452" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net461" />

diff --git a/WPFExample/MainWindow.xaml.cs b/WPFExample/MainWindow.xaml.cs
@@ -19,7 +19,7 @@ public partial class MainWindow : Window
 		/// </summary>
 		private static readonly ILog Logger = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-		private Finsemble FSBL;
+        private Finsemble FSBL;
 
 		private void SpawnComponent_Click(object sender, RoutedEventArgs e)
 		{
@@ -32,7 +32,7 @@ private void SpawnComponent_Click(object sender, RoutedEventArgs e)
 
 		private void Send_Click(object sender, RoutedEventArgs e)
 		{
-            //set state on click 
+            //set state on click
             Application.Current.Dispatcher.Invoke(delegate //main thread
             {
                 DroppedData.Content = DataToSend.Text;
@@ -47,7 +47,6 @@ private void Send_Click(object sender, RoutedEventArgs e)
 				}
 			}, (s, a) => { });
 
-
         }
 
 		/// <summary>
@@ -126,10 +125,9 @@ private void Finsemble_Connected(object sender, EventArgs e)
 					})
 				});
 
-
 				FSBL.ConfigClient.GetValue(new JObject { ["field"] = "finsemble.components" }, (routerClient, response) =>
 				{
-					if (response.error != null)
+                    if (response.error != null)
 					{
 						Logger.Error(response.error);
 						return;
@@ -140,7 +138,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
 							{
 								ComponentSelect.Items.Add(property.Name);
@@ -149,18 +147,15 @@ private void Finsemble_Connected(object sender, EventArgs e)
 					}
 				});
 
+                FSBL.LinkerClient.LinkToChannel("group2", null, (s, a) => { });
                 //restore state if one exists
                 UpdateDisplayData();
 
-                //Programmatically link to a colour channel
-                //FSBL.LinkerClient.LinkToChannel("group2", null, (s, a) => { });
-
-
                 this.Show();
 			});
 
-			// Subscribe to Finsemble Linker Channels
-			FSBL.RPC("LinkerClient.subscribe", new List<JToken>
+            // Subscribe to Finsemble Linker Channels
+            FSBL.RPC("LinkerClient.subscribe", new List<JToken>
 			{
 				"symbol"
 			}, (error, response) =>
@@ -241,7 +236,7 @@ private void UpdateDisplayData()
                 new JObject { ["field"] = "symbol" },
                 delegate (object s, FinsembleEventArgs state)
                 {
-                    try { 
+                    try {
                         if (state.response != null)
                         {
                             var symbol = (JValue)state.response;//?["data"];

diff --git a/WPFExample/WPFExample.csproj b/WPFExample/WPFExample.csproj
@@ -89,8 +89,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=3.11.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.3.11.0\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=3.12.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.3.12.0\lib\net452\Finsemble.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>

diff --git a/WPFExample/packages.config b/WPFExample/packages.config
@@ -3,7 +3,7 @@
   <package id="DotNetZip" version="1.13.0" targetFramework="net452" />
   <package id="EngineIoClientDotNet" version="1.0.7" targetFramework="net452" />
   <package id="EventHook" version="1.4.105" targetFramework="net452" />
-  <package id="Finsemble" version="3.11.0" targetFramework="net452" />
+  <package id="Finsemble" version="3.12.0" targetFramework="net452" />
   <package id="log4net" version="2.0.8" targetFramework="net452" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />

diff --git a/WindowlessExample/WindowlessExample.csproj b/WindowlessExample/WindowlessExample.csproj
@@ -89,8 +89,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=3.11.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.3.11.0\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=3.12.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.3.12.0\lib\net452\Finsemble.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>

diff --git a/WindowlessExample/packages.config b/WindowlessExample/packages.config
@@ -3,7 +3,7 @@
   <package id="DotNetZip" version="1.13.0" targetFramework="net461" />
   <package id="EngineIoClientDotNet" version="1.0.7" targetFramework="net461" />
   <package id="EventHook" version="1.4.105" targetFramework="net461" />
-  <package id="Finsemble" version="3.11.0" targetFramework="net452" />
+  <package id="Finsemble" version="3.12.0" targetFramework="net452" />
   <package id="log4net" version="2.0.8" targetFramework="net452" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net461" />