refresh...

This commit is contained in:
Samuele E. Locatelli
2018-09-07 18:32:11 +02:00
parent 903d075ae6
commit bf35582668
4 changed files with 16 additions and 13 deletions
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=619']) {
withEnv(['NEXT_BUILD_NUMBER=620']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'SteamWareLib'
+3 -7
View File
@@ -61,6 +61,9 @@
<PropertyGroup>
<ApplicationIcon>favicon.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<ItemGroup>
<Reference Include="AjaxControlToolkit, Version=18.1.0.0, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
<HintPath>..\packages\AjaxControlToolkit.18.1.0\lib\net40\AjaxControlToolkit.dll</HintPath>
@@ -311,11 +314,4 @@
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
+1
View File
@@ -110,6 +110,7 @@ namespace SteamWare
}
catch (Exception exc)
{
logger.lg.scriviLog(string.Format("Errore isWriteEnabled{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION);
}
return answ;
}
+11 -5
View File
@@ -1,7 +1,5 @@
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
namespace SteamWare
{
@@ -167,7 +165,11 @@ namespace SteamWare
_lingua = rigaUtente.COD_LINGUA;
}
catch { }
if (_lingua == "") _lingua = "IT";
if (_lingua == "")
{
_lingua = "IT";
}
lingua = _lingua;
}
@@ -417,7 +419,7 @@ namespace SteamWare
}
catch (Exception exc)
{
logger.lg.scriviLog("Errore recupero lingua utente", tipoLog.EXCEPTION);
logger.lg.scriviLog(string.Format("Errore recupero lingua utente{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION);
}
if (answ == "")
{
@@ -642,7 +644,11 @@ namespace SteamWare
}
}
}
if (currRunMode == runModes.echoLemmi) logger.lg.scriviLog(lemma, tipoLog.LEMMA);
if (currRunMode == runModes.echoLemmi)
{
logger.lg.scriviLog(lemma, tipoLog.LEMMA);
}
return answ;
}