Moved to .netstandard 2.1, .net 472, fixed issue with FrameworkModule

An issue was reported where not all components from plugins were being loaded ahead of time, this has been fixed so component lookups by default will be generated at the last possible point in time (when the executor is created).
EcsRx · Mar 3, 2020 · 50dd038 · 50dd038
1 parent 58d1172
commit 50dd038
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 19 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 3.5.{build}
+version: 3.6.{build}
 branches:
   only:
   - master

diff --git a/src/EcsRx.Examples/EcsRx.Examples.csproj b/src/EcsRx.Examples/EcsRx.Examples.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>

diff --git a/src/EcsRx.Infrastructure.Ninject/EcsRx.Infrastructure.Ninject.csproj b/src/EcsRx.Infrastructure.Ninject/EcsRx.Infrastructure.Ninject.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Version>0.0.0</Version>
-        <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+        <TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
         <Title>EcsRx.Infrastructure.Ninject</Title>
         <Authors>Grofit (LP)</Authors>
         <PackageLicenseUrl>https://github.com/ecsrx/ecsrx/blob/master/LICENSE</PackageLicenseUrl>

diff --git a/src/EcsRx.Infrastructure/EcsRx.Infrastructure.csproj b/src/EcsRx.Infrastructure/EcsRx.Infrastructure.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Version>0.0.0</Version>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
     <Title>EcsRx.Infrastructure</Title>
     <Authors>Grofit (LP)</Authors>
     <PackageLicenseUrl>https://github.com/ecsrx/ecsrx/blob/master/LICENSE</PackageLicenseUrl>

diff --git a/src/EcsRx.Infrastructure/Modules/FrameworkModule.cs b/src/EcsRx.Infrastructure/Modules/FrameworkModule.cs
@@ -32,14 +32,16 @@ public void Setup(IDependencyContainer container)
             container.Bind<IConventionalSystemHandler, ManualSystemHandler>();
             container.Bind<ISystemExecutor, SystemExecutor>();
             container.Bind<IObservableScheduler, DefaultObservableScheduler>();
-
-            var componentTypeAssigner = new DefaultComponentTypeAssigner();
-            var allComponents = componentTypeAssigner.GenerateComponentLookups();
-            var componentLookup = new ComponentTypeLookup(allComponents);
-
-            container.Bind<IComponentTypeAssigner>(new BindingConfiguration{ToInstance = componentTypeAssigner});
-            container.Bind<IComponentTypeLookup>(new BindingConfiguration{ToInstance = componentLookup});           
+            container.Bind<IComponentTypeAssigner, DefaultComponentTypeAssigner>();
+            container.Bind<IComponentTypeLookup>(new BindingConfiguration{ToMethod = CreateDefaultTypeLookup});           
             container.Bind<IComponentDatabase, ComponentDatabase>();
         }
+
+        private object CreateDefaultTypeLookup(IDependencyContainer container)
+        {
+            var componentTypeAssigner = container.Resolve<IComponentTypeAssigner>();
+            var allComponents = componentTypeAssigner.GenerateComponentLookups();
+            return new ComponentTypeLookup(allComponents);
+        }
     }
 }
diff --git a/src/EcsRx.MicroRx/EcsRx.MicroRx.csproj b/src/EcsRx.MicroRx/EcsRx.MicroRx.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Version>0.0.0</Version>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/src/EcsRx.Plugins.Batching/EcsRx.Plugins.Batching.csproj b/src/EcsRx.Plugins.Batching/EcsRx.Plugins.Batching.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Version>0.0.0</Version>
-        <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+        <TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
         <Title>EcsRx.Plugins.Batching</Title>
         <Authors>Grofit (LP)</Authors>
         <PackageLicenseUrl>https://github.com/ecsrx/ecsrx/blob/master/LICENSE</PackageLicenseUrl>

diff --git a/src/EcsRx.Plugins.Computeds/EcsRx.Plugins.Computeds.csproj b/src/EcsRx.Plugins.Computeds/EcsRx.Plugins.Computeds.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Version>0.0.0</Version>
-        <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+        <TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
         <Title>EcsRx.Plugins.Computeds</Title>
         <Authors>Grofit (LP)</Authors>
         <PackageLicenseUrl>https://github.com/ecsrx/ecsrx/blob/master/LICENSE</PackageLicenseUrl>

diff --git a/src/EcsRx.Plugins.ReactiveSystems/EcsRx.Plugins.ReactiveSystems.csproj b/src/EcsRx.Plugins.ReactiveSystems/EcsRx.Plugins.ReactiveSystems.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Version>0.0.0</Version>
-        <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+        <TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
         <Title>EcsRx.Plugins.ReactiveSystems</Title>
         <Authors>Grofit (LP)</Authors>
         <PackageLicenseUrl>https://github.com/ecsrx/ecsrx/blob/master/LICENSE</PackageLicenseUrl>

diff --git a/src/EcsRx.Plugins.Views/EcsRx.Plugins.Views.csproj b/src/EcsRx.Plugins.Views/EcsRx.Plugins.Views.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Version>0.0.0</Version>
-        <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+        <TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
         <Title>EcsRx.Plugins.Views</Title>
         <Authors>Grofit (LP)</Authors>
         <PackageLicenseUrl>https://github.com/ecsrx/ecsrx/blob/master/LICENSE</PackageLicenseUrl>

diff --git a/src/EcsRx.ReactiveData/EcsRx.ReactiveData.csproj b/src/EcsRx.ReactiveData/EcsRx.ReactiveData.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Version>0.0.0</Version>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
     <Title>EcsRx.ReactiveData</Title>
     <Authors>Grofit (LP)</Authors>
     <PackageLicenseUrl>https://github.com/ecsrx/ecsrx/blob/master/LICENSE</PackageLicenseUrl>

diff --git a/src/EcsRx.Tests/EcsRx.Tests.csproj b/src/EcsRx.Tests/EcsRx.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>

diff --git a/src/EcsRx/EcsRx.csproj b/src/EcsRx/EcsRx.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Version>0.0.0</Version>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
     <Title>EcsRx</Title>
     <Authors>Grofit (LP)</Authors>
     <PackageLicenseUrl>https://github.com/ecsrx/ecsrx/blob/master/LICENSE</PackageLicenseUrl>