Merge branch 'develop' into stable

This commit is contained in:
Samuele E. Locatelli
2020-08-06 18:56:06 +02:00
4 changed files with 33 additions and 2 deletions
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=309']) {
withEnv(['NEXT_BUILD_NUMBER=310']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
+26
View File
@@ -0,0 +1,26 @@
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace NKC_WF.App_Start
{
public class NKC_Startup
{
public static void Init()
{
logger.lg.scriviLog("Start NKC_Startup.init()", tipoLog.STARTUP);
try
{
// inizializzo appConf prima di tutto il resto...
memLayer.ML.resetAppConf();
logger.lg.scriviLog("Completed preliminary setup AppConf execution", tipoLog.STARTUP);
}
catch (Exception exc)
{
logger.lg.scriviLog($"Exception during preliminary INIT app phase{Environment.NewLine}{exc}", tipoLog.EXCEPTION);
}
}
}
}
+5 -1
View File
@@ -1,4 +1,5 @@
using System;
using NKC_WF.App_Start;
using System;
using System.Web;
using System.Web.Http;
using System.Web.Mvc;
@@ -17,6 +18,9 @@ namespace NKC_WF
FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
RouteConfig.RegisterRoutes(RouteTable.Routes);
BundleConfig.RegisterBundles(BundleTable.Bundles);
// avvio il metodo init x applicazione...
NKC_Startup.Init();
}
}
}
+1
View File
@@ -612,6 +612,7 @@
<Link>VersGen.cs</Link>
</Compile>
<Compile Include="App_Start\BundleConfig.cs" />
<Compile Include="App_Start\NKC_Startup.cs" />
<Compile Include="Controllers\AliveController.cs" />
<Compile Include="Controllers\getMUSheetRevController.cs" />
<Compile Include="Controllers\PrintQueueController.cs" />