diff --git a/AuthenticationExample/AuthenticationExample.csproj b/AuthenticationExample/AuthenticationExample.csproj index a090b7d..74e7280 100644 --- a/AuthenticationExample/AuthenticationExample.csproj +++ b/AuthenticationExample/AuthenticationExample.csproj @@ -49,8 +49,8 @@ ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll - - ..\packages\Finsemble.7.2.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.7.3.0\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 e5cbb78..f6e6db1 100644 --- a/AuthenticationExample/packages.config +++ b/AuthenticationExample/packages.config @@ -1,7 +1,7 @@  - + diff --git a/FDC3WPFExample/FDC3WPFExample.csproj b/FDC3WPFExample/FDC3WPFExample.csproj index a10f32d..a53c374 100644 --- a/FDC3WPFExample/FDC3WPFExample.csproj +++ b/FDC3WPFExample/FDC3WPFExample.csproj @@ -49,8 +49,8 @@ ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll - - ..\packages\Finsemble.7.2.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.7.3.0\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 4e32424..62ddada 100644 --- a/FDC3WPFExample/packages.config +++ b/FDC3WPFExample/packages.config @@ -1,7 +1,7 @@  - + diff --git a/FreestandingWPFExample/MainWindow.xaml.cs b/FreestandingWPFExample/MainWindow.xaml.cs index 3faf4cb..da6b8c1 100644 --- a/FreestandingWPFExample/MainWindow.xaml.cs +++ b/FreestandingWPFExample/MainWindow.xaml.cs @@ -26,7 +26,7 @@ public partial class MainWindow : Window #region JS scripts private string finsembleJsAdapterSrc = "http://localhost:3375/build/finsemble/finsemble-javascript-adapter.js"; - private string fsblStartApp = "FSBL.startApp({appName: \"MyApp\", windowName: \"MyApp-window\"})"; + private string fsblStartApp = "FSBLJSAdapter.startApp({appName: \"MyApp\", windowName: \"MyApp-window\"})"; #endregion private IBrowser browser; diff --git a/MultiWindowExample/MultiWindowExample.csproj b/MultiWindowExample/MultiWindowExample.csproj index a11152b..c9dd5ba 100644 --- a/MultiWindowExample/MultiWindowExample.csproj +++ b/MultiWindowExample/MultiWindowExample.csproj @@ -49,8 +49,8 @@ ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll - - ..\packages\Finsemble.7.2.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.7.3.0\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 e5cbb78..f6e6db1 100644 --- a/MultiWindowExample/packages.config +++ b/MultiWindowExample/packages.config @@ -1,7 +1,7 @@  - + diff --git a/WPFExample/MainWindow.xaml.cs b/WPFExample/MainWindow.xaml.cs index edaf18f..e7d23c5 100644 --- a/WPFExample/MainWindow.xaml.cs +++ b/WPFExample/MainWindow.xaml.cs @@ -171,8 +171,8 @@ public MainWindow(string[] args) 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; - // For statitc authentication you may replace FSBL.appName by your app name from appd.json - FSBL.Connect(FSBL.appName, JWK); + // For authentication in the InteropService use the appId from appd.json and static auth token + FSBL.Connect("Finsemble WPF Demo", JWK); } private void Finsemble_Connected(object sender, EventArgs e) diff --git a/WPFExample/WPFExample.csproj b/WPFExample/WPFExample.csproj index cc8d098..8eeeccb 100644 --- a/WPFExample/WPFExample.csproj +++ b/WPFExample/WPFExample.csproj @@ -49,8 +49,8 @@ ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll - - ..\packages\Finsemble.7.2.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.7.3.0\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 4e32424..62ddada 100644 --- a/WPFExample/packages.config +++ b/WPFExample/packages.config @@ -1,7 +1,7 @@  - + diff --git a/WPFExampleCore/MainWindow.xaml.cs b/WPFExampleCore/MainWindow.xaml.cs index 3ee4f4a..2be1126 100644 --- a/WPFExampleCore/MainWindow.xaml.cs +++ b/WPFExampleCore/MainWindow.xaml.cs @@ -45,7 +45,8 @@ public MainWindow(string[] args) FSBL = new FinsembleWPF(this, handle.ToString("X"), args); // Finsemble needs the command line arguments to connect and also this Window handle to manage snapping, docking etc. FSBL.Connected += Finsemble_Connected; FSBL.Disconnected += FSBL_Disconnected; - var connectTask = FSBL.Connect(FSBL.AppName ?? "WPFExampleCore", JWK); + // For authentication in the InteropService use the appId from appd.json and static auth token + var connectTask = FSBL.Connect("Finsemble WPF Demo Core", JWK); } private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e) diff --git a/WPFExampleCore/WPFExampleCore.csproj b/WPFExampleCore/WPFExampleCore.csproj index 60d2053..4b536c6 100644 --- a/WPFExampleCore/WPFExampleCore.csproj +++ b/WPFExampleCore/WPFExampleCore.csproj @@ -29,7 +29,7 @@ - + diff --git a/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj b/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj index 100f052..b10090a 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 b28382d..ad91dbe 100644 --- a/WindowlessExample.Core/WindowlessExample.Core.csproj +++ b/WindowlessExample.Core/WindowlessExample.Core.csproj @@ -24,7 +24,7 @@ - + diff --git a/WindowlessExample/WindowlessExample.csproj b/WindowlessExample/WindowlessExample.csproj index ab7f952..f79942d 100644 --- a/WindowlessExample/WindowlessExample.csproj +++ b/WindowlessExample/WindowlessExample.csproj @@ -46,8 +46,8 @@ bin\x64\Release\ - - ..\packages\Finsemble.7.2.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.7.3.0\lib\net452\Finsemble.dll diff --git a/WindowlessExample/packages.config b/WindowlessExample/packages.config index 7c6b013..76966a4 100644 --- a/WindowlessExample/packages.config +++ b/WindowlessExample/packages.config @@ -1,6 +1,6 @@  - + diff --git a/WinformExample/WinformExample.csproj b/WinformExample/WinformExample.csproj index cd8ddcc..7f40a42 100644 --- a/WinformExample/WinformExample.csproj +++ b/WinformExample/WinformExample.csproj @@ -50,8 +50,8 @@ ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll - - ..\packages\Finsemble.7.2.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.7.3.0\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 2139411..55c2b06 100644 --- a/WinformExample/packages.config +++ b/WinformExample/packages.config @@ -1,7 +1,7 @@  - + diff --git a/WinformExampleCore/WinformExampleCore.csproj b/WinformExampleCore/WinformExampleCore.csproj index 88199c3..dba58da 100644 --- a/WinformExampleCore/WinformExampleCore.csproj +++ b/WinformExampleCore/WinformExampleCore.csproj @@ -39,7 +39,7 @@ - + diff --git a/WinformMultiWindowExample/WinformMultiWindowExample.csproj b/WinformMultiWindowExample/WinformMultiWindowExample.csproj index 66eedca..206211d 100644 --- a/WinformMultiWindowExample/WinformMultiWindowExample.csproj +++ b/WinformMultiWindowExample/WinformMultiWindowExample.csproj @@ -50,8 +50,8 @@ ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll - - ..\packages\Finsemble.7.2.0\lib\net452\Finsemble.dll + + ..\packages\Finsemble.7.3.0\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 ad95ad9..90748d7 100644 --- a/WinformMultiWindowExample/packages.config +++ b/WinformMultiWindowExample/packages.config @@ -1,7 +1,7 @@  - + diff --git a/WinformMultiWindowExampleCore/WinformMultiWindowExampleCore.csproj b/WinformMultiWindowExampleCore/WinformMultiWindowExampleCore.csproj index 54326c9..990a01a 100644 --- a/WinformMultiWindowExampleCore/WinformMultiWindowExampleCore.csproj +++ b/WinformMultiWindowExampleCore/WinformMultiWindowExampleCore.csproj @@ -25,7 +25,7 @@ - +