Skip to content

Commit

Permalink
4.2.0 Release
Browse files Browse the repository at this point in the history
4.2.0 Release
  • Loading branch information
sgd2z authored May 7, 2020
2 parents 12860c5 + a08d270 commit a08ae87
Show file tree
Hide file tree
Showing 58 changed files with 2,922 additions and 176 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ artifacts/
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
Expand Down Expand Up @@ -257,4 +258,4 @@ paket-files/

# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
*.pyc
8 changes: 0 additions & 8 deletions AuthenticationExample/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,6 @@
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="OpenfinDesktop" publicKeyToken="18a277d64dddd680" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-14.0.0.0" newVersion="14.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
34 changes: 3 additions & 31 deletions AuthenticationExample/AuthenticationExample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@
<Reference Include="EventHook, Version=1.4.105.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\EventHook.1.4.105\lib\net45\EventHook.dll</HintPath>
</Reference>
<Reference Include="Finsemble, Version=4.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Finsemble.4.1.0\lib\net452\Finsemble.dll</HintPath>
<Reference Include="Finsemble, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Finsemble.4.2.0\lib\net452\Finsemble.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
Expand Down Expand Up @@ -126,43 +126,15 @@
<HintPath>..\packages\OpenfinDesktop.14.1.1\lib\net452\OpenfinDesktop.dll</HintPath>
</Reference>
<Reference Include="SuperSocket.ClientEngine, Version=0.10.0.0, Culture=neutral, PublicKeyToken=ee9af13f57f00acc, processorArchitecture=MSIL">
<HintPath>..\packages\SuperSocket.ClientEngine.0.10.0\lib\net45\SuperSocket.ClientEngine.dll</HintPath>
</Reference>
<Reference Include="SuperSocket.ProtoBase, Version=1.7.0.17, Culture=neutral, PublicKeyToken=6c80000676988ebb, processorArchitecture=MSIL">
<HintPath>..\packages\SuperSocket.ProtoBase.1.7.0.17\lib\net45\SuperSocket.ProtoBase.dll</HintPath>
<HintPath>..\packages\SuperSocket.ClientEngine.Core.0.10.0\lib\net45\SuperSocket.ClientEngine.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.1.7.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Specialized, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Specialized.4.3.0\lib\net46\System.Collections.Specialized.dll</HintPath>
</Reference>
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net" />
<Reference Include="System.Net.NameResolution, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Net.NameResolution.4.3.0\lib\net46\System.Net.NameResolution.dll</HintPath>
</Reference>
<Reference Include="System.Net.Security, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Net.Security.4.3.0\lib\net46\System.Net.Security.dll</HintPath>
</Reference>
<Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
Expand Down
4 changes: 2 additions & 2 deletions AuthenticationExample/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Authentication")]
[assembly: AssemblyCopyright("Copyright © 2018")]
[assembly: AssemblyCopyright("Copyright © 2017 - 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down Expand Up @@ -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("1.0.0.0")]
[assembly: AssemblyVersion("4.2.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
2 changes: 1 addition & 1 deletion AuthenticationExample/Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 7 additions & 25 deletions AuthenticationExample/packages.config
Original file line number Diff line number Diff line change
@@ -1,38 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DotNetZip" version="1.13.7" targetFramework="net452" />
<package id="EngineIoClientDotNet" version="1.0.7" targetFramework="net461" />
<package id="EventHook" version="1.4.105" targetFramework="net461" />
<package id="Finsemble" version="4.1.0" targetFramework="net452" />
<package id="EngineIoClientDotNet" version="1.0.7" targetFramework="net452" />
<package id="EventHook" version="1.4.105" targetFramework="net452" />
<package id="Finsemble" version="4.2.0" targetFramework="net452" />
<package id="log4net" version="2.0.8" 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" />
<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" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net452" />
<package id="Nito.AsyncEx" version="4.0.1" targetFramework="net461" />
<package id="Nito.AsyncEx" version="4.0.1" targetFramework="net452" />
<package id="Openfin.WinForm" version="14.1.1" targetFramework="net452" />
<package id="OpenFin.WPF" version="14.1.1" targetFramework="net452" />
<package id="OpenfinDesktop" version="14.1.1" targetFramework="net452" />
<package id="SuperSocket.ClientEngine" version="0.10.0" targetFramework="net452" />
<package id="SuperSocket.ClientEngine.Core" version="0.10.0" targetFramework="net452" />
<package id="SuperSocket.ProtoBase" version="1.7.0.17" targetFramework="net452" />
<package id="System.Collections.Immutable" version="1.7.0" targetFramework="net452" />
<package id="System.Collections.Specialized" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
<package id="System.IO" version="4.3.0" targetFramework="net452" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net452" />
<package id="System.Linq" version="4.3.0" targetFramework="net461" />
<package id="System.Net.NameResolution" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
<package id="System.Net.Security" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net461" />
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net461" />
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
<package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net452" />
<package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net461" />
<package id="System.Threading" version="4.3.0" targetFramework="net461" />
<package id="System.Threading.Timer" version="4.3.0" targetFramework="net461" />
<package id="WebSocket4Net" version="0.15.2" targetFramework="net452" />
</packages>
32 changes: 30 additions & 2 deletions FinsembleDemo.sln
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2027
# Visual Studio Version 16
VisualStudioVersion = 16.0.30011.22
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPFExample", "WPFExample\WPFExample.csproj", "{B6FB5104-A0EA-479A-8BFC-4DFE207CEB24}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationExample", "AuthenticationExample\AuthenticationExample.csproj", "{815ADC60-447D-445B-A875-B50218956A07}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowlessExample", "WindowlessExample\WindowlessExample.csproj", "{E65C4A9D-90CD-42E2-B426-724F290043ED}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinformExample", "WinformExample\WinformExample.csproj", "{30963A3F-17AD-4685-A8DF-B945012E02F4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiWindowExample", "MultiWindowExample\MultiWindowExample.csproj", "{E068C337-DF06-4A33-B227-A97B9649E88F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -55,6 +59,30 @@ Global
{E65C4A9D-90CD-42E2-B426-724F290043ED}.Release|x64.Build.0 = Release|Any CPU
{E65C4A9D-90CD-42E2-B426-724F290043ED}.Release|x86.ActiveCfg = Release|Any CPU
{E65C4A9D-90CD-42E2-B426-724F290043ED}.Release|x86.Build.0 = Release|Any CPU
{30963A3F-17AD-4685-A8DF-B945012E02F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{30963A3F-17AD-4685-A8DF-B945012E02F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{30963A3F-17AD-4685-A8DF-B945012E02F4}.Debug|x64.ActiveCfg = Debug|Any CPU
{30963A3F-17AD-4685-A8DF-B945012E02F4}.Debug|x64.Build.0 = Debug|Any CPU
{30963A3F-17AD-4685-A8DF-B945012E02F4}.Debug|x86.ActiveCfg = Debug|Any CPU
{30963A3F-17AD-4685-A8DF-B945012E02F4}.Debug|x86.Build.0 = Debug|Any CPU
{30963A3F-17AD-4685-A8DF-B945012E02F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{30963A3F-17AD-4685-A8DF-B945012E02F4}.Release|Any CPU.Build.0 = Release|Any CPU
{30963A3F-17AD-4685-A8DF-B945012E02F4}.Release|x64.ActiveCfg = Release|Any CPU
{30963A3F-17AD-4685-A8DF-B945012E02F4}.Release|x64.Build.0 = Release|Any CPU
{30963A3F-17AD-4685-A8DF-B945012E02F4}.Release|x86.ActiveCfg = Release|Any CPU
{30963A3F-17AD-4685-A8DF-B945012E02F4}.Release|x86.Build.0 = Release|Any CPU
{E068C337-DF06-4A33-B227-A97B9649E88F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E068C337-DF06-4A33-B227-A97B9649E88F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E068C337-DF06-4A33-B227-A97B9649E88F}.Debug|x64.ActiveCfg = Debug|Any CPU
{E068C337-DF06-4A33-B227-A97B9649E88F}.Debug|x64.Build.0 = Debug|Any CPU
{E068C337-DF06-4A33-B227-A97B9649E88F}.Debug|x86.ActiveCfg = Debug|Any CPU
{E068C337-DF06-4A33-B227-A97B9649E88F}.Debug|x86.Build.0 = Debug|Any CPU
{E068C337-DF06-4A33-B227-A97B9649E88F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E068C337-DF06-4A33-B227-A97B9649E88F}.Release|Any CPU.Build.0 = Release|Any CPU
{E068C337-DF06-4A33-B227-A97B9649E88F}.Release|x64.ActiveCfg = Release|Any CPU
{E068C337-DF06-4A33-B227-A97B9649E88F}.Release|x64.Build.0 = Release|Any CPU
{E068C337-DF06-4A33-B227-A97B9649E88F}.Release|x86.ActiveCfg = Release|Any CPU
{E068C337-DF06-4A33-B227-A97B9649E88F}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
34 changes: 34 additions & 0 deletions MultiWindowExample/App.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="WebSocket4Net" publicKeyToken="eb4e154b696bf72a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.15.2.11" newVersion="0.15.2.11" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Openfin.WinForm" publicKeyToken="18a277d64dddd680" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.3.3" newVersion="8.1.3.3" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="OpenfinDesktop" publicKeyToken="18a277d64dddd680" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-14.1.1.0" newVersion="14.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="SuperSocket.ClientEngine" publicKeyToken="ee9af13f57f00acc" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.10.0.0" newVersion="0.10.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
10 changes: 10 additions & 0 deletions MultiWindowExample/App.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<Application x:Class="MultiWindowExample.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:MultiWindowExample"
DispatcherUnhandledException="Application_DispatcherUnhandledException"
ShutdownMode="OnLastWindowClose">
<Application.Resources>

</Application.Resources>
</Application>
Loading

0 comments on commit a08ae87

Please sign in to comment.