840updates (#73)

InteropIO · Feb 16, 2023 · fce489e · fce489e
1 parent 1db303b
commit fce489e
Show file tree

Hide file tree

Showing 24 changed files with 91 additions and 286 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=8.3.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.8.3.0\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=8.4.1.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.8.4.1\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,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="DotNetZip" version="1.16.0" targetFramework="net452" />
-  <package id="Finsemble" version="8.3.0" targetFramework="net452" />
+  <package id="Finsemble" version="8.4.1" 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="6.0.6" targetFramework="net452" />
   <package id="NETStandard.Library" version="1.6.1" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net452" />
   <package id="PInvoke.Windows.Core" version="0.6.49" targetFramework="net452" />
   <package id="Polly" version="7.2.3" targetFramework="net452" />
   <package id="SuperSocket.ClientEngine.Core" version="0.10.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=8.3.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.8.3.0\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=8.4.1.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.8.4.1\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,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="DotNetZip" version="1.16.0" targetFramework="net452" />
-  <package id="Finsemble" version="8.3.0" targetFramework="net452" />
+  <package id="Finsemble" version="8.4.1" 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="6.0.6" targetFramework="net452" />
   <package id="NETStandard.Library" version="1.6.1" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net452" />
   <package id="PInvoke.Windows.Core" version="0.6.49" targetFramework="net452" />
   <package id="Polly" version="7.2.3" targetFramework="net452" />
   <package id="System.Collections" version="4.3.0" targetFramework="net452" />

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=8.3.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.8.3.0\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=8.4.1.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.8.4.1\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,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="DotNetZip" version="1.16.0" targetFramework="net452" />
-  <package id="Finsemble" version="8.3.0" targetFramework="net452" />
+  <package id="Finsemble" version="8.4.1" 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="6.0.6" targetFramework="net452" />
   <package id="NETStandard.Library" version="1.6.1" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net452" />
   <package id="PInvoke.Windows.Core" version="0.6.49" targetFramework="net452" />
   <package id="Polly" version="7.2.3" targetFramework="net452" />
   <package id="SuperSocket.ClientEngine.Core" version="0.10.0" targetFramework="net452" />

diff --git 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
@@ -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=8.3.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.8.3.0\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=8.4.1.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.8.4.1\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,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="DotNetZip" version="1.16.0" targetFramework="net452" />
-  <package id="Finsemble" version="8.3.0" targetFramework="net452" />
+  <package id="Finsemble" version="8.4.1" 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="6.0.6" targetFramework="net452" />
   <package id="NETStandard.Library" version="1.6.1" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net452" />
   <package id="PInvoke.Windows.Core" version="0.6.49" targetFramework="net452" />
   <package id="Polly" version="7.2.3" targetFramework="net452" />
   <package id="System.Collections" version="4.3.0" targetFramework="net452" />

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

diff --git a/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj b/WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj
@@ -26,7 +26,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Finsemble.WPF.Core" Version="8.3.0" />
+    <PackageReference Include="Finsemble.WPF.Core" Version="8.4.1" />
   </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="8.3.0" />
+    <PackageReference Include="Finsemble.Core" Version="8.4.1" />
   </ItemGroup>
 
 </Project>
diff --git 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
@@ -46,8 +46,8 @@
     <OutputPath>bin\x64\Release\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Finsemble, Version=8.3.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
-      <HintPath>..\packages\Finsemble.8.3.0\lib\net452\Finsemble.dll</HintPath>
+    <Reference Include="Finsemble, Version=8.4.1.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
+      <HintPath>..\packages\Finsemble.8.4.1\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,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Finsemble" version="8.3.0" targetFramework="net452" />
+  <package id="Finsemble" version="8.4.1" 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="6.0.6" targetFramework="net452" />
   <package id="NETStandard.Library" version="1.6.1" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net452" />
   <package id="PInvoke.Windows.Core" version="0.6.49" targetFramework="net452" />
   <package id="Polly" version="7.2.3" targetFramework="net452" />
   <package id="System.Collections" version="4.3.0" targetFramework="net452" />