Merge pull request #27 from Oscallo/dev

Убрана зависимость от windows.
Oscallo · Jul 25, 2024 · 94794cb · 94794cb
2 parents 455598b + 3fd8884
commit 94794cb
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 106 deletions.
diff --git a/src/Oscallo.Castle.AddonedKernel.Demo/App.xaml.cs b/src/Oscallo.Castle.AddonedKernel.Demo/App.xaml.cs
@@ -24,6 +24,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 using System.Windows;
+using Oscallo.Castle.AddonedKernel.IntegrableInterfaces;
 
 namespace Oscallo.Castle.AddonedKernel.Demo
 {

diff --git a/src/Oscallo.Castle.AddonedKernel.Demo/DI/Injector.cs b/src/Oscallo.Castle.AddonedKernel.Demo/DI/Injector.cs
@@ -15,7 +15,6 @@
 
 using Oscallo.Castle.AddonedKernel.Demo.Services;
 using Oscallo.Castle.AddonedKernel.Integrators;
-using Oscallo.Castle.AddonedKernel.LifeCyrcle;
 using Castle.MicroKernel;
 using Castle.MicroKernel.Registration;
 using Castle.Windsor;
@@ -81,16 +80,6 @@ public bool HasComponent<T>()
 			return false;
 		}
 
-		void IExiteable.OnExit(ExitEventArgs e) => Dispose();
-
-		void IStartupable.OnStartup(StartupEventArgs e) 
-		{
-			if (e.Args.Length != 0)
-			{
-				throw new NotImplementedException("Need override method");
-			}
-		}
-
 		void IRegistrar.Register(params IRegistration[] registrations)
 		{
 			foreach (IRegistration item in registrations)
@@ -119,10 +108,5 @@ public virtual void Dispose()
 		{
 			((IDisposable)this).Dispose();
 		}
-
-		public virtual void OnStartup(StartupEventArgs e)
-		{
-			((IStartupable)this).OnStartup(e);
-		}
 	}
 }
diff --git a/src/Oscallo.Castle.AddonedKernel.Demo/IntegrableClasses/MiddleOrderWithDepClass.cs b/src/Oscallo.Castle.AddonedKernel.Demo/IntegrableClasses/MiddleOrderWithDepClass.cs
@@ -15,6 +15,7 @@
 
 using Oscallo.Castle.AddonedKernel.Integrators;
 using Castle.MicroKernel.Registration;
+using Oscallo.Castle.AddonedKernel.IntegrableInterfaces;
 
 namespace Oscallo.Castle.AddonedKernel.Demo.IntegrableClasses
 {

diff --git a/src/Oscallo.Castle.AddonedKernel.Demo/IntegrableClasses/UpperOrderClass.cs b/src/Oscallo.Castle.AddonedKernel.Demo/IntegrableClasses/UpperOrderClass.cs
@@ -15,6 +15,7 @@
 
 using Oscallo.Castle.AddonedKernel.Integrators;
 using Castle.MicroKernel.Registration;
+using Oscallo.Castle.AddonedKernel.IntegrableInterfaces;
 
 namespace Oscallo.Castle.AddonedKernel.Demo.IntegrableClasses
 {

diff --git a/src/Oscallo.Castle.AddonedKernel.Demo/MVVM/IMainWindow.cs b/src/Oscallo.Castle.AddonedKernel.Demo/MVVM/IMainWindow.cs
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-using Oscallo.Castle.AddonedKernel.Integrators;
+using Oscallo.Castle.AddonedKernel.IntegrableInterfaces;
 
 namespace Oscallo.Castle.AddonedKernel.Demo.MVVM
 {

diff --git a/src/Oscallo.Castle.AddonedKernel.Demo/MainWindow.xaml.cs b/src/Oscallo.Castle.AddonedKernel.Demo/MainWindow.xaml.cs
@@ -16,6 +16,7 @@
 using Castle.MicroKernel.Registration;
 using Oscallo.Castle.AddonedKernel.Demo.MVVM;
 using Oscallo.Castle.AddonedKernel.Demo.Services;
+using Oscallo.Castle.AddonedKernel.IntegrableInterfaces;
 using Oscallo.Castle.AddonedKernel.Integrators;
 using System.Windows;
 

diff --git a/....AddonedKernel/Integrators/IIntegrator.cs → ...ernel/IntegrableInterfaces/IIntegrator.cs b/....AddonedKernel/Integrators/IIntegrator.cs → ...ernel/IntegrableInterfaces/IIntegrator.cs
@@ -13,17 +13,19 @@
  * limitations under the License.
  */
 
-namespace Oscallo.Castle.AddonedKernel.Integrators
+using Oscallo.Castle.AddonedKernel.Integrators;
+
+namespace Oscallo.Castle.AddonedKernel.IntegrableInterfaces
 {
 	/// <summary>
 	/// Контракт, гарантирующий создание метода регистрации зависисмостей
 	/// </summary>
 	public interface IIntegrator
-    {
+	{
 		/// <summary>
 		/// Регистрация зависимостей
 		/// </summary>
 		/// <param name="injector">Сущность, имеющая возможность регистрировать зависимости</param>
-        public void Integrate(IRegistrar injector);
-    }
+		public void Integrate(IRegistrar injector);
+	}
 }
diff --git a/src/Oscallo.Castle.AddonedKernel/Integrators/IContainerRegistrar.cs b/src/Oscallo.Castle.AddonedKernel/Integrators/IContainerRegistrar.cs
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-using Oscallo.Castle.AddonedKernel.LifeCyrcle;
 using Castle.Windsor;
 using System;
 
@@ -22,7 +21,7 @@ namespace Oscallo.Castle.AddonedKernel.Integrators
 	/// <summary>
 	/// Контракт, гарантирующий добавление и удаление дочернего контейнера
 	/// </summary>
-    public interface IContainerRegistrar : ILifeCyrcleSupport, IDisposable
+    public interface IContainerRegistrar : IDisposable
     {
         void AddChildContainer(IWindsorContainer windsorContainer);
 

diff --git a/src/Oscallo.Castle.AddonedKernel/Integrators/IRegistrar.cs b/src/Oscallo.Castle.AddonedKernel/Integrators/IRegistrar.cs
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-using Oscallo.Castle.AddonedKernel.LifeCyrcle;
 using Castle.MicroKernel;
 using Castle.MicroKernel.Registration;
 using System;
@@ -23,7 +22,7 @@ namespace Oscallo.Castle.AddonedKernel.Integrators
 	/// <summary>
 	/// Контракт, гарантирующий, что сущность будет иметь функцмонал регистрации зависимостей
 	/// </summary>
-    public interface IRegistrar : ILifeCyrcleSupport, IDisposable
+    public interface IRegistrar : IDisposable
     {
 		/// <summary>
 		/// Регистрация 

diff --git a/src/Oscallo.Castle.AddonedKernel/Integrators/IResolver.cs b/src/Oscallo.Castle.AddonedKernel/Integrators/IResolver.cs
@@ -13,13 +13,12 @@
  * limitations under the License.
  */
 
-using Oscallo.Castle.AddonedKernel.LifeCyrcle;
 using Castle.MicroKernel;
 using System;
 
 namespace Oscallo.Castle.AddonedKernel.Integrators
 {
-    public interface IResolver : ILifeCyrcleSupport, IDisposable
+    public interface IResolver : IDisposable
     {
 		/// <summary>
 		/// Проверка компонента на наличие в списке зарегистрированных

diff --git a/src/Oscallo.Castle.AddonedKernel/LifeCycle/IExiteable.cs b/src/Oscallo.Castle.AddonedKernel/LifeCycle/IExiteable.cs
diff --git a/src/Oscallo.Castle.AddonedKernel/LifeCycle/ILifeCyrcleSupport.cs b/src/Oscallo.Castle.AddonedKernel/LifeCycle/ILifeCyrcleSupport.cs
diff --git a/src/Oscallo.Castle.AddonedKernel/LifeCycle/IStartupable.cs b/src/Oscallo.Castle.AddonedKernel/LifeCycle/IStartupable.cs
diff --git a/src/Oscallo.Castle.AddonedKernel/Oscallo.Castle.AddonedKernel.csproj b/src/Oscallo.Castle.AddonedKernel/Oscallo.Castle.AddonedKernel.csproj
@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-    <UseWPF>true</UseWPF>
     <Company>Oscallo</Company>
-    <Version>0.9.0</Version>
+    <Version>0.9.01</Version>
     <Title>Oscallo.Castle.AddonedKernel</Title>
     <RepositoryUrl>https://github.com/Oscallo/Castle.AddonedKernel</RepositoryUrl>
     <PackageTags>castle-windsor, window</PackageTags>