Merge pull request #92 from KuraiAndras/develop

KuraiAndras · web-flow · commit 15e3fb2bf419 · 2022-03-02T15:44:02.000+01:00
8.0.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 8.0.0
+- Unity lifetime clears scopes
+
 # 7.1.0
 - Add appsettings file generation template buttons
 
diff --git a/MainProject/Directory.Build.props b/MainProject/Directory.Build.props
@@ -3,7 +3,7 @@
     <LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>
 
-    <CurrentVersion>7.1.0</CurrentVersion>
+    <CurrentVersion>8.0.0</CurrentVersion>
 
     <Version>$(CurrentVersion)</Version>
     <PakcageVersion>$(CurrentVersion)</PakcageVersion>
diff --git a/MainProject/Injecter/IScopeStore.cs b/MainProject/Injecter/IScopeStore.cs
@@ -7,5 +7,6 @@ public interface IScopeStore
         IServiceScope CreateScope<T>(T owner) where T : notnull;
         void DisposeScope<T>(T owner) where T : notnull;
         IServiceScope? GetScope<T>(T owner) where T : notnull;
+        void ClearAllScopes();
     }
 }
diff --git a/MainProject/Injecter/ScopeStore.cs b/MainProject/Injecter/ScopeStore.cs
@@ -40,5 +40,15 @@ public void DisposeScope<T>(T owner) where T : notnull
 
             _scopes.Remove(owner);
         }
+
+        public void ClearAllScopes()
+        {
+            foreach (var scope in _scopes)
+            {
+                scope.Value.Dispose();
+            }
+
+            _scopes.Clear();
+        }
     }
 }
diff --git a/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/AppInstallerTemplateItem.cs b/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/AppInstallerTemplateItem.cs
@@ -54,6 +54,7 @@ void OnQuitting()
             {
                 Log.CloseAndFlush();
 
+                host.Dispose();
                 host = null!;
 
                 Application.quitting -= OnQuitting;
@@ -137,6 +138,7 @@ void OnQuitting()
             {
                 Log.CloseAndFlush();
 
+                host.Dispose();
                 host = null!;
 
                 Application.quitting -= OnQuitting;
diff --git a/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/Injecter.Hosting.Unity.asmdef b/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/Injecter.Hosting.Unity.asmdef
@@ -1,5 +1,6 @@
 {
     "name": "Injecter.Hosting.Unity",
+    "rootNamespace": "",
     "references": [
         "Injecter.Unity"
     ],
@@ -16,7 +17,8 @@
         "Microsoft.Extensions.Configuration.Abstractions.dll",
         "Microsoft.Extensions.Configuration.EnvironmentVariables.dll",
         "Microsoft.Extensions.Configuration.CommandLine.dll",
-        "Microsoft.Extensions.Configuration.Json.dll"
+        "Microsoft.Extensions.Configuration.Json.dll",
+        "Injecter.dll"
     ],
     "autoReferenced": true,
     "defineConstraints": [],
diff --git a/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/UnityLifetime.cs b/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/UnityLifetime.cs
@@ -21,25 +21,30 @@ namespace Injecter.Hosting.Unity
     public sealed class UnityLifetime : IHostLifetime, IDisposable
     {
         private readonly ManualResetEvent _shutdownBlock = new ManualResetEvent(false);
+        private readonly IScopeStore _scopeStore;
+
         private CancellationTokenRegistration _applicationStartedRegistration;
         private CancellationTokenRegistration _applicationStoppingRegistration;
 
         public UnityLifetime(
+            IScopeStore scopeStore,
             IOptions<UnityLifeTimeOptions> options,
             IHostEnvironment environment,
             IHostApplicationLifetime applicationLifetime,
             IOptions<HostOptions> hostOptions)
-            : this(options, environment, applicationLifetime, hostOptions, NullLoggerFactory.Instance)
+            : this(scopeStore, options, environment, applicationLifetime, hostOptions, NullLoggerFactory.Instance)
         {
         }
 
         public UnityLifetime(
+            IScopeStore scopeStore,
             IOptions<UnityLifeTimeOptions> options,
             IHostEnvironment environment,
             IHostApplicationLifetime applicationLifetime,
             IOptions<HostOptions> hostOptions,
             ILoggerFactory loggerFactory)
         {
+            _scopeStore = scopeStore;
             Options = options?.Value ?? throw new ArgumentNullException(nameof(options));
             Environment = environment ?? throw new ArgumentNullException(nameof(environment));
             ApplicationLifetime = applicationLifetime ?? throw new ArgumentNullException(nameof(applicationLifetime));
@@ -103,7 +108,11 @@ private void OnProcessExit(object sender, EventArgs e)
             System.Environment.ExitCode = 0;
         }
 
-        private void OnUnityQuitting() => ApplicationLifetime.StopApplication();
+        private void OnUnityQuitting()
+        {
+            _scopeStore.ClearAllScopes();
+            ApplicationLifetime.StopApplication();
+        }
 
 #if UNITY_EDITOR
         private void OnUnityPlayModeStateChanged(PlayModeStateChange state)
diff --git a/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/package.json b/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/package.json
@@ -1,6 +1,6 @@
 {
     "name": "com.injecter.hosting.unity",
-    "version": "7.1.0",
+    "version": "8.0.0",
     "displayName": "Injecter.Hosting.Unity",
     "license": "MIT",
     "licensesUrl": "https://github.com/KuraiAndras/Injecter/blob/master/LICENSE.md",
@@ -13,6 +13,6 @@
         "url": "https://github.com/KuraiAndras/Injecter"
     },
     "dependencies": {
-        "com.injecter.unity": "7.1.0"
+        "com.injecter.unity": "8.0.0"
     }
 }
diff --git a/UnityProject/Injecter.Unity/Assets/Injecter.Unity/InjectedMonoBehaviour.cs b/UnityProject/Injecter.Unity/Assets/Injecter.Unity/InjectedMonoBehaviour.cs
@@ -11,6 +11,7 @@ public abstract class InjectedMonoBehaviour : MonoBehaviour
         protected InjectedMonoBehaviour(bool createScopes = false) => _createScopes = createScopes;
 
         protected IServiceScope? Scope { get; private set; }
+        protected IScopeStore? ScopeStore { get; private set; }
 
         protected virtual void Awake()
         {
@@ -21,15 +22,17 @@ protected virtual void Awake()
             }
 
             Scope = CompositionRoot.ServiceProvider.GetRequiredService<IInjecter>().InjectIntoType(GetType(), this, _createScopes);
+            ScopeStore = Scope?.ServiceProvider.GetService<IScopeStore>();
         }
 
         protected virtual void OnDestroy()
         {
-            if (Scope is null) return;
+            if (Scope is null || ScopeStore is null) return;
 
-            Scope.ServiceProvider.GetRequiredService<IScopeStore>().DisposeScope(this);
+            ScopeStore.DisposeScope(this);
 
             Scope = null;
+            ScopeStore = null;
         }
     }
 }
diff --git a/UnityProject/Injecter.Unity/Assets/Injecter.Unity/package.json b/UnityProject/Injecter.Unity/Assets/Injecter.Unity/package.json
@@ -1,6 +1,6 @@
 {
     "name": "com.injecter.unity",
-    "version": "7.1.0",
+    "version": "8.0.0",
     "displayName": "Injecter.Unity",
     "license": "MIT",
     "licensesUrl": "https://github.com/KuraiAndras/Injecter/blob/master/LICENSE.md",
diff --git a/UnityProject/Injecter.Unity/ProjectSettings/ProjectVersion.txt b/UnityProject/Injecter.Unity/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.3.29f1
-m_EditorVersionWithRevision: 2020.3.29f1 (2ff179115da0)
+m_EditorVersion: 2020.3.30f1
+m_EditorVersionWithRevision: 2020.3.30f1 (1fb1bf06830e)

-Original file line number
+Diff line change
@@ @@ -1,3 +1,6 @@ @@
 +# 8.0.0
 +- Unity lifetime clears scopes
++
 # 7.1.0
 - Add appsettings file generation template buttons
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,6 @@ public interface IScopeStore`
`7`	`7`	`IServiceScope CreateScope<T>(T owner) where T : notnull;`
`8`	`8`	`void DisposeScope<T>(T owner) where T : notnull;`
`9`	`9`	`IServiceScope? GetScope<T>(T owner) where T : notnull;`
	`10`	`+ void ClearAllScopes();`
`10`	`11`	`}`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,5 +40,15 @@ public void DisposeScope<T>(T owner) where T : notnull`
`40`	`40`
`41`	`41`	`_scopes.Remove(owner);`
`42`	`42`	`}`
	`43`	`+`
	`44`	`+ public void ClearAllScopes()`
	`45`	`+ {`
	`46`	`+ foreach (var scope in _scopes)`
	`47`	`+ {`
	`48`	`+ scope.Value.Dispose();`
	`49`	`+ }`
	`50`	`+`
	`51`	`+ _scopes.Clear();`
	`52`	`+ }`
`43`	`53`	`}`
`44`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ void OnQuitting()`
`54`	`54`	`{`
`55`	`55`	`Log.CloseAndFlush();`
`56`	`56`
	`57`	`+ host.Dispose();`
`57`	`58`	`host = null!;`
`58`	`59`
`59`	`60`	`Application.quitting -= OnQuitting;`
`@@ -137,6 +138,7 @@ void OnQuitting()`
`137`	`138`	`{`
`138`	`139`	`Log.CloseAndFlush();`
`139`	`140`
	`141`	`+ host.Dispose();`
`140`	`142`	`host = null!;`
`141`	`143`
`142`	`144`	`Application.quitting -= OnQuitting;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "com.injecter.hosting.unity",`
`3`		`- "version": "7.1.0",`
	`3`	`+ "version": "8.0.0",`
`4`	`4`	`"displayName": "Injecter.Hosting.Unity",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"licensesUrl": "https://github.com/KuraiAndras/Injecter/blob/master/LICENSE.md",`
`@@ -13,6 +13,6 @@`
`13`	`13`	`"url": "https://github.com/KuraiAndras/Injecter"`
`14`	`14`	`},`
`15`	`15`	`"dependencies": {`
`16`		`- "com.injecter.unity": "7.1.0"`
	`16`	`+ "com.injecter.unity": "8.0.0"`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ public abstract class InjectedMonoBehaviour : MonoBehaviour`
`11`	`11`	`protected InjectedMonoBehaviour(bool createScopes = false) => _createScopes = createScopes;`
`12`	`12`
`13`	`13`	`protected IServiceScope? Scope { get; private set; }`
	`14`	`+ protected IScopeStore? ScopeStore { get; private set; }`
`14`	`15`
`15`	`16`	`protected virtual void Awake()`
`16`	`17`	`{`
`@@ -21,15 +22,17 @@ protected virtual void Awake()`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`Scope = CompositionRoot.ServiceProvider.GetRequiredService<IInjecter>().InjectIntoType(GetType(), this, _createScopes);`
	`25`	`+ ScopeStore = Scope?.ServiceProvider.GetService<IScopeStore>();`
`24`	`26`	`}`
`25`	`27`
`26`	`28`	`protected virtual void OnDestroy()`
`27`	`29`	`{`
`28`		`- if (Scope is null) return;`
	`30`	`+ if (Scope is null \|\| ScopeStore is null) return;`
`29`	`31`
`30`		`- Scope.ServiceProvider.GetRequiredService<IScopeStore>().DisposeScope(this);`
	`32`	`+ ScopeStore.DisposeScope(this);`
`31`	`33`
`32`	`34`	`Scope = null;`
	`35`	`+ ScopeStore = null;`
`33`	`36`	`}`
`34`	`37`	`}`
`35`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "com.injecter.unity",`
`3`		`- "version": "7.1.0",`
	`3`	`+ "version": "8.0.0",`
`4`	`4`	`"displayName": "Injecter.Unity",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"licensesUrl": "https://github.com/KuraiAndras/Injecter/blob/master/LICENSE.md",`