Skip to content

Commit 738d05a

Browse files
florincflorinc
committed
Merge branch 'dev/interProcCom'
2 parents 70e77ae + b5e4a22 commit 738d05a

43 files changed

Lines changed: 2174 additions & 201 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎InterProcessCommunication/TradingApp/AppBootEx/AppBootEx.csproj‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,6 @@
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<ItemGroup>
34-
<Reference Include="iQuarc.AppBoot, Version=2.0.3.2, Culture=neutral, processorArchitecture=MSIL">
35-
<HintPath>..\packages\iQuarc.AppBoot.2.0.3-disposables002\lib\net45\iQuarc.AppBoot.dll</HintPath>
36-
</Reference>
37-
<Reference Include="iQuarc.SystemEx, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\packages\iQuarc.SystemEx.1.0.0.0\lib\net40\iQuarc.SystemEx.dll</HintPath>
39-
</Reference>
40-
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
41-
<HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
42-
</Reference>
4334
<Reference Include="System" />
4435
<Reference Include="System.Core" />
4536
<Reference Include="System.Xml.Linq" />
@@ -55,7 +46,12 @@
5546
<Compile Include="ServiceProxyRegistrationBehavior.cs" />
5647
</ItemGroup>
5748
<ItemGroup>
58-
<None Include="packages.config" />
49+
<PackageReference Include="iQuarc.AppBoot">
50+
<Version>2.1.2</Version>
51+
</PackageReference>
52+
<PackageReference Include="iQuarc.SystemEx">
53+
<Version>1.1.0</Version>
54+
</PackageReference>
5955
</ItemGroup>
6056
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6157
</Project>

‎InterProcessCommunication/TradingApp/AppBootEx/ServiceProxyRegistrationBehavior.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public sealed class ServiceProxyRegistrationBehavior : IRegistrationBehavior
1111
public IEnumerable<ServiceInfo> GetServicesFrom(Type type)
1212
{
1313
IEnumerable<ServiceProxyAttribute> attributes = type.GetAttributes<ServiceProxyAttribute>(false);
14-
return attributes.Select(a => new ServiceInfo(a.ExportType, type, string.Empty, Lifetime.AlwaysNew));
14+
return attributes.Select(a => new ServiceInfo(a.ExportType, type, null, Lifetime.AlwaysNew));
1515
}
1616
}
1717
}

‎InterProcessCommunication/TradingApp/AppBootEx/packages.config‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎InterProcessCommunication/TradingApp/ConsoleHost/App.config‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
55
</startup>
66
<appSettings>
77
<add key="BaseAddress" value="http://localhost:9000/"/>
88

9-
<add key="IPortfolioService_Address" value="http://localhost:9001/"/>
10-
<add key="IQuotationService_Address" value="http://localhost:9002/"/>
11-
<add key="IOrdersService_Address" value="http://localhost:9003/"/>
9+
<add key="IPortfolioService_Address" value="http://localhost:9001/" />
10+
<add key="IQuotationService_Address" value="http://localhost:9002/" />
11+
<add key="IOrdersService_Address" value="http://localhost:9003/" />
1212
</appSettings>
13+
<runtime>
14+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
15+
<dependentAssembly>
16+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
17+
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
18+
</dependentAssembly>
19+
<dependentAssembly>
20+
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
21+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
22+
</dependentAssembly>
23+
</assemblyBinding>
24+
</runtime>
1325
</configuration>

‎InterProcessCommunication/TradingApp/ConsoleHost/ConsoleHost.csproj‎

Lines changed: 26 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -33,58 +33,9 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="iQuarc.AppBoot, Version=2.0.3.2, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\iQuarc.AppBoot.2.0.3-disposables002\lib\net45\iQuarc.AppBoot.dll</HintPath>
38-
</Reference>
39-
<Reference Include="iQuarc.AppBoot.Unity, Version=2.0.3.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\iQuarc.AppBoot.Unity.2.0.3\lib\net45\iQuarc.AppBoot.Unity.dll</HintPath>
41-
</Reference>
42-
<Reference Include="iQuarc.AppBoot.WebApi, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\iQuarc.AppBoot.WebApi.2.0.2\lib\net45\iQuarc.AppBoot.WebApi.dll</HintPath>
44-
</Reference>
45-
<Reference Include="iQuarc.SystemEx, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\iQuarc.SystemEx.1.0.0.0\lib\net40\iQuarc.SystemEx.dll</HintPath>
47-
</Reference>
48-
<Reference Include="Microsoft.Owin, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Microsoft.Owin.2.0.2\lib\net45\Microsoft.Owin.dll</HintPath>
50-
</Reference>
51-
<Reference Include="Microsoft.Owin.Host.HttpListener, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52-
<HintPath>..\packages\Microsoft.Owin.Host.HttpListener.2.0.2\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
53-
</Reference>
54-
<Reference Include="Microsoft.Owin.Hosting, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55-
<HintPath>..\packages\Microsoft.Owin.Hosting.2.0.2\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
56-
</Reference>
57-
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
58-
<HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
59-
</Reference>
60-
<Reference Include="Microsoft.Practices.Unity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
61-
<HintPath>..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.dll</HintPath>
62-
</Reference>
63-
<Reference Include="Microsoft.Practices.Unity.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
64-
<HintPath>..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.Configuration.dll</HintPath>
65-
</Reference>
66-
<Reference Include="Microsoft.Practices.Unity.RegistrationByConvention, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
67-
<HintPath>..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
68-
</Reference>
69-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
70-
<HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
71-
<Private>True</Private>
72-
</Reference>
73-
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
74-
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
75-
</Reference>
7636
<Reference Include="System" />
7737
<Reference Include="System.Configuration" />
7838
<Reference Include="System.Core" />
79-
<Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80-
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
81-
</Reference>
82-
<Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
83-
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
84-
</Reference>
85-
<Reference Include="System.Web.Http.Owin, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
86-
<HintPath>..\packages\Microsoft.AspNet.WebApi.Owin.5.2.3\lib\net45\System.Web.Http.Owin.dll</HintPath>
87-
</Reference>
8839
<Reference Include="System.Xml.Linq" />
8940
<Reference Include="System.Data.DataSetExtensions" />
9041
<Reference Include="Microsoft.CSharp" />
@@ -131,7 +82,6 @@
13182
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
13283
</None>
13384
<None Include="App.config" />
134-
<None Include="packages.config" />
13585
</ItemGroup>
13686
<ItemGroup>
13787
<ProjectReference Include="..\AppBootEx\AppBootEx.csproj">
@@ -143,7 +93,32 @@
14393
<Name>Contracts</Name>
14494
</ProjectReference>
14595
</ItemGroup>
146-
<ItemGroup />
96+
<ItemGroup>
97+
<PackageReference Include="CommonServiceLocator">
98+
<Version>2.0.7</Version>
99+
</PackageReference>
100+
<PackageReference Include="iQuarc.AppBoot">
101+
<Version>2.1.2</Version>
102+
</PackageReference>
103+
<PackageReference Include="iQuarc.AppBoot.Unity">
104+
<Version>2.1.2</Version>
105+
</PackageReference>
106+
<PackageReference Include="iQuarc.AppBoot.WebApi">
107+
<Version>2.1.2</Version>
108+
</PackageReference>
109+
<PackageReference Include="iQuarc.SystemEx">
110+
<Version>1.1.0</Version>
111+
</PackageReference>
112+
<PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost">
113+
<Version>5.3.0</Version>
114+
</PackageReference>
115+
<PackageReference Include="Newtonsoft.Json">
116+
<Version>13.0.3</Version>
117+
</PackageReference>
118+
<PackageReference Include="Unity">
119+
<Version>5.11.10</Version>
120+
</PackageReference>
121+
</ItemGroup>
147122
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
148123
<PropertyGroup>
149124
<PostBuildEvent>call "$(TargetDir).Deployment\Deploy-HostAll.bat" "$(TargetDir).Deployment\"

‎InterProcessCommunication/TradingApp/ConsoleHost/Program.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
using System;
22
using System.Configuration;
3-
using System.Threading;
3+
using CommonServiceLocator;
44
using Contracts.Infrastructure;
55
using iQuarc.SystemEx;
66
using Microsoft.Owin.Hosting;
7-
using Microsoft.Practices.ServiceLocation;
87

98
namespace ConsoleHost
109
{

‎InterProcessCommunication/TradingApp/ConsoleUi/ConsoleUi.csproj‎

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,27 +33,6 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="iQuarc.AppBoot, Version=2.0.3.2, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\iQuarc.AppBoot.2.0.3-disposables002\lib\net45\iQuarc.AppBoot.dll</HintPath>
38-
</Reference>
39-
<Reference Include="iQuarc.AppBoot.Unity, Version=2.0.3.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\iQuarc.AppBoot.Unity.2.0.3\lib\net45\iQuarc.AppBoot.Unity.dll</HintPath>
41-
</Reference>
42-
<Reference Include="iQuarc.SystemEx, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\iQuarc.SystemEx.1.0.0.0\lib\net40\iQuarc.SystemEx.dll</HintPath>
44-
</Reference>
45-
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46-
<HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
47-
</Reference>
48-
<Reference Include="Microsoft.Practices.Unity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.dll</HintPath>
50-
</Reference>
51-
<Reference Include="Microsoft.Practices.Unity.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
52-
<HintPath>..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.Configuration.dll</HintPath>
53-
</Reference>
54-
<Reference Include="Microsoft.Practices.Unity.RegistrationByConvention, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
55-
<HintPath>..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
56-
</Reference>
5736
<Reference Include="System" />
5837
<Reference Include="System.Core" />
5938
<Reference Include="System.Web" />
@@ -74,7 +53,6 @@
7453
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7554
</None>
7655
<None Include="App.config" />
77-
<None Include="packages.config" />
7856
</ItemGroup>
7957
<ItemGroup>
8058
<ProjectReference Include="..\AppBootEx\AppBootEx.csproj">
@@ -86,6 +64,23 @@
8664
<Name>Contracts</Name>
8765
</ProjectReference>
8866
</ItemGroup>
67+
<ItemGroup>
68+
<PackageReference Include="CommonServiceLocator">
69+
<Version>2.0.7</Version>
70+
</PackageReference>
71+
<PackageReference Include="iQuarc.AppBoot">
72+
<Version>2.1.2</Version>
73+
</PackageReference>
74+
<PackageReference Include="iQuarc.AppBoot.Unity">
75+
<Version>2.1.2</Version>
76+
</PackageReference>
77+
<PackageReference Include="iQuarc.SystemEx">
78+
<Version>1.1.0</Version>
79+
</PackageReference>
80+
<PackageReference Include="Unity">
81+
<Version>5.11.10</Version>
82+
</PackageReference>
83+
</ItemGroup>
8984
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9085
<PropertyGroup>
9186
<PostBuildEvent>call "$(TargetDir).Deployment\Deploy-ConsoleUi-ProxyOnly.bat" "$(TargetDir).Deployment\"</PostBuildEvent>

‎InterProcessCommunication/TradingApp/ConsoleUi/Program.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
using System.Reflection;
77
using System.Web;
88
using AppBootEx;
9+
using CommonServiceLocator;
910
using Contracts.Infrastructure;
1011
using Contracts.Portfolio.Services;
1112
using Contracts.Quotations.Services;
1213
using Contracts.Sales.Services;
1314
using iQuarc.AppBoot;
1415
using iQuarc.AppBoot.Unity;
1516
using iQuarc.SystemEx;
16-
using Microsoft.Practices.ServiceLocation;
1717

1818
namespace ConsoleUi
1919
{
@@ -52,9 +52,9 @@ private static IEnumerable<Assembly> GetApplicationAssemblies()
5252
if (filename != null && (filename.StartsWith("Contracts")
5353
|| filename.StartsWith("Proxies.")
5454
|| filename.StartsWith("Infra.")
55-
|| filename.StartsWith("Portfolio.")
56-
|| filename.StartsWith("Quotations.")
57-
|| filename.StartsWith("Sales.")
55+
//|| filename.StartsWith("Portfolio.")
56+
//|| filename.StartsWith("Quotations.")
57+
//|| filename.StartsWith("Sales.")
5858
))
5959
{
6060
Assembly assembly = Assembly.LoadFile(dll);

‎InterProcessCommunication/TradingApp/ConsoleUi/packages.config‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎InterProcessCommunication/TradingApp/Infrastructure/Common/Infra.Hosts/Infra.Hosts.csproj‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,6 @@
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<ItemGroup>
34-
<Reference Include="iQuarc.AppBoot, Version=2.0.3.2, Culture=neutral, processorArchitecture=MSIL">
35-
<HintPath>..\..\..\packages\iQuarc.AppBoot.2.0.3-disposables002\lib\net45\iQuarc.AppBoot.dll</HintPath>
36-
</Reference>
37-
<Reference Include="iQuarc.SystemEx, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\..\..\packages\iQuarc.SystemEx.1.0.0.0\lib\net40\iQuarc.SystemEx.dll</HintPath>
39-
</Reference>
40-
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
41-
<HintPath>..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
42-
</Reference>
4334
<Reference Include="System" />
4435
<Reference Include="System.Core" />
4536
<Reference Include="System.Xml.Linq" />
@@ -53,14 +44,22 @@
5344
<Compile Include="ModulesHostContainer.cs" />
5445
<Compile Include="Properties\AssemblyInfo.cs" />
5546
</ItemGroup>
56-
<ItemGroup>
57-
<None Include="packages.config" />
58-
</ItemGroup>
5947
<ItemGroup>
6048
<ProjectReference Include="..\..\..\Modules\_Contracts\Contracts.csproj">
6149
<Project>{19297424-954D-42F5-AC38-6F22A25EA682}</Project>
6250
<Name>Contracts</Name>
6351
</ProjectReference>
6452
</ItemGroup>
53+
<ItemGroup>
54+
<PackageReference Include="CommonServiceLocator">
55+
<Version>2.0.7</Version>
56+
</PackageReference>
57+
<PackageReference Include="iQuarc.AppBoot">
58+
<Version>2.1.2</Version>
59+
</PackageReference>
60+
<PackageReference Include="iQuarc.SystemEx">
61+
<Version>1.1.0</Version>
62+
</PackageReference>
63+
</ItemGroup>
6564
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6665
</Project>

0 commit comments

Comments
 (0)