Merge pull request #64 from ChartIQ/7.3updates

7.3 dotnet updates
InteropIO · Jul 26, 2022 · f6af055 · f6af055
2 parents 79e0017 + 5ae7cf8
commit f6af055
Show file tree

Hide file tree

Showing 22 changed files with 31 additions and 30 deletions.
diff --git a/AuthenticationExample/AuthenticationExample.csproj b/AuthenticationExample/AuthenticationExample.csproj
@@ -49,8 +49,8 @@
     <Reference Include="DotNetZip, Version=1.16.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
       <HintPath>..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll</HintPath>
     </Reference>
-    <Reference Include="Finsemble, Version=7.2.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.7.2.0\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=7.3.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.7.3.0\lib\net452\Finsemble.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Logging, Version=6.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IdentityModel.Logging.6.16.0\lib\net45\Microsoft.IdentityModel.Logging.dll</HintPath>

diff --git a/AuthenticationExample/packages.config b/AuthenticationExample/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="DotNetZip" version="1.16.0" targetFramework="net452" />
-  <package id="Finsemble" version="7.2.0" targetFramework="net452" />
+  <package id="Finsemble" version="7.3.0" targetFramework="net452" />
   <package id="Microsoft.IdentityModel.Logging" version="6.16.0" targetFramework="net452" />
   <package id="Microsoft.IdentityModel.Tokens" version="6.16.0" targetFramework="net452" />
   <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net452" />

diff --git a/FDC3WPFExample/FDC3WPFExample.csproj b/FDC3WPFExample/FDC3WPFExample.csproj
@@ -49,8 +49,8 @@
     <Reference Include="DotNetZip, Version=1.16.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
       <HintPath>..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll</HintPath>
     </Reference>
-    <Reference Include="Finsemble, Version=7.2.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.7.2.0\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=7.3.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.7.3.0\lib\net452\Finsemble.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Logging, Version=6.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IdentityModel.Logging.6.16.0\lib\net45\Microsoft.IdentityModel.Logging.dll</HintPath>

diff --git a/FDC3WPFExample/packages.config b/FDC3WPFExample/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="DotNetZip" version="1.16.0" targetFramework="net452" />
-  <package id="Finsemble" version="7.2.0" targetFramework="net452" />
+  <package id="Finsemble" version="7.3.0" targetFramework="net452" />
   <package id="Microsoft.IdentityModel.Logging" version="6.16.0" targetFramework="net452" />
   <package id="Microsoft.IdentityModel.Tokens" version="6.16.0" targetFramework="net452" />
   <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net452" />

diff --git 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
@@ -49,8 +49,8 @@
     <Reference Include="DotNetZip, Version=1.16.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
       <HintPath>..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll</HintPath>
     </Reference>
-    <Reference Include="Finsemble, Version=7.2.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.7.2.0\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=7.3.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.7.3.0\lib\net452\Finsemble.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Logging, Version=6.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IdentityModel.Logging.6.16.0\lib\net45\Microsoft.IdentityModel.Logging.dll</HintPath>

diff --git a/MultiWindowExample/packages.config b/MultiWindowExample/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="DotNetZip" version="1.16.0" targetFramework="net452" />
-  <package id="Finsemble" version="7.2.0" targetFramework="net452" />
+  <package id="Finsemble" version="7.3.0" targetFramework="net452" />
   <package id="Microsoft.IdentityModel.Logging" version="6.16.0" targetFramework="net452" />
   <package id="Microsoft.IdentityModel.Tokens" version="6.16.0" targetFramework="net452" />
   <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net452" />

diff --git 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
@@ -49,8 +49,8 @@
     <Reference Include="DotNetZip, Version=1.16.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
       <HintPath>..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll</HintPath>
     </Reference>
-    <Reference Include="Finsemble, Version=7.2.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.7.2.0\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=7.3.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.7.3.0\lib\net452\Finsemble.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Logging, Version=6.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IdentityModel.Logging.6.16.0\lib\net45\Microsoft.IdentityModel.Logging.dll</HintPath>

diff --git a/WPFExample/packages.config b/WPFExample/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="DotNetZip" version="1.16.0" targetFramework="net452" />
-  <package id="Finsemble" version="7.2.0" targetFramework="net452" />
+  <package id="Finsemble" version="7.3.0" targetFramework="net452" />
   <package id="Microsoft.IdentityModel.Logging" version="6.16.0" targetFramework="net452" />
   <package id="Microsoft.IdentityModel.Tokens" version="6.16.0" targetFramework="net452" />
   <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net452" />

diff --git 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
@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Finsemble.WPF.Core" Version="7.2.0" />
+    <PackageReference Include="Finsemble.WPF.Core" Version="7.3.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj b/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj
@@ -26,7 +26,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Finsemble.WPF.Core" Version="7.2.0" />
+    <PackageReference Include="Finsemble.WPF.Core" Version="7.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/WindowlessExample.Core/WindowlessExample.Core.csproj b/WindowlessExample.Core/WindowlessExample.Core.csproj
@@ -24,7 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Finsemble.Core" Version="7.2.0" />
+    <PackageReference Include="Finsemble.Core" Version="7.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/WindowlessExample/WindowlessExample.csproj b/WindowlessExample/WindowlessExample.csproj
@@ -46,8 +46,8 @@
     <OutputPath>bin\x64\Release\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Finsemble, Version=7.2.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.7.2.0\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=7.3.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.7.3.0\lib\net452\Finsemble.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.IdentityModel.Logging, Version=6.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

diff --git a/WindowlessExample/packages.config b/WindowlessExample/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Finsemble" version="7.2.0" targetFramework="net452" />
+  <package id="Finsemble" version="7.3.0" targetFramework="net452" />
   <package id="Microsoft.IdentityModel.Logging" version="6.16.0" targetFramework="net452" />
   <package id="Microsoft.IdentityModel.Tokens" version="6.16.0" targetFramework="net452" />
   <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net452" />

diff --git a/WinformExample/WinformExample.csproj b/WinformExample/WinformExample.csproj
@@ -50,8 +50,8 @@
     <Reference Include="DotNetZip, Version=1.16.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
       <HintPath>..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll</HintPath>
     </Reference>
-    <Reference Include="Finsemble, Version=7.2.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.7.2.0\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=7.3.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.7.3.0\lib\net452\Finsemble.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Logging, Version=6.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IdentityModel.Logging.6.16.0\lib\net45\Microsoft.IdentityModel.Logging.dll</HintPath>

diff --git a/WinformExample/packages.config b/WinformExample/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="DotNetZip" version="1.16.0" targetFramework="net452" />
-  <package id="Finsemble" version="7.2.0" targetFramework="net452" />
+  <package id="Finsemble" version="7.3.0" targetFramework="net452" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net461" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net461" />

diff --git a/WinformExampleCore/WinformExampleCore.csproj b/WinformExampleCore/WinformExampleCore.csproj
@@ -39,7 +39,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Finsemble.Winform.Core" Version="7.2.0" />
+    <PackageReference Include="Finsemble.Winform.Core" Version="7.3.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 

diff --git a/WinformMultiWindowExample/WinformMultiWindowExample.csproj b/WinformMultiWindowExample/WinformMultiWindowExample.csproj
@@ -50,8 +50,8 @@
     <Reference Include="DotNetZip, Version=1.16.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
       <HintPath>..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll</HintPath>
     </Reference>
-    <Reference Include="Finsemble, Version=7.2.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.7.2.0\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=7.3.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.7.3.0\lib\net452\Finsemble.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Logging, Version=6.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IdentityModel.Logging.6.16.0\lib\net45\Microsoft.IdentityModel.Logging.dll</HintPath>

diff --git a/WinformMultiWindowExample/packages.config b/WinformMultiWindowExample/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="DotNetZip" version="1.16.0" targetFramework="net452" />
-  <package id="Finsemble" version="7.2.0" targetFramework="net452" />
+  <package id="Finsemble" version="7.3.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/WinformMultiWindowExampleCore/WinformMultiWindowExampleCore.csproj b/WinformMultiWindowExampleCore/WinformMultiWindowExampleCore.csproj
@@ -25,7 +25,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Finsemble.Winform.Core" Version="7.2.0" />
+    <PackageReference Include="Finsemble.Winform.Core" Version="7.3.0" />
   </ItemGroup>
 
 </Project>