diff --git a/appveyor.yml b/appveyor.yml index 37cf2bd6..395e457f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 4.0.{build} +version: 4.1.{build} branches: only: - master diff --git a/src/EcsRx.Examples/ExampleApps/Performance/Modules/CustomFrameworkModule.cs b/src/EcsRx.Examples/ExampleApps/Performance/Modules/CustomFrameworkModule.cs index 08cc8b43..283a90a2 100644 --- a/src/EcsRx.Examples/ExampleApps/Performance/Modules/CustomFrameworkModule.cs +++ b/src/EcsRx.Examples/ExampleApps/Performance/Modules/CustomFrameworkModule.cs @@ -5,6 +5,7 @@ using SystemsRx.Executor.Handlers.Conventional; using SystemsRx.Infrastructure.Dependencies; using SystemsRx.Infrastructure.Extensions; +using SystemsRx.Pools; using EcsRx.Collections; using EcsRx.Collections.Database; using EcsRx.Collections.Entity; @@ -14,7 +15,6 @@ using EcsRx.Examples.ExampleApps.Performance.Components.Specific; using EcsRx.Groups.Observable; using EcsRx.MicroRx.Events; -using EcsRx.Pools; namespace EcsRx.Examples.ExampleApps.Performance.Modules { diff --git a/src/EcsRx.Infrastructure/Modules/EcsRxInfrastructureModule.cs b/src/EcsRx.Infrastructure/Modules/EcsRxInfrastructureModule.cs index a05b4036..03ba6c28 100644 --- a/src/EcsRx.Infrastructure/Modules/EcsRxInfrastructureModule.cs +++ b/src/EcsRx.Infrastructure/Modules/EcsRxInfrastructureModule.cs @@ -1,6 +1,7 @@ using SystemsRx.Executor.Handlers; using SystemsRx.Infrastructure.Dependencies; using SystemsRx.Infrastructure.Extensions; +using SystemsRx.Pools; using EcsRx.Collections; using EcsRx.Collections.Database; using EcsRx.Collections.Entity; @@ -8,7 +9,6 @@ using EcsRx.Components.Lookups; using EcsRx.Entities; using EcsRx.Groups.Observable; -using EcsRx.Pools; using EcsRx.Systems.Handlers; namespace EcsRx.Infrastructure.Modules diff --git a/src/EcsRx.Plugins.Computeds/ComputedFromData.cs b/src/EcsRx.Plugins.Computeds/ComputedFromData.cs index 26bb846e..0cedc358 100644 --- a/src/EcsRx.Plugins.Computeds/ComputedFromData.cs +++ b/src/EcsRx.Plugins.Computeds/ComputedFromData.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using SystemsRx.Extensions; -using EcsRx.Extensions; using EcsRx.MicroRx.Extensions; using EcsRx.MicroRx.Subjects; diff --git a/src/EcsRx.Plugins.Views/Pooling/IViewPool.cs b/src/EcsRx.Plugins.Views/Pooling/IViewPool.cs index 80e13e96..fa9b9d9c 100644 --- a/src/EcsRx.Plugins.Views/Pooling/IViewPool.cs +++ b/src/EcsRx.Plugins.Views/Pooling/IViewPool.cs @@ -1,4 +1,4 @@ -using EcsRx.Pools; +using SystemsRx.Pools; namespace EcsRx.Plugins.Views.Pooling { diff --git a/src/EcsRx.Tests/EcsRx/Pools/IdPoolTests.cs b/src/EcsRx.Tests/EcsRx/Pools/IdPoolTests.cs index 35379922..a54cbb2e 100644 --- a/src/EcsRx.Tests/EcsRx/Pools/IdPoolTests.cs +++ b/src/EcsRx.Tests/EcsRx/Pools/IdPoolTests.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using EcsRx.Pools; +using SystemsRx.Pools; using Xunit; namespace EcsRx.Tests.EcsRx.Pools diff --git a/src/EcsRx.Tests/EcsRx/Pools/IndexPoolTests.cs b/src/EcsRx.Tests/EcsRx/Pools/IndexPoolTests.cs index 8b7a923a..2df88a7a 100644 --- a/src/EcsRx.Tests/EcsRx/Pools/IndexPoolTests.cs +++ b/src/EcsRx.Tests/EcsRx/Pools/IndexPoolTests.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using EcsRx.Pools; +using SystemsRx.Pools; using Xunit; namespace EcsRx.Tests.EcsRx.Pools diff --git a/src/EcsRx.Tests/Sanity/SanityTests.cs b/src/EcsRx.Tests/Sanity/SanityTests.cs index 42abd261..437264e2 100644 --- a/src/EcsRx.Tests/Sanity/SanityTests.cs +++ b/src/EcsRx.Tests/Sanity/SanityTests.cs @@ -5,6 +5,7 @@ using SystemsRx.Executor; using SystemsRx.Executor.Handlers; using SystemsRx.Executor.Handlers.Conventional; +using SystemsRx.Pools; using SystemsRx.Threading; using EcsRx.Collections; using EcsRx.Collections.Database; @@ -20,7 +21,6 @@ using EcsRx.Plugins.ReactiveSystems.Handlers; using EcsRx.Plugins.Views.Components; using EcsRx.Plugins.Views.Systems; -using EcsRx.Pools; using EcsRx.ReactiveData; using EcsRx.ReactiveData.Collections; using EcsRx.ReactiveData.Extensions; diff --git a/src/EcsRx/Components/ComponentPool.cs b/src/EcsRx/Components/ComponentPool.cs index b8279a38..e695690f 100644 --- a/src/EcsRx/Components/ComponentPool.cs +++ b/src/EcsRx/Components/ComponentPool.cs @@ -1,7 +1,7 @@ using System; using System.Collections; +using SystemsRx.Pools; using EcsRx.MicroRx.Subjects; -using EcsRx.Pools; namespace EcsRx.Components { diff --git a/src/EcsRx/Entities/DefaultEntityFactory.cs b/src/EcsRx/Entities/DefaultEntityFactory.cs index 8c5d985e..5f79ac61 100644 --- a/src/EcsRx/Entities/DefaultEntityFactory.cs +++ b/src/EcsRx/Entities/DefaultEntityFactory.cs @@ -1,7 +1,7 @@ using System; +using SystemsRx.Pools; using EcsRx.Components.Database; using EcsRx.Components.Lookups; -using EcsRx.Pools; namespace EcsRx.Entities { diff --git a/src/EcsRx/Pools/IIdPool.cs b/src/SystemsRx/Pools/IIdPool.cs similarity index 81% rename from src/EcsRx/Pools/IIdPool.cs rename to src/SystemsRx/Pools/IIdPool.cs index 22c6ed72..d08eae44 100644 --- a/src/EcsRx/Pools/IIdPool.cs +++ b/src/SystemsRx/Pools/IIdPool.cs @@ -1,4 +1,4 @@ -namespace EcsRx.Pools +namespace SystemsRx.Pools { public interface IIdPool : IPool { diff --git a/src/EcsRx/Pools/IPool.cs b/src/SystemsRx/Pools/IPool.cs similarity index 95% rename from src/EcsRx/Pools/IPool.cs rename to src/SystemsRx/Pools/IPool.cs index a40ab711..b20a5369 100644 --- a/src/EcsRx/Pools/IPool.cs +++ b/src/SystemsRx/Pools/IPool.cs @@ -1,4 +1,4 @@ -namespace EcsRx.Pools +namespace SystemsRx.Pools { public interface IPool { diff --git a/src/EcsRx/Pools/IdPool.cs b/src/SystemsRx/Pools/IdPool.cs similarity index 98% rename from src/EcsRx/Pools/IdPool.cs rename to src/SystemsRx/Pools/IdPool.cs index 9776500c..86222012 100644 --- a/src/EcsRx/Pools/IdPool.cs +++ b/src/SystemsRx/Pools/IdPool.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace EcsRx.Pools +namespace SystemsRx.Pools { public class IdPool : IIdPool { diff --git a/src/EcsRx/Pools/IndexPool.cs b/src/SystemsRx/Pools/IndexPool.cs similarity index 98% rename from src/EcsRx/Pools/IndexPool.cs rename to src/SystemsRx/Pools/IndexPool.cs index 37107658..23cd3bd6 100644 --- a/src/EcsRx/Pools/IndexPool.cs +++ b/src/SystemsRx/Pools/IndexPool.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace EcsRx.Pools +namespace SystemsRx.Pools { public class IndexPool : IPool {