Skip to content

Commit

Permalink
633 update
Browse files Browse the repository at this point in the history
  • Loading branch information
kyle-ciq committed May 26, 2022
1 parent c644d88 commit 3cf671a
Show file tree
Hide file tree
Showing 29 changed files with 319 additions and 95 deletions.
31 changes: 2 additions & 29 deletions AuthenticationExample/AuthenticationExample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,6 @@
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
Expand Down Expand Up @@ -72,8 +57,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=6.6.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
<HintPath>..\packages\Finsemble.6.6.0\lib\net452\Finsemble.dll</HintPath>
<Reference Include="Finsemble, Version=6.6.3.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
<HintPath>..\packages\Finsemble.6.6.3\lib\net452\Finsemble.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Logging, Version=6.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IdentityModel.Logging.6.12.1\lib\net45\Microsoft.IdentityModel.Logging.dll</HintPath>
Expand Down Expand Up @@ -177,18 +162,6 @@
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.5.2 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Expand Down
4 changes: 2 additions & 2 deletions AuthenticationExample/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
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("6.6.0.0")]
[assembly: AssemblyFileVersion("6.6.0.0")]
[assembly: AssemblyVersion("6.6.3.0")]
[assembly: AssemblyFileVersion("6.6.3.0")]
2 changes: 1 addition & 1 deletion AuthenticationExample/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<package id="DotNetZip" version="1.13.7" targetFramework="net452" />
<package id="EngineIoClientDotNet" version="1.0.7" targetFramework="net452" />
<package id="EventHook" version="1.4.105" targetFramework="net452" />
<package id="Finsemble" version="6.6.0" targetFramework="net452" />
<package id="Finsemble" version="6.6.3" 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" />
Expand Down
167 changes: 167 additions & 0 deletions FDC3WPFExample/DefaultData.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
using ChartIQ.Finsemble.FDC3.Types;
using Newtonsoft.Json.Linq;
using System.Collections.Generic;

namespace FDC3WPFExample
{
public static class DefaultData
{
public static Dictionary<string, Context> DefaultContexts = new Dictionary<string, Context>()
{
{"fdc3.contact", new Context(new JObject
{
["type"] = "fdc3.contact",
["name"] = "Jane Doe",
["id"] = new JObject
{
["email"] = "[email protected]"
}
}
)},
{"fdc3.contactList", new Context(new JObject
{
["type"] = "fdc3.contactList",
["contacts"] = new JArray
{
new JObject
{
["type"] = "fdc3.contact",
["name"] = "Jane Doe",
["id"] = new JObject
{
["email"] = "[email protected]"
}
},
new JObject
{
["type"] = "fdc3.contact",
["name"] = "John Doe",
["id"] = new JObject
{
["email"] = "[email protected]"
}
}
}
}
)},
{"fdc3.instrument", new Context(new JObject
{
["type"] = "fdc3.instrument",
["name"] = "Microsoft",
["id"] = new JObject
{
["ticker"] = "MSFT",
["RIC"] = "MSFT.OQ",
["ISIN"] = "US5949181045"
}
}
)},
{"fdc3.instrumentList", new Context(new JObject
{
["type"] = "fdc3.instrumentList",
["instruments"] = new JArray
{
new JObject
{
["type"] = "fdc3.instrument",
["id"] = new JObject
{
["ticker"] = "AAPL"
}
},
new JObject
{
["type"] = "fdc3.instrument",
["id"] = new JObject
{
["ticker"] = "MSFT"
}
}
}
}
)},
{"fdc3.organization", new Context(new JObject
{
["type"] = "fdc3.organization",
["name"] = "Cargill, Incorporated",
["id"] = new JObject
{
["LEI"] = "QXZYQNMR4JZ5RIRN4T31",
["FDS_ID"] = "00161G-E"
}
}
)},
{"fdc3.country", new Context(new JObject
{
["type"] = "fdc3.country",
["name"] = "Sweden",
["id"] = new JObject
{
["ISOALPHA3"] = "SWE"
}
}
)},
{"fdc3.position", new Context(new JObject
{
["type"] = "fdc3.position",
["instrument"] = new JObject
{
["type"] = "fdc3.instrument",
["id"] = new JObject
{
["ticker"] = "AAPL"
}
},
["holding"] = 2000000
}
)},
{"fdc3.portfolio", new Context(new JObject
{
["type"] = "fdc3.portfolio",
["positions"] = new JArray
{
new JObject
{
["type"] = "fdc3.position",
["instrument"] = new JObject
{
["type"] = "fdc3.instrument",
["id"] = new JObject
{
["ticker"] = "AAPL"
}
},
["holding"] = 2000000
},
new JObject
{
["type"] = "fdc3.position",
["instrument"] = new JObject
{
["type"] = "fdc3.instrument",
["id"] = new JObject
{
["ticker"] = "MSFT"
}
},
["holding"] = 1500000
},
new JObject
{
["type"] = "fdc3.position",
["instrument"] = new JObject
{
["type"] = "fdc3.instrument",
["id"] = new JObject
{
["ticker"] = "IBM"
}
},
["holding"] = 3000000
}
}
}
)},
};
}
}
4 changes: 2 additions & 2 deletions FDC3WPFExample/FDC3WPFExample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,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=6.6.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
<HintPath>..\packages\Finsemble.6.6.0\lib\net452\Finsemble.dll</HintPath>
<Reference Include="Finsemble, Version=6.6.3.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
<HintPath>..\packages\Finsemble.6.6.3\lib\net452\Finsemble.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Logging, Version=6.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IdentityModel.Logging.6.12.1\lib\net45\Microsoft.IdentityModel.Logging.dll</HintPath>
Expand Down
4 changes: 2 additions & 2 deletions FDC3WPFExample/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,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("6.6.0.0")]
[assembly: AssemblyFileVersion("6.6.0.0")]
[assembly: AssemblyVersion("6.6.3.0")]
[assembly: AssemblyFileVersion("6.6.3.0")]
2 changes: 1 addition & 1 deletion FDC3WPFExample/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<package id="DotNetZip" version="1.13.7" targetFramework="net452" />
<package id="EngineIoClientDotNet" version="1.0.7" targetFramework="net452" />
<package id="EventHook" version="1.4.105" targetFramework="net452" />
<package id="Finsemble" version="6.6.0" targetFramework="net452" />
<package id="Finsemble" version="6.6.3" 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" />
Expand Down
6 changes: 3 additions & 3 deletions FreestandingWPFExample/FreestandingWPFExample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<TargetFramework>net5.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyVersion>6.6.0.0</AssemblyVersion>
<FileVersion>6.6.0.0</FileVersion>
<Version>6.6.0</Version>
<AssemblyVersion>6.6.3.0</AssemblyVersion>
<FileVersion>6.6.3.0</FileVersion>
<Version>6.6.3</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions MultiWindowExample/MultiWindowExample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,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=6.6.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
<HintPath>..\packages\Finsemble.6.6.0\lib\net452\Finsemble.dll</HintPath>
<Reference Include="Finsemble, Version=6.6.3.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
<HintPath>..\packages\Finsemble.6.6.3\lib\net452\Finsemble.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Logging, Version=6.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IdentityModel.Logging.6.12.1\lib\net45\Microsoft.IdentityModel.Logging.dll</HintPath>
Expand Down
4 changes: 2 additions & 2 deletions MultiWindowExample/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
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("6.6.0.0")]
[assembly: AssemblyFileVersion("6.6.0.0")]
[assembly: AssemblyVersion("6.6.3.0")]
[assembly: AssemblyFileVersion("6.6.3.0")]
2 changes: 1 addition & 1 deletion MultiWindowExample/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<package id="DotNetZip" version="1.13.7" targetFramework="net452" />
<package id="EngineIoClientDotNet" version="1.0.7" targetFramework="net452" />
<package id="EventHook" version="1.4.105" targetFramework="net452" />
<package id="Finsemble" version="6.6.0" targetFramework="net452" />
<package id="Finsemble" version="6.6.3" 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" />
Expand Down
4 changes: 2 additions & 2 deletions WPFExample/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,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("6.6.0.0")]
[assembly: AssemblyFileVersion("6.6.0.0")]
[assembly: AssemblyVersion("6.6.3.0")]
[assembly: AssemblyFileVersion("6.6.3.0")]
4 changes: 2 additions & 2 deletions WPFExample/WPFExample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,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=6.6.0.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
<HintPath>..\packages\Finsemble.6.6.0\lib\net452\Finsemble.dll</HintPath>
<Reference Include="Finsemble, Version=6.6.3.0, Culture=neutral, PublicKeyToken=9df516fcbc4ebe73, processorArchitecture=MSIL">
<HintPath>..\packages\Finsemble.6.6.3\lib\net452\Finsemble.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Logging, Version=6.12.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IdentityModel.Logging.6.12.1\lib\net45\Microsoft.IdentityModel.Logging.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion WPFExample/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<package id="DotNetZip" version="1.13.7" targetFramework="net452" />
<package id="EngineIoClientDotNet" version="1.0.7" targetFramework="net452" />
<package id="EventHook" version="1.4.105" targetFramework="net452" />
<package id="Finsemble" version="6.6.0" targetFramework="net452" />
<package id="Finsemble" version="6.6.3" 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" />
Expand Down
4 changes: 2 additions & 2 deletions WPFExampleCore/WPFExampleCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<TargetFramework>net5.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<Platforms>AnyCPU;x64</Platforms>
<Version>6.6.0</Version>
<Version>6.6.3</Version>
</PropertyGroup>

<ItemGroup>
<None Remove="Assets\ic_WPFLogo.png" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Finsemble.WPF.Core" Version="6.6.0" />
<PackageReference Include="Finsemble.WPF.Core" Version="6.6.3" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions WPFMultiWindowExampleCore/WPFMultiWindowExampleCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<UseWPF>true</UseWPF>
<StartupObject>WPFMultiWindowExampleCore.AppStartup</StartupObject>
<Platforms>AnyCPU;x64</Platforms>
<Version>6.6.0</Version>
<Version>6.6.3</Version>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Finsemble.WPF.Core" Version="6.6.0" />
<PackageReference Include="Finsemble.WPF.Core" Version="6.6.3" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions WindowlessExample.Core/WindowlessExample.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<Platforms>AnyCPU;x64</Platforms>
<Version>6.6.0</Version>
<Version>6.6.3</Version>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Finsemble.Core" Version="6.6.0" />
<PackageReference Include="Finsemble.Core" Version="6.6.3" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions WindowlessExample/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
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("6.6.0.0")]
[assembly: AssemblyFileVersion("6.6.0.0")]
[assembly: AssemblyVersion("6.6.3.0")]
[assembly: AssemblyFileVersion("6.6.3.0")]
Loading

0 comments on commit 3cf671a

Please sign in to comment.