diff --git a/AuthenticationExample/AuthenticationExample.csproj b/AuthenticationExample/AuthenticationExample.csproj index c1a61e3..b88a33b 100644 --- a/AuthenticationExample/AuthenticationExample.csproj +++ b/AuthenticationExample/AuthenticationExample.csproj @@ -49,8 +49,8 @@ ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll - - ..\packages\Finsemble.8.3.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.8.4.1\lib\net452\Finsemble.dll ..\packages\Microsoft.IdentityModel.Logging.6.16.0\lib\net45\Microsoft.IdentityModel.Logging.dll diff --git a/AuthenticationExample/packages.config b/AuthenticationExample/packages.config index fc3f210..50d0cb8 100644 --- a/AuthenticationExample/packages.config +++ b/AuthenticationExample/packages.config @@ -1,12 +1,12 @@  - + - + diff --git a/FDC3WPFExample/FDC3WPFExample.csproj b/FDC3WPFExample/FDC3WPFExample.csproj index 5c87c78..d6c5f90 100644 --- a/FDC3WPFExample/FDC3WPFExample.csproj +++ b/FDC3WPFExample/FDC3WPFExample.csproj @@ -49,8 +49,8 @@ ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll - - ..\packages\Finsemble.8.3.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.8.4.1\lib\net452\Finsemble.dll ..\packages\Microsoft.IdentityModel.Logging.6.16.0\lib\net45\Microsoft.IdentityModel.Logging.dll diff --git a/FDC3WPFExample/packages.config b/FDC3WPFExample/packages.config index 85dcbfc..700b61f 100644 --- a/FDC3WPFExample/packages.config +++ b/FDC3WPFExample/packages.config @@ -1,12 +1,12 @@  - + - + diff --git a/MultiWindowExample/MultiWindowExample.csproj b/MultiWindowExample/MultiWindowExample.csproj index fdd1c98..283dff5 100644 --- a/MultiWindowExample/MultiWindowExample.csproj +++ b/MultiWindowExample/MultiWindowExample.csproj @@ -49,8 +49,8 @@ ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll - - ..\packages\Finsemble.8.3.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.8.4.1\lib\net452\Finsemble.dll ..\packages\Microsoft.IdentityModel.Logging.6.16.0\lib\net45\Microsoft.IdentityModel.Logging.dll diff --git a/MultiWindowExample/packages.config b/MultiWindowExample/packages.config index fc3f210..50d0cb8 100644 --- a/MultiWindowExample/packages.config +++ b/MultiWindowExample/packages.config @@ -1,12 +1,12 @@  - + - + diff --git a/WPFExample/MainWindow.xaml.cs b/WPFExample/MainWindow.xaml.cs index 309d763..c7db95c 100644 --- a/WPFExample/MainWindow.xaml.cs +++ b/WPFExample/MainWindow.xaml.cs @@ -60,8 +60,7 @@ private async void SpawnComponent_Click(object sender, RoutedEventArgs e) } }); - var targetApp = new TargetApp(componentName); - await FSBL.FDC3Client.DesktopAgentClient.Open(targetApp, context); + var appId = await FSBL.FDC3Client.DesktopAgentClient.Open(componentName, context); //Intent //var context = new Context(new JObject diff --git a/WPFExample/WPFExample.csproj b/WPFExample/WPFExample.csproj index 2dbdcba..d539238 100644 --- a/WPFExample/WPFExample.csproj +++ b/WPFExample/WPFExample.csproj @@ -49,8 +49,8 @@ ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll - - ..\packages\Finsemble.8.3.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.8.4.1\lib\net452\Finsemble.dll ..\packages\Microsoft.IdentityModel.Logging.6.16.0\lib\net45\Microsoft.IdentityModel.Logging.dll diff --git a/WPFExample/packages.config b/WPFExample/packages.config index 85dcbfc..700b61f 100644 --- a/WPFExample/packages.config +++ b/WPFExample/packages.config @@ -1,12 +1,12 @@  - + - + diff --git a/WPFExampleCore/MainWindow.xaml.cs b/WPFExampleCore/MainWindow.xaml.cs index ea54f4c..a7d61e5 100644 --- a/WPFExampleCore/MainWindow.xaml.cs +++ b/WPFExampleCore/MainWindow.xaml.cs @@ -59,8 +59,8 @@ private void MainWindow_Closing(object sender, System.ComponentModel.CancelEvent private void FSBL_Disconnected(object sender, EventArgs e) { - MessageBoxResult result = MessageBox.Show("Finsemble was disconnected. This application will be close"); - Close(); + //MessageBox.Show("Finsemble was disconnected. This application will be close"); + //Close(); } private void Current_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e) @@ -405,8 +405,7 @@ private async void SpawnComponent_Click(object sender, RoutedEventArgs e) } }); - var targetApp = new TargetApp() { Name = componentName }; - await FSBL.Clients.Fdc3Client.DesktopAgentClient.Open(targetApp, context); + var appId = await FSBL.Clients.Fdc3Client.DesktopAgentClient.Open(componentName, context); } else { diff --git a/WPFExampleCore/WPFExampleCore.csproj b/WPFExampleCore/WPFExampleCore.csproj index 05bd852..599070d 100644 --- a/WPFExampleCore/WPFExampleCore.csproj +++ b/WPFExampleCore/WPFExampleCore.csproj @@ -29,7 +29,7 @@ - + diff --git a/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj b/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj index 73ef1d0..1f9a408 100644 --- a/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj +++ b/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj @@ -26,7 +26,7 @@ - + diff --git a/WindowlessExample.Core/WindowlessExample.Core.csproj b/WindowlessExample.Core/WindowlessExample.Core.csproj index 621eaaa..88fa302 100644 --- a/WindowlessExample.Core/WindowlessExample.Core.csproj +++ b/WindowlessExample.Core/WindowlessExample.Core.csproj @@ -24,7 +24,7 @@ - + diff --git a/WindowlessExample/Program.cs b/WindowlessExample/Program.cs index dafc1bb..164e82d 100644 --- a/WindowlessExample/Program.cs +++ b/WindowlessExample/Program.cs @@ -51,6 +51,8 @@ static void Main(string[] args) // Block main thread until worker is finished. autoEvent.WaitOne(); + + Trace.TraceInformation("WindowlessExample example is finished"); } private static void OnConnected(object sender, EventArgs e) @@ -110,6 +112,7 @@ private static void OnConnected(object sender, EventArgs e) private static void OnShutdown(object sender, EventArgs e) { + Trace.TraceInformation("On Finsemble Disconnected event"); if (FSBL != null) { lock (lockObj) diff --git a/WindowlessExample/WindowlessExample.csproj b/WindowlessExample/WindowlessExample.csproj index 4242d97..987aff2 100644 --- a/WindowlessExample/WindowlessExample.csproj +++ b/WindowlessExample/WindowlessExample.csproj @@ -46,8 +46,8 @@ bin\x64\Release\ - - ..\packages\Finsemble.8.3.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.8.4.1\lib\net452\Finsemble.dll diff --git a/WindowlessExample/packages.config b/WindowlessExample/packages.config index 5f01bf0..adfe84e 100644 --- a/WindowlessExample/packages.config +++ b/WindowlessExample/packages.config @@ -1,11 +1,11 @@  - + - + diff --git a/WinformExample/FormExample.cs b/WinformExample/FormExample.cs index 601e573..bf4b9a8 100644 --- a/WinformExample/FormExample.cs +++ b/WinformExample/FormExample.cs @@ -78,8 +78,9 @@ private async void FinsembleConnected(object sender, EventArgs e) FSBL.Logger.Log(new JToken[] { "Winform example connected to Finsemble." }); System.Diagnostics.Debug.WriteLine("FSBL Ready."); - // Handle Window grouping - FSBL.RouterClient.Subscribe("Finsemble.WorkspaceService.groupUpdate", HandleWindowGrouping); + // Update UI buttons + FSBL.WindowClient.WindowStateChanged += WindowClient_WindowStateChanged; + WindowClient_WindowStateChanged(null, FSBL.WindowClient.currentWindowState); if (FSBL.LinkerClient != null) { @@ -138,15 +139,6 @@ private async void FinsembleConnected(object sender, EventArgs e) // Example for getting Spawnable component list FSBL.ConfigClient.GetValue(new JObject { ["field"] = "finsemble.components" }, HandleComponentsList); - - SetInitialWindowGrouping(FSBL.WindowClient.GetWindowGroups()); - SetInitialAlwaysOnTop(); - } - - private async void SetInitialAlwaysOnTop() - { - var isAlwaysOnTop = (await FSBL.FinsembleWindow.IsAlwaysOnTop(new JObject()))?["data"]?.ToObject() == true; - UpdateAlwaysOnTopButton(isAlwaysOnTop); } private void HandleContext(Context context, IContextMetadata metadata) @@ -284,114 +276,42 @@ private int CalculateDragNDropLeftMarginShift(int visiblePillsBeforeShift, int v return (visiblePillsAfterShift - visiblePillsBeforeShift) * (LinkerPillWidth + 2); } - private void HandleWindowGrouping(object s, FinsembleEventArgs res) + private void WindowClient_WindowStateChanged(object sender, JObject state) { - this.Invoke(new Action(() => - { - if (res.error != null) - { - return; - } - - var groupData = res.response["data"]["groupData"] as JObject; - var thisWindowGroups = new JObject - { - ["dockingGroup"] = "", - ["snappingGroup"] = "", - ["topRight"] = false - }; - - foreach (var obj in groupData) - { - var windowgroupid = obj.Key; - var windowgroup = groupData[windowgroupid] as JObject; - var windownames = windowgroup["windowNames"] as JArray; - - thisWindowGroups = FormWindowGroupsTo(windowgroup, windownames, thisWindowGroups); - } - - UpdateViewDueToWindowGroups(thisWindowGroups); - })); - } + var isGrouped = state?["isGrouped"]?.ToObject() ?? false; + var groupable = state?["groupable"]?.ToObject() ?? false; + var showAlwaysOnTopButton = state?["showAlwaysOnTopButton"]?.Value() ?? true; + var isAlwaysOnTop = state?["alwaysOnTop"]?.Value() ?? false; - private void SetInitialWindowGrouping(JArray groupdWindowBelongsTo) - { this.Invoke(new Action(() => { - var thisWindowGroups = new JObject + // update grouping button + if (groupable) { - ["dockingGroup"] = "", - ["snappingGroup"] = "", - ["topRight"] = false - }; + DockingButton.Visible = true; - foreach (var group in groupdWindowBelongsTo) - { - var windowNames = group["windowNames"] as JArray; - thisWindowGroups = FormWindowGroupsTo(group, windowNames, thisWindowGroups); + DockingButton.Text = isGrouped ? "@" : ">"; + DockingButton.ButtonColor = isGrouped ? Color.FromArgb(3, 155, 255) : Color.FromArgb(34, 38, 47); + DockingButton.OnHoverButtonColor = isGrouped ? Color.FromArgb(3, 155, 255) : Color.FromArgb(40, 45, 56); } - - UpdateViewDueToWindowGroups(thisWindowGroups); - })); - } - - private JObject FormWindowGroupsTo(JToken group, JArray windowNames, JObject thisWindowGroups) - { - var currentWindowName = FSBL.WindowClient.GetWindowIdentifier()["windowName"].ToString(); - - var windowingGroup = false; - for (int i = 0; i < windowNames.Count; i++) - { - var windowName = windowNames[i].ToString(); - if (windowName == currentWindowName) + else { - windowingGroup = true; + DockingButton.Visible = false; } - } - if (windowingGroup) - { - var isMovable = (bool)group["isMovable"]; - if (isMovable) + // update alwaysOnTopButton + if (showAlwaysOnTopButton) { - thisWindowGroups["dockingGroup"] = group; - if (group["topRightWindow"].ToString() == currentWindowName) - { - thisWindowGroups["topRight"] = true; - } + AlwaysOnTopButton.Visible = true; + + AlwaysOnTopButton.ButtonColor = isAlwaysOnTop ? Color.FromArgb(3, 155, 255) : Color.FromArgb(34, 38, 47); + AlwaysOnTopButton.OnHoverButtonColor = isAlwaysOnTop ? Color.FromArgb(3, 155, 255) : Color.FromArgb(40, 45, 56); } else { - thisWindowGroups["snappingGroup"] = group; + AlwaysOnTopButton.Visible = false; } - } - - return thisWindowGroups; - } - - private void UpdateViewDueToWindowGroups(JObject thisWindowGroups) - { - if (!string.IsNullOrEmpty(thisWindowGroups?["dockingGroup"]?.ToString())) - { - // docked - DockingButton.Text = "@"; - DockingButton.ButtonColor = Color.FromArgb(3, 155, 255); - DockingButton.OnHoverButtonColor = Color.FromArgb(3, 155, 255); - DockingButton.Visible = true; - } - else if (!string.IsNullOrEmpty(thisWindowGroups?["snappingGroup"]?.ToString())) - { - // Snapped - DockingButton.Text = ">"; - DockingButton.ButtonColor = Color.FromArgb(34, 38, 47); - DockingButton.OnHoverButtonColor = Color.FromArgb(40, 45, 56); - DockingButton.Visible = true; - } - else - { - // unsnapped/undocked - DockingButton.Visible = false; - } + })); } private void HandleGetComponentState(object s, FinsembleEventArgs state) @@ -601,7 +521,6 @@ private async void LaunchButton_Click(object sender, EventArgs e) if (FSBL.FDC3Client != null) { - var targetApp = new TargetApp() { Name = componentName }; var context = new Context(new JObject { ["type"] = "fdc3.instrument", @@ -612,8 +531,7 @@ private async void LaunchButton_Click(object sender, EventArgs e) } }); - var openError = await FSBL.FDC3Client.DesktopAgentClient.Open(targetApp, context); - if (openError.HasValue) MessageBox.Show(openError.ToString()); + var appId = await FSBL.FDC3Client.DesktopAgentClient.Open(componentName, context); } else { @@ -633,28 +551,12 @@ private void LinkerButton_Click(object sender, EventArgs e) } } - private void UpdateAlwaysOnTopButton(bool isAlwaysOnTop) - { - if (isAlwaysOnTop) - { - AlwaysOnTopButton.ButtonColor = Color.FromArgb(3, 155, 255); - AlwaysOnTopButton.OnHoverButtonColor = Color.FromArgb(3, 155, 255); - } - else - { - AlwaysOnTopButton.ButtonColor = Color.FromArgb(34, 38, 47); - AlwaysOnTopButton.OnHoverButtonColor = Color.FromArgb(40, 45, 56); - } - } - private async void AlwaysOnTopButton_Click(object sender, EventArgs e) { var isAlwaysOnTop = await FSBL.WindowClient.IsAlwaysOnTop(); var newAlwaysOnTop = !isAlwaysOnTop; await FSBL.WindowClient.SetAlwaysOnTop(newAlwaysOnTop); - - UpdateAlwaysOnTopButton(newAlwaysOnTop); } private void DockingButton_Click(object sender, EventArgs e) diff --git a/WinformExample/WinformExample.csproj b/WinformExample/WinformExample.csproj index 7dd0a60..2d9b667 100644 --- a/WinformExample/WinformExample.csproj +++ b/WinformExample/WinformExample.csproj @@ -50,8 +50,8 @@ ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll - - ..\packages\Finsemble.8.3.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.8.4.1\lib\net452\Finsemble.dll ..\packages\Microsoft.IdentityModel.Logging.6.16.0\lib\net45\Microsoft.IdentityModel.Logging.dll diff --git a/WinformExample/packages.config b/WinformExample/packages.config index 61f62b7..f6be89e 100644 --- a/WinformExample/packages.config +++ b/WinformExample/packages.config @@ -1,7 +1,7 @@  - + @@ -9,7 +9,7 @@ - + diff --git a/WinformExampleCore/MainForm.cs b/WinformExampleCore/MainForm.cs index ebce9c1..7608c2a 100644 --- a/WinformExampleCore/MainForm.cs +++ b/WinformExampleCore/MainForm.cs @@ -71,8 +71,9 @@ private async void Finsemble_Connected(object sender, EventArgs e) _bridge.Clients.Logger.Log(new JToken[] { "Winform Example Core connected to Finsemble." }); - // Handle Window grouping - _bridge.Clients.RouterClient.Subscribe("Finsemble.WorkspaceService.groupUpdate", HandleWindowGrouping); + // Update UI buttons + _bridge.Clients.WindowClient.WindowStateChanged += WindowClient_WindowStateChanged; + WindowClient_WindowStateChanged(null, _bridge.Clients.WindowClient.CurrentWindowState); #region FDC3 if (_bridge.Clients.Fdc3Client != null) @@ -120,96 +121,46 @@ private async void Finsemble_Connected(object sender, EventArgs e) // Example for getting Spawnable component list HandleComponentsList(); - SetInitialWindowGrouping(_bridge.Clients.WindowClient.GetWindowGroups()); LoadAndSetButtonsFont(); - SetInitialAlwaysOnTop(); this.Visible = true; } - private async void SetInitialAlwaysOnTop() + private void WindowClient_WindowStateChanged(object sender, JObject state) { - var isAlwaysOnTop = (await _bridge.Clients.FinsembleWindow.IsAlwaysOnTop(new JObject())).response?["data"]?.ToObject() == true; - UpdateAlwaysOnTopButton(isAlwaysOnTop); - } + var isGrouped = state?["isGrouped"]?.ToObject() ?? false; + var groupable = state?["groupable"]?.ToObject() ?? false; + var showAlwaysOnTopButton = state?["showAlwaysOnTopButton"]?.Value() ?? true; + var isAlwaysOnTop = state?["alwaysOnTop"]?.Value() ?? false; - private void SetInitialWindowGrouping(JArray groupdWindowBelongsTo) - { this.Invoke(new Action(() => { - var thisWindowGroups = new JObject + // update grouping button + if (groupable) { - ["dockingGroup"] = "", - ["snappingGroup"] = "", - ["topRight"] = false - }; + DockingButton.Visible = true; - foreach (var group in groupdWindowBelongsTo) - { - var windowNames = group["windowNames"] as JArray; - thisWindowGroups = FormWindowGroupsTo(group, windowNames, thisWindowGroups); + DockingButton.Text = isGrouped ? "@" : ">"; + DockingButton.ButtonColor = isGrouped ? Color.FromArgb(3, 155, 255) : Color.FromArgb(34, 38, 47); + DockingButton.OnHoverButtonColor = isGrouped ? Color.FromArgb(3, 155, 255) : Color.FromArgb(40, 45, 56); } - - UpdateViewDueToWindowGroups(thisWindowGroups); - })); - } - - private void UpdateViewDueToWindowGroups(JObject thisWindowGroups) - { - if (!string.IsNullOrEmpty(thisWindowGroups?["dockingGroup"]?.ToString())) - { - // docked - DockingButton.Text = "@"; - DockingButton.ButtonColor = Color.FromArgb(3, 155, 255); - DockingButton.OnHoverButtonColor = Color.FromArgb(3, 155, 255); - DockingButton.Visible = true; - } - else if (!string.IsNullOrEmpty(thisWindowGroups?["snappingGroup"]?.ToString())) - { - // Snapped - DockingButton.Text = ">"; - DockingButton.ButtonColor = Color.FromArgb(34, 38, 47); - DockingButton.OnHoverButtonColor = Color.FromArgb(40, 45, 56); - DockingButton.Visible = true; - } - else - { - // unsnapped/undocked - DockingButton.Visible = false; - } - } - - private JObject FormWindowGroupsTo(JToken group, JArray windowNames, JObject thisWindowGroups) - { - var currentWindowName = _bridge.Clients.WindowClient.GetWindowIdentifier()["windowName"].ToString(); - - var windowingGroup = false; - for (int i = 0; i < windowNames.Count; i++) - { - var windowName = windowNames[i].ToString(); - if (windowName == currentWindowName) + else { - windowingGroup = true; + DockingButton.Visible = false; } - } - if (windowingGroup) - { - var isMovable = (bool)group["isMovable"]; - if (isMovable) + // update alwaysOnTopButton + if (showAlwaysOnTopButton) { - thisWindowGroups["dockingGroup"] = group; - if (group["topRightWindow"].ToString() == currentWindowName) - { - thisWindowGroups["topRight"] = true; - } + AlwaysOnTopButton.Visible = true; + + AlwaysOnTopButton.ButtonColor = isAlwaysOnTop ? Color.FromArgb(3, 155, 255) : Color.FromArgb(34, 38, 47); + AlwaysOnTopButton.OnHoverButtonColor = isAlwaysOnTop ? Color.FromArgb(3, 155, 255) : Color.FromArgb(40, 45, 56); } else { - thisWindowGroups["snappingGroup"] = group; + AlwaysOnTopButton.Visible = false; } - } - - return thisWindowGroups; + })); } private async void HandleComponentsList() @@ -458,37 +409,6 @@ private void HandlePubSub(object sender, FinsembleEventArgs args) })); } - private void HandleWindowGrouping(object sender, FinsembleEventArgs args) - { - this.Invoke(new Action(() => - { - if (args.error != null) - { - _bridge.Clients.Logger.Error(new JToken[] { "WinformExampleCore HandleWindowGrouping Error", args.error.ToString() }); - return; - } - - var groupData = args.response["data"]["groupData"] as JObject; - var thisWindowGroups = new JObject - { - ["dockingGroup"] = "", - ["snappingGroup"] = "", - ["topRight"] = false - }; - - foreach (var obj in groupData) - { - var windowgroupid = obj.Key; - var windowgroup = groupData[windowgroupid] as JObject; - var windownames = windowgroup["windowNames"] as JArray; - - thisWindowGroups = FormWindowGroupsTo(windowgroup, windownames, thisWindowGroups); - } - - UpdateViewDueToWindowGroups(thisWindowGroups); - })); - } - private void Logger_OnLog(object sender, JObject e) { MessagesRichBox.Invoke(new Action(() => @@ -565,26 +485,10 @@ private void SendButton_Click(object sender, EventArgs e) })); } - private void UpdateAlwaysOnTopButton(bool isAlwaysOnTop) - { - if (isAlwaysOnTop) - { - AlwaysOnTopButton.ButtonColor = Color.FromArgb(3, 155, 255); - AlwaysOnTopButton.OnHoverButtonColor = Color.FromArgb(3, 155, 255); - } - else - { - AlwaysOnTopButton.ButtonColor = Color.FromArgb(34, 38, 47); - AlwaysOnTopButton.OnHoverButtonColor = Color.FromArgb(40, 45, 56); - } - } - private async void AlwaysOnTopButton_Click(object sender, EventArgs e) { var newAlwaysOnTop = !await _bridge.Clients.WindowClient.IsAlwaysOnTop(); await _bridge.Clients.WindowClient.SetAlwaysOnTop(newAlwaysOnTop); - - UpdateAlwaysOnTopButton(newAlwaysOnTop); } @@ -608,7 +512,6 @@ private async void LaunchButton_Click(object sender, EventArgs e) var componentName = selected.ToString(); - var targetApp = new TargetApp() { Name = componentName }; var context = new Context(new JObject { ["type"] = "fdc3.instrument", @@ -619,8 +522,7 @@ private async void LaunchButton_Click(object sender, EventArgs e) } }); - var openError = await _bridge.Clients.Fdc3Client.DesktopAgentClient.Open(targetApp, context); - if (openError.HasValue) MessageBox.Show(openError.ToString()); + var appId = await _bridge.Clients.Fdc3Client.DesktopAgentClient.Open(componentName, context); } private void DragNDropEmittingButton_MouseDown(object sender, MouseEventArgs e) diff --git a/WinformExampleCore/WinformExampleCore.csproj b/WinformExampleCore/WinformExampleCore.csproj index 4240e05..2caf19b 100644 --- a/WinformExampleCore/WinformExampleCore.csproj +++ b/WinformExampleCore/WinformExampleCore.csproj @@ -39,8 +39,8 @@ - - + + diff --git a/WinformMultiWindowExample/WinformMultiWindowExample.csproj b/WinformMultiWindowExample/WinformMultiWindowExample.csproj index 5df60c9..dcd7aa1 100644 --- a/WinformMultiWindowExample/WinformMultiWindowExample.csproj +++ b/WinformMultiWindowExample/WinformMultiWindowExample.csproj @@ -50,8 +50,8 @@ ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll - - ..\packages\Finsemble.8.3.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.8.4.1\lib\net452\Finsemble.dll ..\packages\Microsoft.IdentityModel.Logging.6.16.0\lib\net45\Microsoft.IdentityModel.Logging.dll diff --git a/WinformMultiWindowExample/packages.config b/WinformMultiWindowExample/packages.config index 979c1e7..9c290e1 100644 --- a/WinformMultiWindowExample/packages.config +++ b/WinformMultiWindowExample/packages.config @@ -1,7 +1,7 @@  - + @@ -9,7 +9,7 @@ - + diff --git a/WinformMultiWindowExampleCore/WinformMultiWindowExampleCore.csproj b/WinformMultiWindowExampleCore/WinformMultiWindowExampleCore.csproj index 2acc862..8b32bbf 100644 --- a/WinformMultiWindowExampleCore/WinformMultiWindowExampleCore.csproj +++ b/WinformMultiWindowExampleCore/WinformMultiWindowExampleCore.csproj @@ -25,7 +25,7 @@ - +