From 51588eeed19e680fc001c983b694c306ffed88af Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 22 Aug 2022 22:17:54 +0000 Subject: [PATCH] display build type in about page and release 8.0.6 --- .vscode/launch.json | 2 +- devdocs/deploy.md | 2 +- devdocs/pricing.md | 2 +- devdocs/todo.txt | 10 +++------- dist/install/windows/x64/lan.iss | 2 +- dist/install/windows/x64/standalone.iss | 2 +- server/AyaNova/AyaNova.csproj | 4 ++-- server/AyaNova/Controllers/ApiRootController.cs | 9 +++++++-- server/AyaNova/Program.cs | 1 - server/AyaNova/util/AySchema.cs | 2 +- server/AyaNova/util/AyaNovaVersion.cs | 2 +- server/AyaNova/util/License.cs | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 6cb41121..f7b7db1a 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -119,7 +119,7 @@ "AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;CommandTimeout=300;", "AYANOVA_DATA_PATH": "c:\\temp\\ravendata", "AYANOVA_USE_URLS": "http://*:7575;", - "AYANOVA_PERMANENTLY_ERASE_DATABASE":"true", + //"AYANOVA_PERMANENTLY_ERASE_DATABASE":"true", //"AYANOVA_REMOVE_LICENSE_FROM_DB":"true", //"AYANOVA_SERVER_TEST_MODE": "true", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-8", diff --git a/devdocs/deploy.md b/devdocs/deploy.md index 5fb8a2f2..83a5fad7 100644 --- a/devdocs/deploy.md +++ b/devdocs/deploy.md @@ -6,7 +6,7 @@ If any packages have been changed in the release do a thorough security scan and ### Bump version numbers: -Search and replace 8.0.5 +Search and replace 8.0.6 webapp,server,launcher, v8migrate (don't change v8migrate unless it has it's own code changes, it's version should be it's own thing other than major release changes etc) Client end ayanova-version.js, diff --git a/devdocs/pricing.md b/devdocs/pricing.md index d946aa46..5e467a52 100644 --- a/devdocs/pricing.md +++ b/devdocs/pricing.md @@ -139,7 +139,7 @@ TWO types makes the most sense after considering options: - One time fee, user can use indefinitely - self installed, hosted and maintained by customer - least profitable for us long term if they don't buy a maint. subscription -- Without maintenance subscription, eligable for Minor updates only to fix bugs no new features so in other words they buy 8.0.5 they can upgrade to any 8.0.X version release, but not 8.1 as it will be new features added that don't break backward compatibility +- Without maintenance subscription, eligable for Minor updates only to fix bugs no new features so in other words they buy 8.0.6 they can upgrade to any 8.0.X version release, but not 8.1 as it will be new features added that don't break backward compatibility - one-time payment, along with the option of a yearly maintenance fee. - This is basically our current model but we allow upgrades for subscribers - **HAS CODE IMPLICATIONS** upgrades need to check if allowed based on version number if no maintenance subscription _not_ on date of build. diff --git a/devdocs/todo.txt b/devdocs/todo.txt index 40ea31aa..5703dfe9 100644 --- a/devdocs/todo.txt +++ b/devdocs/todo.txt @@ -30,15 +30,11 @@ THINGS HOLDING UP PERPETUAL RELEASE WIP >>>>>>>>>>>>> -todo: test a new trial install with no existing db and make sure it works properly through the process just in case - wipe the db completely and reboot at server see what happens - FAIL can't request errors out fuck, but this is a subscription build I think... -todo: NOT showing build type anywhere in client UI other than boot log (i.e. not in server information and not in client about page) - FIX THIS !!!! todo: move the dbid to the very first position in the shareit order additional fields as only the first two will show in email and reporting - +todo: register domain name myayanova.com for hanging subscriber servers off of + todo: update the test servers whichever are around, I've done my dev test.helloayanova.com, but should also do a261 and the eval ones todo: rockfish, need ability to add quantities to raven license options, once know some options for subscribers then do it at the same time move the blocks of customer users stuff back into options again where it belongs, did it wrong before @@ -1252,6 +1248,6 @@ https://www.ayanova.com/download/next/ayanova-linux-x64-server.zip https://www.ayanova.com/download/next/ayanova-windows-x64-lan-setup.exe Current v8 docs home: https://www.ayanova.com/docs/next -BUILD 8.0.5 CHANGES OF NOTE +BUILD 8.0.6 CHANGES OF NOTE Subscription / perpetual license code and stuff diff --git a/dist/install/windows/x64/lan.iss b/dist/install/windows/x64/lan.iss index 00daac51..e821f49c 100644 --- a/dist/install/windows/x64/lan.iss +++ b/dist/install/windows/x64/lan.iss @@ -1,7 +1,7 @@ ; LAN install for internal network use only #define MyAppName "AyaNova server" -#define MyAppVersion "8.0.5" +#define MyAppVersion "8.0.6" #define MyAppPublisher "Ground Zero Tech-Works, Inc." #define MyAppURL "https://ayanova.com/" #define MyAppLauncherExeName "ayanova-launcher.exe" diff --git a/dist/install/windows/x64/standalone.iss b/dist/install/windows/x64/standalone.iss index b386ba21..095c3fe8 100644 --- a/dist/install/windows/x64/standalone.iss +++ b/dist/install/windows/x64/standalone.iss @@ -3,7 +3,7 @@ ; external to lan requires different config #define MyAppName "AyaNova" -#define MyAppVersion "8.0.5" +#define MyAppVersion "8.0.6" #define MyAppPublisher "Ground Zero Tech-Works, Inc." #define MyAppURL "https://ayanova.com/" #define MyAppLauncherExeName "ayanova-launcher.exe" diff --git a/server/AyaNova/AyaNova.csproj b/server/AyaNova/AyaNova.csproj index 5372a3db..e1f0dc41 100644 --- a/server/AyaNova/AyaNova.csproj +++ b/server/AyaNova/AyaNova.csproj @@ -4,8 +4,8 @@ true - 8.0.5 - 8.0.5.0 + 8.0.6 + 8.0.6.0 ayanova.ico bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml 1591 diff --git a/server/AyaNova/Controllers/ApiRootController.cs b/server/AyaNova/Controllers/ApiRootController.cs index c0b1f818..689bd9f3 100644 --- a/server/AyaNova/Controllers/ApiRootController.cs +++ b/server/AyaNova/Controllers/ApiRootController.cs @@ -114,7 +114,7 @@ namespace AyaNova.Api.Controllers /// - /// Get API server info for general display + /// Get API server info for ABOUT form AyaNova display /// /// API server info [HttpGet("server-info")] @@ -129,7 +129,12 @@ namespace AyaNova.Api.Controllers ServerLocalTime = DateUtil.ServerDateTimeString(System.DateTime.UtcNow), ServerTimeZone = TimeZoneInfo.Local.Id, ServerDbId = AyaNova.Core.License.ServerDbId, - License = AyaNova.Core.License.LicenseInfoAsJson + License = AyaNova.Core.License.LicenseInfoAsJson, +#if (SUBSCRIPTION_BUILD) + Build = "Subscription" +#else + Build = "Perpetual" +#endif } }); } diff --git a/server/AyaNova/Program.cs b/server/AyaNova/Program.cs index c8c990ec..4f5b0e2e 100644 --- a/server/AyaNova/Program.cs +++ b/server/AyaNova/Program.cs @@ -277,7 +277,6 @@ namespace AyaNova - //Test for web root path //If user starts AyaNova from folder that is not the contentRoot then //AyaNova won't be able to serve static files diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index 63a5ebb7..47d33bce 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -1482,7 +1482,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE"); ////////////////////////////////////////////////// // - // 8.0.5 Subscription license trans keys + // 8.0.6 Subscription license trans keys // if (currentSchema < 5) { diff --git a/server/AyaNova/util/AyaNovaVersion.cs b/server/AyaNova/util/AyaNovaVersion.cs index 5d15be24..1ae629c8 100644 --- a/server/AyaNova/util/AyaNovaVersion.cs +++ b/server/AyaNova/util/AyaNovaVersion.cs @@ -5,7 +5,7 @@ namespace AyaNova.Util /// internal static class AyaNovaVersion { - public const string VersionString = "8.0.5"; + public const string VersionString = "8.0.6"; public const string FullNameAndVersion = "AyaNova server " + VersionString; public const string CurrentApiVersion="v8"; }//eoc diff --git a/server/AyaNova/util/License.cs b/server/AyaNova/util/License.cs index b9a90562..7412766e 100644 --- a/server/AyaNova/util/License.cs +++ b/server/AyaNova/util/License.cs @@ -1,4 +1,4 @@ -#define DEVELOPMENT_TEST_ROCKFISH +//#define DEVELOPMENT_TEST_ROCKFISH using System; using System.Text; using System.Threading.Tasks;