Revert preview feature

Source/AppScaffolding/AppScaffolding.csproj

@@ -2,7 +2,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
-    <EnablePreviewFeatures>True</EnablePreviewFeatures>
     <Version>8.1.4.31</Version>
   </PropertyGroup>
   <ItemGroup>

Source/ApplicationServices/ApplicationServices.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
-	  <EnablePreviewFeatures>True</EnablePreviewFeatures>
   </PropertyGroup>
 
   <ItemGroup>

Source/AudibleUtilities/ApiExtended.cs

@@ -154,19 +154,27 @@ namespace AudibleUtilities
 #if DEBUG
 			//System.IO.File.WriteAllText(library_json, AudibleApi.Common.Converter.ToJson(items));
 #endif
-			var exceptions = new List<Exception>();
+			var validators = new List<IValidator>();
-
+			validators.AddRange(getValidators());
-			exceptions.AddRange(IValidator.Validate<LibraryValidator>(items));
+			foreach (var v in validators)
-			exceptions.AddRange(IValidator.Validate<BookValidator>(items));
+			{
-			exceptions.AddRange(IValidator.Validate<CategoryValidator>(items));
+				var exceptions = v.Validate(items);
-			exceptions.AddRange(IValidator.Validate<ContributorValidator>(items));
+				if (exceptions is not null && exceptions.Any())
-			exceptions.AddRange(IValidator.Validate<SeriesValidator>(items));
-
-			if (exceptions.Any())
 					throw new AggregateException(exceptions);
+			}
 			return items;
 		}
 
+		private static List<IValidator> getValidators()
+		{
+			var type = typeof(IValidator);
+			var types = AppDomain.CurrentDomain.GetAssemblies()
+				.SelectMany(s => s.GetTypes())
+				.Where(p => type.IsAssignableFrom(p) && !p.IsInterface);
+
+			return types.Select(t => Activator.CreateInstance(t) as IValidator).ToList();
+		}
+
 		#region episodes and podcasts
 
 		private async Task<List<Item>> getChildEpisodesAsync(SemaphoreSlim concurrencySemaphore, Item parent)

Source/AudibleUtilities/AudibleApiValidators.cs

@@ -7,14 +7,11 @@ namespace AudibleUtilities
 {
 	public interface IValidator
 	{
-		public static abstract IEnumerable<Exception> Validate(IEnumerable<Item> items);
+		IEnumerable<Exception> Validate(IEnumerable<Item> items);
-		public static IEnumerable<Exception> Validate<T>(IEnumerable<Item> items)
-			where T : IValidator
-			=> T.Validate(items);
 	}
 	public class LibraryValidator : IValidator
 	{
-		public static IEnumerable<Exception> Validate(IEnumerable<Item> items)
+		public IEnumerable<Exception> Validate(IEnumerable<Item> items)
 		{
 			var exceptions = new List<Exception>();
 
@@ -28,7 +25,7 @@ namespace AudibleUtilities
 	}
 	public class BookValidator : IValidator
 	{
-		public static IEnumerable<Exception> Validate(IEnumerable<Item> items)
+		public IEnumerable<Exception> Validate(IEnumerable<Item> items)
 		{
 			var exceptions = new List<Exception>();
 
@@ -46,7 +43,7 @@ namespace AudibleUtilities
 	}
 	public class CategoryValidator : IValidator
 	{
-		public static IEnumerable<Exception> Validate(IEnumerable<Item> items)
+		public IEnumerable<Exception> Validate(IEnumerable<Item> items)
 		{
 			var exceptions = new List<Exception>();
 
@@ -61,7 +58,7 @@ namespace AudibleUtilities
 	}
 	public class ContributorValidator : IValidator
 	{
-		public static IEnumerable<Exception> Validate(IEnumerable<Item> items)
+		public IEnumerable<Exception> Validate(IEnumerable<Item> items)
 		{
 			var exceptions = new List<Exception>();
 
@@ -75,7 +72,7 @@ namespace AudibleUtilities
 	}
 	public class SeriesValidator : IValidator
 	{
-		public static IEnumerable<Exception> Validate(IEnumerable<Item> items)
+		public IEnumerable<Exception> Validate(IEnumerable<Item> items)
 		{
 			var exceptions = new List<Exception>();
 

Source/AudibleUtilities/AudibleUtilities.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
-	  <EnablePreviewFeatures>True</EnablePreviewFeatures>
   </PropertyGroup>
 
   <ItemGroup>

Source/DtoImporterService/BookImporter.cs

@@ -8,8 +8,10 @@ using Dinah.Core.Collections.Generic;
 
 namespace DtoImporterService
 {
-	public class BookImporter : ImporterBase<BookValidator>
+	public class BookImporter : ItemsImporterBase
 	{
+		protected override IValidator Validator => new BookValidator();
+
 		public Dictionary<string, Book> Cache { get; private set; } = new();
 
 		private ContributorImporter contributorImporter { get; }

Source/DtoImporterService/CategoryImporter.cs

@@ -8,8 +8,10 @@ using Dinah.Core.Collections.Generic;
 
 namespace DtoImporterService
 {
-	public class CategoryImporter : ImporterBase<CategoryValidator>
+	public class CategoryImporter : ItemsImporterBase
 	{
+		protected override IValidator Validator => new CategoryValidator();
+
 		public Dictionary<string, Category> Cache { get; private set; } = new();
 
 		public CategoryImporter(LibationContext context) : base(context) { }

Source/DtoImporterService/ContributorImporter.cs

@@ -8,8 +8,10 @@ using Dinah.Core.Collections.Generic;
 
 namespace DtoImporterService
 {
-	public class ContributorImporter : ImporterBase<ContributorValidator>
+	public class ContributorImporter : ItemsImporterBase
 	{
+		protected override IValidator Validator => new ContributorValidator();
+
 		public Dictionary<string, Contributor> Cache { get; private set; } = new();
 
 		public ContributorImporter(LibationContext context) : base(context) { }

Source/DtoImporterService/DtoImporterService.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
-	  <EnablePreviewFeatures>True</EnablePreviewFeatures>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

Source/DtoImporterService/ImporterBase.cs

@@ -7,7 +7,7 @@ using Dinah.Core;
 
 namespace DtoImporterService
 {
-	public abstract class ImporterBase<TValidate> where TValidate : IValidator
+	public abstract class ImporterBase<T>
 	{
 		protected LibationContext DbContext { get; }
 
@@ -18,13 +18,13 @@ namespace DtoImporterService
 		}
 
 		/// <summary>LONG RUNNING. call with await Task.Run</summary>
-		public int Import(IEnumerable<ImportItem> param) => Run(DoImport, param);
+		public int Import(T param) => Run(DoImport, param);
 
-		public TResult Run<TResult>(Func<IEnumerable<ImportItem>, TResult> func, IEnumerable<ImportItem> param)
+		public TResult Run<TResult>(Func<T, TResult> func, T param)
 		{
 			try
 			{
-				var exceptions = TValidate.Validate(param.Select(i => i.DtoItem));
+				var exceptions = Validate(param);
 				if (exceptions is not null && exceptions.Any())
 					throw new AggregateException($"Importer validation failed", exceptions);
 			}
@@ -46,6 +46,16 @@ namespace DtoImporterService
 			}
 		}
 
-		protected abstract int DoImport(IEnumerable<ImportItem> elements);
+		protected abstract int DoImport(T elements);
+		public abstract IEnumerable<Exception> Validate(T param);
+	}
+
+	public abstract class ItemsImporterBase : ImporterBase<IEnumerable<ImportItem>>
+	{
+		protected ItemsImporterBase(LibationContext context) : base(context) { }
+
+		protected abstract IValidator Validator { get; }
+		public sealed override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems)
+			=> Validator.Validate(importItems.Select(i => i.DtoItem));
 	}
 }

Source/DtoImporterService/LibraryBookImporter.cs

@@ -7,8 +7,10 @@ using Dinah.Core.Collections.Generic;
 
 namespace DtoImporterService
 {
-	public class LibraryBookImporter : ImporterBase<LibraryValidator>
+	public class LibraryBookImporter : ItemsImporterBase
 	{
+		protected override IValidator Validator => new LibraryValidator();
+
 		private BookImporter bookImporter { get; }
 
 		public LibraryBookImporter(LibationContext context) : base(context)

Source/DtoImporterService/SeriesImporter.cs

@@ -8,8 +8,10 @@ using Dinah.Core.Collections.Generic;
 
 namespace DtoImporterService
 {
-	public class SeriesImporter : ImporterBase<SeriesValidator>
+	public class SeriesImporter : ItemsImporterBase
 	{
+		protected override IValidator Validator => new SeriesValidator();
+
 		public Dictionary<string, DataLayer.Series> Cache { get; private set; } = new();
 
 		public SeriesImporter(LibationContext context) : base(context) { }

Source/FileLiberator/FileLiberator.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
-	  <EnablePreviewFeatures>True</EnablePreviewFeatures>
   </PropertyGroup>
 
   <ItemGroup>

Source/Hangover/Hangover.csproj

@@ -6,7 +6,6 @@
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>hangover.ico</ApplicationIcon>
     <ImplicitUsings>enable</ImplicitUsings>
-	  <EnablePreviewFeatures>True</EnablePreviewFeatures>
     <PublishReadyToRun>true</PublishReadyToRun>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

Source/LibationCli/LibationCli.csproj

@@ -5,7 +5,6 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0-windows</TargetFramework>
     <PublishReadyToRun>true</PublishReadyToRun>
-	  <EnablePreviewFeatures>True</EnablePreviewFeatures>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>

Source/LibationWinForms/LibationWinForms.csproj

@@ -6,7 +6,6 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>libation.ico</ApplicationIcon>
-	  <EnablePreviewFeatures>True</EnablePreviewFeatures>
     <AssemblyName>Libation</AssemblyName>
 	  
     <PublishReadyToRun>true</PublishReadyToRun>

Source/_Tests/AudibleUtilities.Tests/AudibleUtilities.Tests.csproj

@@ -2,8 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
-	  <EnablePreviewFeatures>True</EnablePreviewFeatures>
-
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

Source/_Tests/FileLiberator.Tests/FileLiberator.Tests.csproj

@@ -2,8 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
-	  <EnablePreviewFeatures>True</EnablePreviewFeatures>
-
     <IsPackable>false</IsPackable>
   </PropertyGroup>