diff --git a/AuthenticationExample/App.xaml.cs b/AuthenticationExample/App.xaml.cs index 1e51a4c..0d19081 100644 --- 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 index 9afb063..9f0cd3d 100644 --- a/AuthenticationExample/AuthenticationExample.csproj +++ b/AuthenticationExample/AuthenticationExample.csproj @@ -57,8 +57,8 @@ ..\packages\EventHook.1.4.105\lib\net45\EventHook.dll - - ..\packages\Finsemble.6.4.1\lib\net452\Finsemble.dll + + ..\packages\Finsemble.6.5.0\lib\net452\Finsemble.dll ..\packages\Microsoft.IdentityModel.Logging.6.12.1\lib\net45\Microsoft.IdentityModel.Logging.dll diff --git a/AuthenticationExample/MainWindow.xaml.cs b/AuthenticationExample/MainWindow.xaml.cs index e89f1a8..68d15e3 100644 --- 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 index 1403438..f4860bc 100644 --- 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 index 8f52fbc..8d4209f 100644 --- a/AuthenticationExample/packages.config +++ b/AuthenticationExample/packages.config @@ -3,7 +3,7 @@ - + diff --git a/FDC3WPFExample/FDC3WPFExample.csproj b/FDC3WPFExample/FDC3WPFExample.csproj index b0f79e3..180f200 100644 --- a/FDC3WPFExample/FDC3WPFExample.csproj +++ b/FDC3WPFExample/FDC3WPFExample.csproj @@ -57,8 +57,8 @@ ..\packages\EventHook.1.4.105\lib\net45\EventHook.dll - - ..\packages\Finsemble.6.4.1\lib\net452\Finsemble.dll + + ..\packages\Finsemble.6.5.0\lib\net452\Finsemble.dll ..\packages\Microsoft.IdentityModel.Logging.6.12.1\lib\net45\Microsoft.IdentityModel.Logging.dll diff --git a/FDC3WPFExample/Properties/AssemblyInfo.cs b/FDC3WPFExample/Properties/AssemblyInfo.cs index 6136e98..f57f53a 100644 --- 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 index 8f52fbc..8d4209f 100644 --- a/FDC3WPFExample/packages.config +++ b/FDC3WPFExample/packages.config @@ -3,7 +3,7 @@ - + diff --git a/FreestandingWPFExample/FreestandingWPFExample.csproj b/FreestandingWPFExample/FreestandingWPFExample.csproj index cabf3c8..8a032f7 100644 --- a/FreestandingWPFExample/FreestandingWPFExample.csproj +++ b/FreestandingWPFExample/FreestandingWPFExample.csproj @@ -5,9 +5,9 @@ net5.0-windows true AnyCPU;x64 - 6.4.1.0 - 6.4.1.0 - 6.4.1 + 6.5.0.0 + 6.5.0.0 + 6.5.0 diff --git a/MultiWindowExample/MultiWindowExample.csproj b/MultiWindowExample/MultiWindowExample.csproj index 53f4780..8720074 100644 --- a/MultiWindowExample/MultiWindowExample.csproj +++ b/MultiWindowExample/MultiWindowExample.csproj @@ -57,8 +57,8 @@ ..\packages\EventHook.1.4.105\lib\net45\EventHook.dll - - ..\packages\Finsemble.6.4.1\lib\net452\Finsemble.dll + + ..\packages\Finsemble.6.5.0\lib\net452\Finsemble.dll ..\packages\Microsoft.IdentityModel.Logging.6.12.1\lib\net45\Microsoft.IdentityModel.Logging.dll diff --git a/MultiWindowExample/Properties/AssemblyInfo.cs b/MultiWindowExample/Properties/AssemblyInfo.cs index fdf3d35..4989d18 100644 --- 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 index 8f52fbc..8d4209f 100644 --- a/MultiWindowExample/packages.config +++ b/MultiWindowExample/packages.config @@ -3,7 +3,7 @@ - + diff --git a/WPFExample/MainWindow.xaml.cs b/WPFExample/MainWindow.xaml.cs index 0ac262c..edaf18f 100644 --- a/WPFExample/MainWindow.xaml.cs +++ b/WPFExample/MainWindow.xaml.cs @@ -24,7 +24,8 @@ public partial class MainWindow : Window /// The logger /// - 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("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 index 99b4eb3..bfba6e3 100644 --- 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 index e0b4aeb..088bcf7 100644 --- a/WPFExample/WPFExample.csproj +++ b/WPFExample/WPFExample.csproj @@ -57,8 +57,8 @@ ..\packages\EventHook.1.4.105\lib\net45\EventHook.dll - - ..\packages\Finsemble.6.4.1\lib\net452\Finsemble.dll + + ..\packages\Finsemble.6.5.0\lib\net452\Finsemble.dll ..\packages\Microsoft.IdentityModel.Logging.6.12.1\lib\net45\Microsoft.IdentityModel.Logging.dll diff --git a/WPFExample/packages.config b/WPFExample/packages.config index 8f52fbc..8d4209f 100644 --- a/WPFExample/packages.config +++ b/WPFExample/packages.config @@ -3,7 +3,7 @@ - + diff --git a/WPFExampleCore/WPFExampleCore.csproj b/WPFExampleCore/WPFExampleCore.csproj index 77aa2f3..3896a81 100644 --- a/WPFExampleCore/WPFExampleCore.csproj +++ b/WPFExampleCore/WPFExampleCore.csproj @@ -5,7 +5,7 @@ net5.0-windows true AnyCPU;x64 - 6.4.1 + 6.5.0 @@ -13,7 +13,7 @@ - + diff --git a/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj b/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj index e3d4b15..09b0ba1 100644 --- a/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj +++ b/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj @@ -6,11 +6,11 @@ true WPFMultiWindowExampleCore.AppStartup AnyCPU;x64 - 6.4.1 + 6.5.0 - + diff --git a/WindowlessExample.Core/Program.cs b/WindowlessExample.Core/Program.cs index 05d1170..77eb2ba 100644 --- a/WindowlessExample.Core/Program.cs +++ b/WindowlessExample.Core/Program.cs @@ -2,6 +2,7 @@ using System.Threading; using Finsemble.Core; using Finsemble.Core.Clients.Router; +using Finsemble.Core.Events; using Microsoft.IdentityModel.Tokens; using Newtonsoft.Json.Linq; @@ -43,17 +44,17 @@ static void Main(string[] args) private static void OnConnected(object sender, EventArgs e) { - FSBL.Clients.Logger.Log("Windowless example connected to Finsemble."); + FSBL.Clients.Logger.Log("Windowless example Core connected to Finsemble."); // Send log message every 5 seconds timer.Interval = 5 * 1000; timer.AutoReset = true; - timer.Elapsed += (s1, e1) => FSBL.Clients.Logger.Log(string.Format("Windowless example elapsed event was raised at {0}", e1.SignalTime)); + timer.Elapsed += (s1, e1) => FSBL.Clients.Logger.Log(string.Format("Windowless example Core elapsed event was raised at {0}", e1.SignalTime)); timer.Start(); //Search provider example FSBL.Clients.SearchClient.Register( - "Windowless example", + "Windowless example Core", (o, args) => { FSBL.Clients.Logger.Log("Received query", args.response?["data"]?["text"]); JArray results = new JArray{ @@ -64,14 +65,17 @@ private static void OnConnected(object sender, EventArgs e) ["actions"] = new JArray { new JObject { ["name"] = "example action" } } } }; + args.sendQueryMessage(new FinsembleEventResponse(results, null)); }, (o, args) => { FSBL.Clients.Logger.Log("Search result action clicked on", args.response["item"], "action:", args.response["action"]); + args.sendQueryMessage(new FinsembleEventResponse("Performed search result action", null)); }, (o, args) => { FSBL.Clients.Logger.Log("Search provider title was click on"); + args.sendQueryMessage(new FinsembleEventResponse("Performed search provider action", null)); }, - "Windowless example search provider", + "Windowless example Core search provider", (o, args) => { if (args.error != null) diff --git a/WindowlessExample.Core/WindowlessExample.Core.csproj b/WindowlessExample.Core/WindowlessExample.Core.csproj index b00e7a2..5b63fd6 100644 --- a/WindowlessExample.Core/WindowlessExample.Core.csproj +++ b/WindowlessExample.Core/WindowlessExample.Core.csproj @@ -4,11 +4,11 @@ WinExe net5.0 AnyCPU;x64 - 6.4.1 + 6.5.0 - + diff --git a/WindowlessExample/Properties/AssemblyInfo.cs b/WindowlessExample/Properties/AssemblyInfo.cs index 1f5cd44..84c7722 100644 --- a/WindowlessExample/Properties/AssemblyInfo.cs +++ b/WindowlessExample/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("WindowlessExample")] -[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/WindowlessExample/WindowlessExample.csproj b/WindowlessExample/WindowlessExample.csproj index 5aa1cf5..7666255 100644 --- a/WindowlessExample/WindowlessExample.csproj +++ b/WindowlessExample/WindowlessExample.csproj @@ -57,8 +57,8 @@ ..\packages\EventHook.1.4.105\lib\net45\EventHook.dll - - ..\packages\Finsemble.6.4.1\lib\net452\Finsemble.dll + + ..\packages\Finsemble.6.5.0\lib\net452\Finsemble.dll diff --git a/WindowlessExample/packages.config b/WindowlessExample/packages.config index 8f52fbc..8d4209f 100644 --- a/WindowlessExample/packages.config +++ b/WindowlessExample/packages.config @@ -3,7 +3,7 @@ - + diff --git a/WinformExample/Properties/AssemblyInfo.cs b/WinformExample/Properties/AssemblyInfo.cs index 2b17056..73f381e 100644 --- a/WinformExample/Properties/AssemblyInfo.cs +++ b/WinformExample/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("WinformExample")] -[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyCopyright("Copyright © 2022")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -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.4.1.0")] -[assembly: AssemblyFileVersion("6.4.1.0")] +[assembly: AssemblyVersion("6.5.0.0")] +[assembly: AssemblyFileVersion("6.5.0.0")] diff --git a/WinformExample/WinformExample.csproj b/WinformExample/WinformExample.csproj index 734d42f..fdd5b39 100644 --- a/WinformExample/WinformExample.csproj +++ b/WinformExample/WinformExample.csproj @@ -56,8 +56,8 @@ ..\packages\EventHook.1.4.105\lib\net45\EventHook.dll - - ..\packages\Finsemble.6.4.1\lib\net452\Finsemble.dll + + ..\packages\Finsemble.6.5.0\lib\net452\Finsemble.dll ..\packages\Microsoft.IdentityModel.Logging.6.12.1\lib\net45\Microsoft.IdentityModel.Logging.dll diff --git a/WinformExample/packages.config b/WinformExample/packages.config index 69b1480..9ff87f4 100644 --- a/WinformExample/packages.config +++ b/WinformExample/packages.config @@ -3,7 +3,7 @@ - + diff --git a/WinformExampleCore/MainForm.cs b/WinformExampleCore/MainForm.cs index becd8d7..48f2c2d 100644 --- a/WinformExampleCore/MainForm.cs +++ b/WinformExampleCore/MainForm.cs @@ -78,7 +78,7 @@ 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); diff --git a/WinformExampleCore/Resources/finfont.ttf b/WinformExampleCore/Resources/finfont.ttf new file mode 100644 index 0000000..70a2e0b Binary files /dev/null and b/WinformExampleCore/Resources/finfont.ttf differ diff --git a/WinformExampleCore/Resources/font-finance.ttf b/WinformExampleCore/Resources/font-finance.ttf new file mode 100644 index 0000000..90541d9 Binary files /dev/null and b/WinformExampleCore/Resources/font-finance.ttf differ diff --git a/WinformExampleCore/WinformExampleCore.csproj b/WinformExampleCore/WinformExampleCore.csproj index 7e73059..06d9ae9 100644 --- a/WinformExampleCore/WinformExampleCore.csproj +++ b/WinformExampleCore/WinformExampleCore.csproj @@ -5,11 +5,25 @@ net5.0-windows true AnyCPU;x64 - 6.4.1 + 6.5.0 - + + + + + + + Always + + + Always + + + + + diff --git a/WinformMultiWindowExample/Properties/AssemblyInfo.cs b/WinformMultiWindowExample/Properties/AssemblyInfo.cs index 308e122..28e3b28 100644 --- a/WinformMultiWindowExample/Properties/AssemblyInfo.cs +++ b/WinformMultiWindowExample/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("WinformMultiWindowExample")] -[assembly: AssemblyCopyright("Copyright © 2020")] +[assembly: AssemblyCopyright("Copyright © 2022")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -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.4.1.0")] -[assembly: AssemblyFileVersion("6.4.1.0")] +[assembly: AssemblyVersion("6.5.0.0")] +[assembly: AssemblyFileVersion("6.5.0.0")] diff --git a/WinformMultiWindowExample/WinformMultiWindowExample.csproj b/WinformMultiWindowExample/WinformMultiWindowExample.csproj index 2048ac5..c6fd0eb 100644 --- a/WinformMultiWindowExample/WinformMultiWindowExample.csproj +++ b/WinformMultiWindowExample/WinformMultiWindowExample.csproj @@ -56,8 +56,8 @@ ..\packages\EventHook.1.4.105\lib\net45\EventHook.dll - - ..\packages\Finsemble.6.4.1\lib\net452\Finsemble.dll + + ..\packages\Finsemble.6.5.0\lib\net452\Finsemble.dll ..\packages\Microsoft.IdentityModel.Logging.6.12.1\lib\net45\Microsoft.IdentityModel.Logging.dll diff --git a/WinformMultiWindowExample/packages.config b/WinformMultiWindowExample/packages.config index 8f52fbc..8d4209f 100644 --- a/WinformMultiWindowExample/packages.config +++ b/WinformMultiWindowExample/packages.config @@ -3,7 +3,7 @@ - + diff --git a/WinformMultiWindowExampleCore/WinformMultiWindowExampleCore.csproj b/WinformMultiWindowExampleCore/WinformMultiWindowExampleCore.csproj index 37356b9..ed1c16b 100644 --- a/WinformMultiWindowExampleCore/WinformMultiWindowExampleCore.csproj +++ b/WinformMultiWindowExampleCore/WinformMultiWindowExampleCore.csproj @@ -5,11 +5,11 @@ net5.0-windows true AnyCPU;x64 - 6.4.1 + 6.5.0 - +