diff --git a/devdocs/pricing.md b/devdocs/pricing.md index b36b21bf..69998b85 100644 --- a/devdocs/pricing.md +++ b/devdocs/pricing.md @@ -194,7 +194,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.9 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.10 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 5fe1e0df..945834ba 100644 --- a/devdocs/todo.txt +++ b/devdocs/todo.txt @@ -1388,6 +1388,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.9 CHANGES OF NOTE +BUILD 8.0.10 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 d78d984e..6361928d 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.9" +#define MyAppVersion "8.0.10" #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 7a953369..f7cadce5 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.9" +#define MyAppVersion "8.0.10" #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 069bcbbf..af9d5b51 100644 --- a/server/AyaNova/AyaNova.csproj +++ b/server/AyaNova/AyaNova.csproj @@ -4,8 +4,8 @@ true - 8.0.9 - 8.0.9.0 + 8.0.10 + 8.0.10.0 ayanova.ico bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml 1591 diff --git a/server/AyaNova/generator/CoreJobLicense.cs b/server/AyaNova/generator/CoreJobLicense.cs index ee1d05d2..0a3827ca 100644 --- a/server/AyaNova/generator/CoreJobLicense.cs +++ b/server/AyaNova/generator/CoreJobLicense.cs @@ -34,8 +34,10 @@ namespace AyaNova.Biz var tsSinceLastCheck = DateTime.UtcNow - _lastCheck; //which track are we on? /* - NONE = 0,//fast track - ActiveTrial = 1,//slow track + FAST TRACK=30 minutes + SLOW TRACK= 24 hours + NONE = 0,//fast track (no license) + ActiveTrial = 1,//fast track (because they may be testing a migration and running out of time and don't want to cancel it) ExpiredTrial = 2,//fast track ActivePurchased = 3,//slow track ExpiredPurchased = 4,//fast track @@ -45,6 +47,7 @@ namespace AyaNova.Biz switch (AyaNova.Core.License.ActiveKey.Status) { case AyaNova.Core.License.AyaNovaLicenseKey.LicenseStatus.NONE: + case AyaNova.Core.License.AyaNovaLicenseKey.LicenseStatus.ActiveTrial: case AyaNova.Core.License.AyaNovaLicenseKey.LicenseStatus.ExpiredTrial: case AyaNova.Core.License.AyaNovaLicenseKey.LicenseStatus.ExpiredPurchased: tsCheckFrequency = FAST_TRACK; @@ -69,7 +72,7 @@ namespace AyaNova.Biz var ret = await AyaNova.Core.License.FetchKeyAsync(ServerState, ct, log, true); //When this was enabled never saw a failed fetch, trying again without it //#if (DEBUG) - // log.LogInformation("TEMP TEST LOG: CoreJobLicense - result is: " + ret); + // log.LogInformation("TEMP TEST LOG: CoreJobLicense - result is: " + ret); //#endif //most often the result will be "notfound" but in future might be other results if (ret == "ok") diff --git a/server/AyaNova/util/AyaNovaVersion.cs b/server/AyaNova/util/AyaNovaVersion.cs index 86840c14..8acfdb74 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.9"; + public const string VersionString = "8.0.10"; public const string FullNameAndVersion = "AyaNova server " + VersionString; public const string CurrentApiVersion="v8"; }//eoc