Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

841updates #73

Merged
merged 1 commit into from
Feb 16, 2023
Merged

841updates #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions AuthenticationExample/AuthenticationExample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions AuthenticationExample/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions FDC3WPFExample/FDC3WPFExample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions FDC3WPFExample/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions MultiWindowExample/MultiWindowExample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions MultiWindowExample/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
3 changes: 1 addition & 2 deletions WPFExample/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions WPFExample/WPFExample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions WPFExample/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
7 changes: 3 additions & 4 deletions WPFExampleCore/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion WPFExampleCore/WPFExampleCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion WindowlessExample.Core/WindowlessExample.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Finsemble.Core" Version="8.3.0" />
<PackageReference Include="Finsemble.Core" Version="8.4.1" />
</ItemGroup>

</Project>
3 changes: 3 additions & 0 deletions WindowlessExample/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions WindowlessExample/WindowlessExample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
4 changes: 2 additions & 2 deletions WindowlessExample/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
Loading