From 9b6669bc62f8515e8892a5efe7ae7b3affe7898c Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 11 Aug 2020 17:22:13 +0000 Subject: [PATCH] --- buildWinX64SelfContainedRelease.bat | 2 +- buildWin_10_X64SelfContainedRelease.bat | 8 ++++++++ buildWin_7_X64SelfContainedRelease.bat | 8 ++++++++ server/AyaNova/Startup.cs | 8 ++++++-- 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 buildWin_10_X64SelfContainedRelease.bat create mode 100644 buildWin_7_X64SelfContainedRelease.bat diff --git a/buildWinX64SelfContainedRelease.bat b/buildWinX64SelfContainedRelease.bat index 90cd35a8..8079f0f0 100644 --- a/buildWinX64SelfContainedRelease.bat +++ b/buildWinX64SelfContainedRelease.bat @@ -4,5 +4,5 @@ rmdir C:\data\code\raven\dist\win-x64\files /s mkdir C:\data\code\raven\dist\win-x64\files cd C:\data\code\raven\server\AyaNova\ -dotnet publish -o C:\data\code\raven\dist\win-x64\files\ -r win-x64 +dotnet publish -c Release -o C:\data\code\raven\dist\win-x64\files\ -r win-x64 pause \ No newline at end of file diff --git a/buildWin_10_X64SelfContainedRelease.bat b/buildWin_10_X64SelfContainedRelease.bat new file mode 100644 index 00000000..feedd4e7 --- /dev/null +++ b/buildWin_10_X64SelfContainedRelease.bat @@ -0,0 +1,8 @@ +@echo ************************************************************** +@echo ******************** BUILD SERVER **************************** +@echo ************************************************************** +rmdir C:\data\code\raven\dist\win10-x64\files /s +mkdir C:\data\code\raven\dist\win10-x64\files +cd C:\data\code\raven\server\AyaNova\ +dotnet publish -c Release -o C:\data\code\raven\dist\win10-x64\files\ -r win10-x64 +pause \ No newline at end of file diff --git a/buildWin_7_X64SelfContainedRelease.bat b/buildWin_7_X64SelfContainedRelease.bat new file mode 100644 index 00000000..e90afe01 --- /dev/null +++ b/buildWin_7_X64SelfContainedRelease.bat @@ -0,0 +1,8 @@ +@echo ************************************************************** +@echo ******************** BUILD SERVER **************************** +@echo ************************************************************** +rmdir C:\data\code\raven\dist\win7-x64\files /s +mkdir C:\data\code\raven\dist\win7-x64\files +cd C:\data\code\raven\server\AyaNova\ +dotnet publish -c Release -o C:\data\code\raven\dist\win7-x64\files\ -r win7-x64 +pause \ No newline at end of file diff --git a/server/AyaNova/Startup.cs b/server/AyaNova/Startup.cs index 8cd3dab9..cc410fb1 100644 --- a/server/AyaNova/Startup.cs +++ b/server/AyaNova/Startup.cs @@ -75,9 +75,9 @@ namespace AyaNova _newLog.LogDebug("ServerState service"); services.AddSingleton(new AyaNova.Api.ControllerHelpers.ApiServerState()); - + _newLog.LogDebug("Mail service"); - services.AddSingleton(); + services.AddSingleton(); //Init controllers _newLog.LogDebug("Controllers"); @@ -576,7 +576,11 @@ namespace AyaNova if (ServerBootConfig.AYANOVA_SERVER_TEST_MODE) { _newLog.LogInformation($"Server test mode seeding, level is {ServerBootConfig.AYANOVA_SERVER_TEST_MODE_SEEDLEVEL}, tz offset is {ServerBootConfig.AYANOVA_SERVER_TEST_MODE_TZ_OFFSET}"); +#if (DEBUG) AyaNova.Core.License.FetchKeyAsync(apiServerState, dbContext, _newLog, true, true).Wait(); +#else + AyaNova.Core.License.FetchKeyAsync(apiServerState, dbContext, _newLog, true).Wait(); +#endif //NOTE: For unit testing make sure the time zone is same as tester to ensure list filter by date tests will work because server is on same page as user in terms of time var seed = new Util.Seeder(); seed.SeedDatabaseAsync(Seeder.Level.StringToSeedLevel(ServerBootConfig.AYANOVA_SERVER_TEST_MODE_SEEDLEVEL), ServerBootConfig.AYANOVA_SERVER_TEST_MODE_TZ_OFFSET).Wait();