diff --git a/.gitignore b/.gitignore index 787caf71..7ab9c6b2 100644 --- a/.gitignore +++ b/.gitignore @@ -184,7 +184,7 @@ publish/ *.azurePubxml # Note: Comment the next line if you want to checkin your web deploy settings, # but database connection strings (with potential passwords) will be unencrypted -*.pubxml +#*.pubxml *.publishproj # Microsoft Azure Web App publish settings. Comment the next line if you want to diff --git a/Source/AaxDecrypter/AaxDecrypter.csproj b/Source/AaxDecrypter/AaxDecrypter.csproj index 90fdc76d..bb56f3ef 100644 --- a/Source/AaxDecrypter/AaxDecrypter.csproj +++ b/Source/AaxDecrypter/AaxDecrypter.csproj @@ -2,13 +2,23 @@ net6.0-windows + true - + + embedded + + + + embedded + + + + diff --git a/Source/AppScaffolding/AppScaffolding.csproj b/Source/AppScaffolding/AppScaffolding.csproj index 9408bbec..49071deb 100644 --- a/Source/AppScaffolding/AppScaffolding.csproj +++ b/Source/AppScaffolding/AppScaffolding.csproj @@ -19,4 +19,12 @@ + + embedded + + + + embedded + + diff --git a/Source/AppScaffolding/UNSAFE_MigrationHelper.cs b/Source/AppScaffolding/UNSAFE_MigrationHelper.cs index 61af7aac..fbfe6bb2 100644 --- a/Source/AppScaffolding/UNSAFE_MigrationHelper.cs +++ b/Source/AppScaffolding/UNSAFE_MigrationHelper.cs @@ -25,7 +25,7 @@ namespace AppScaffolding : value; #region appsettings.json - private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location), "appsettings.json"); + private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName), "appsettings.json"); public static bool APPSETTINGS_Json_Exists => File.Exists(APPSETTINGS_JSON); diff --git a/Source/ApplicationServices/ApplicationServices.csproj b/Source/ApplicationServices/ApplicationServices.csproj index b2c3abea..cb4528e5 100644 --- a/Source/ApplicationServices/ApplicationServices.csproj +++ b/Source/ApplicationServices/ApplicationServices.csproj @@ -1,4 +1,4 @@ - + net6.0-windows @@ -14,4 +14,12 @@ + + embedded + + + + embedded + + diff --git a/Source/AudibleUtilities/ApiExtended.cs b/Source/AudibleUtilities/ApiExtended.cs index 28fbd14f..732890ff 100644 --- a/Source/AudibleUtilities/ApiExtended.cs +++ b/Source/AudibleUtilities/ApiExtended.cs @@ -155,7 +155,7 @@ namespace AudibleUtilities //System.IO.File.WriteAllText(library_json, AudibleApi.Common.Converter.ToJson(items)); #endif var validators = new List(); - validators.AddRange(getValidators()); + validators.AddRange(Validators.GetValidators()); foreach (var v in validators) { var exceptions = v.Validate(items); @@ -329,15 +329,5 @@ namespace AudibleUtilities return results; } #endregion - - private static List 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(); - } } } diff --git a/Source/AudibleUtilities/AudibleApiValidators.cs b/Source/AudibleUtilities/AudibleApiValidators.cs index cae6e812..acb2ca5d 100644 --- a/Source/AudibleUtilities/AudibleApiValidators.cs +++ b/Source/AudibleUtilities/AudibleApiValidators.cs @@ -5,6 +5,18 @@ using AudibleApi.Common; namespace AudibleUtilities { + public static class Validators + { + public static IValidator[] GetValidators() + => new IValidator[] + { + new LibraryValidator(), + new BookValidator(), + new CategoryValidator(), + new ContributorValidator(), + new SeriesValidator(), + }; + } public interface IValidator { IEnumerable Validate(IEnumerable items); diff --git a/Source/AudibleUtilities/AudibleUtilities.csproj b/Source/AudibleUtilities/AudibleUtilities.csproj index b5dcffd2..92a875f4 100644 --- a/Source/AudibleUtilities/AudibleUtilities.csproj +++ b/Source/AudibleUtilities/AudibleUtilities.csproj @@ -5,10 +5,22 @@ - + + + - + + + embedded + + + + embedded + + + + diff --git a/Source/DataLayer/DataLayer.csproj b/Source/DataLayer/DataLayer.csproj index 1690e74f..87bd7c77 100644 --- a/Source/DataLayer/DataLayer.csproj +++ b/Source/DataLayer/DataLayer.csproj @@ -6,9 +6,7 @@ true - Library - @@ -23,8 +21,16 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + embedded + + + + embedded + + + diff --git a/Source/DtoImporterService/DtoImporterService.csproj b/Source/DtoImporterService/DtoImporterService.csproj index a9b17110..d784be6f 100644 --- a/Source/DtoImporterService/DtoImporterService.csproj +++ b/Source/DtoImporterService/DtoImporterService.csproj @@ -4,6 +4,14 @@ net6.0-windows + + embedded + + + + embedded + + diff --git a/Source/FileLiberator/FileLiberator.csproj b/Source/FileLiberator/FileLiberator.csproj index 460308d6..65b461a1 100644 --- a/Source/FileLiberator/FileLiberator.csproj +++ b/Source/FileLiberator/FileLiberator.csproj @@ -11,4 +11,13 @@ + + embedded + + + + embedded + + + diff --git a/Source/FileManager/FileManager.csproj b/Source/FileManager/FileManager.csproj index 16363aa5..28f22c83 100644 --- a/Source/FileManager/FileManager.csproj +++ b/Source/FileManager/FileManager.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -9,4 +9,12 @@ + + embedded + + + + embedded + + diff --git a/Source/Hangover/Hangover.csproj b/Source/Hangover/Hangover.csproj index 7c90124e..5c2c104a 100644 --- a/Source/Hangover/Hangover.csproj +++ b/Source/Hangover/Hangover.csproj @@ -24,11 +24,13 @@ edit debug and release output paths --> - ..\LibationWinForms\bin\Debug + ..\bin\Debug + embedded - ..\LibationWinForms\bin\Release + ..\bin\Release + embedded @@ -37,7 +39,7 @@ - + Form1.cs diff --git a/Source/Hangover/Properties/PublishProfiles/FolderProfile.pubxml b/Source/Hangover/Properties/PublishProfiles/FolderProfile.pubxml new file mode 100644 index 00000000..3ed14ad3 --- /dev/null +++ b/Source/Hangover/Properties/PublishProfiles/FolderProfile.pubxml @@ -0,0 +1,16 @@ + + + + + Release + Any CPU + ..\bin\publish\ + FileSystem + net6.0-windows + win-x64 + false + false + + \ No newline at end of file diff --git a/Source/LibationCli/LibationCli.csproj b/Source/LibationCli/LibationCli.csproj index 84f16e9b..e3b1fa09 100644 --- a/Source/LibationCli/LibationCli.csproj +++ b/Source/LibationCli/LibationCli.csproj @@ -4,12 +4,11 @@ Exe net6.0-windows - - true true win-x64 false false + True - ..\LibationWinForms\bin\Debug + ..\bin\Debug + embedded - ..\LibationWinForms\bin\Release + ..\bin\Release + embedded diff --git a/Source/LibationCli/Properties/PublishProfiles/FolderProfile.pubxml b/Source/LibationCli/Properties/PublishProfiles/FolderProfile.pubxml new file mode 100644 index 00000000..3ed14ad3 --- /dev/null +++ b/Source/LibationCli/Properties/PublishProfiles/FolderProfile.pubxml @@ -0,0 +1,16 @@ + + + + + Release + Any CPU + ..\bin\publish\ + FileSystem + net6.0-windows + win-x64 + false + false + + \ No newline at end of file diff --git a/Source/LibationFileManager/Configuration.cs b/Source/LibationFileManager/Configuration.cs index 23403699..f7000e07 100644 --- a/Source/LibationFileManager/Configuration.cs +++ b/Source/LibationFileManager/Configuration.cs @@ -444,7 +444,7 @@ namespace LibationFileManager #endregion #region LibationFiles - private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location), "appsettings.json"); + private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName), "appsettings.json"); private const string LIBATION_FILES_KEY = "LibationFiles"; [Description("Location for storage of program-created files")] diff --git a/Source/LibationFileManager/LibationFileManager.csproj b/Source/LibationFileManager/LibationFileManager.csproj index 4648a9ee..04ae43f2 100644 --- a/Source/LibationFileManager/LibationFileManager.csproj +++ b/Source/LibationFileManager/LibationFileManager.csproj @@ -14,4 +14,12 @@ + + embedded + + + + embedded + + diff --git a/Source/LibationSearchEngine/LibationSearchEngine.csproj b/Source/LibationSearchEngine/LibationSearchEngine.csproj index 9fc7e889..5e811683 100644 --- a/Source/LibationSearchEngine/LibationSearchEngine.csproj +++ b/Source/LibationSearchEngine/LibationSearchEngine.csproj @@ -15,5 +15,14 @@ + + + embedded + + + + embedded + + diff --git a/Source/LibationWinForms/LibationWinForms.csproj b/Source/LibationWinForms/LibationWinForms.csproj index b21cadd3..b15b714c 100644 --- a/Source/LibationWinForms/LibationWinForms.csproj +++ b/Source/LibationWinForms/LibationWinForms.csproj @@ -7,7 +7,7 @@ true libation.ico Libation - + true win-x64 false @@ -27,6 +27,16 @@ en;es + + ..\bin\Debug + embedded + + + + ..\bin\Release + embedded + + diff --git a/Source/LibationWinForms/Properties/PublishProfiles/FolderProfile.pubxml b/Source/LibationWinForms/Properties/PublishProfiles/FolderProfile.pubxml new file mode 100644 index 00000000..3ed14ad3 --- /dev/null +++ b/Source/LibationWinForms/Properties/PublishProfiles/FolderProfile.pubxml @@ -0,0 +1,16 @@ + + + + + Release + Any CPU + ..\bin\publish\ + FileSystem + net6.0-windows + win-x64 + false + false + + \ No newline at end of file