Skip to content

Commit 4560632

Browse files
committed
Merge branch 'splitting-systemsrx'
2 parents 8e24db8 + f919c27 commit 4560632

File tree

150 files changed

+71
-5460
lines changed

Some content is hidden

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

150 files changed

+71
-5460
lines changed

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 4.1.{build}
1+
version: 5.0.{build}
22
branches:
33
only:
44
- master

build/pack.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set version=3.2.0
2-
dotnet pack ../src/EcsRx.MicroRx -c Release -o ../../_dist /p:version=%version%
2+
dotnet pack ../src/SystemsRx.MicroRx -c Release -o ../../_dist /p:version=%version%
33
dotnet pack ../src/SystemsRx -c Release -o ../../_dist /p:version=%version%
44
dotnet pack ../src/SystemsRx.Infrastructure -c Release -o ../../_dist /p:version=%version%
55
dotnet pack ../src/EcsRx -c Release -o ../../_dist /p:version=%version%

src/EcsRx.Examples/Application/EcsRxConsoleApplication.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using SystemsRx.Infrastructure.Dependencies;
2+
using SystemsRx.Infrastructure.Ninject;
23
using EcsRx.Infrastructure;
3-
using EcsRx.Infrastructure.Ninject;
44
using EcsRx.Plugins.Batching;
55
using EcsRx.Plugins.Computeds;
66
using EcsRx.Plugins.Persistence;

src/EcsRx.Examples/EcsRx.Examples.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<PackageReference Include="Ninject" Version="3.3.4" />
1212
<PackageReference Include="Persistity.Endpoints.Http" Version="1.1.30" />
1313
<PackageReference Include="System.Reactive" Version="5.0.0" />
14+
<PackageReference Include="SystemsRx.Infrastructure.Ninject" Version="5.0.2" />
15+
<PackageReference Include="SystemsRx.ReactiveData" Version="5.0.2" />
1416
</ItemGroup>
1517
<ItemGroup>
1618
<ProjectReference Include="..\EcsRx.Infrastructure.Ninject\EcsRx.Infrastructure.Ninject.csproj" />

src/EcsRx.Examples/ExampleApps/HealthExample/Blueprints/EnemyBlueprint.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using EcsRx.Blueprints;
1+
using SystemsRx.ReactiveData;
2+
using EcsRx.Blueprints;
23
using EcsRx.Entities;
34
using EcsRx.Examples.ExampleApps.HealthExample.Components;
45
using EcsRx.Extensions;
5-
using EcsRx.ReactiveData;
66

77
namespace EcsRx.Examples.ExampleApps.HealthExample.Blueprints
88
{

src/EcsRx.Examples/ExampleApps/HealthExample/Components/HealthComponent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
2+
using SystemsRx.ReactiveData;
23
using EcsRx.Components;
3-
using EcsRx.ReactiveData;
44

55
namespace EcsRx.Examples.ExampleApps.HealthExample.Components
66
{

src/EcsRx.Examples/ExampleApps/LoadingEntityDatabase/LoadingEntityDatabaseApplication.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System;
22
using SystemsRx.Infrastructure.Dependencies;
33
using SystemsRx.Infrastructure.Extensions;
4+
using SystemsRx.Infrastructure.Ninject;
45
using EcsRx.Examples.ExampleApps.LoadingEntityDatabase.Blueprints;
56
using EcsRx.Examples.ExampleApps.LoadingEntityDatabase.Modules;
6-
using EcsRx.Infrastructure.Ninject;
77
using EcsRx.Plugins.Persistence;
88
using EcsRx.Plugins.Persistence.Extensions;
99

src/EcsRx.Examples/ExampleApps/Performance/Modules/CustomFrameworkModule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
using EcsRx.Entities;
1515
using EcsRx.Examples.ExampleApps.Performance.Components.Specific;
1616
using EcsRx.Groups.Observable;
17-
using EcsRx.MicroRx.Events;
17+
using SystemsRx.MicroRx.Events;
1818

1919
namespace EcsRx.Examples.ExampleApps.Performance.Modules
2020
{

src/EcsRx.Infrastructure.Ninject/EcsRx.Infrastructure.Ninject.csproj

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

src/EcsRx.Infrastructure.Ninject/NinjectDependencyContainer.cs

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

src/EcsRx.Infrastructure/EcsRx.Infrastructure.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
</PropertyGroup>
1212
<ItemGroup>
1313
<ProjectReference Include="..\EcsRx\EcsRx.csproj" />
14-
<ProjectReference Include="..\SystemsRx.Infrastructure\SystemsRx.Infrastructure.csproj" />
14+
</ItemGroup>
15+
<ItemGroup>
16+
<PackageReference Include="SystemsRx.Infrastructure" Version="5.0.2" />
1517
</ItemGroup>
1618
</Project>

0 commit comments

Comments
 (0)