Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'IobMan' into develop

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-12-27 14:12:07 +01:00
parent c2cdef86c2 9fd7aff03e
commit ab3aa0ccec
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-MAN/utils.cs
+6 -5
View File
@@ -43,13 +43,14 @@ namespace IOB_MAN
/// <returns></returns>
public static string FormatTimeSpan(TimeSpan timeSpan)
{
Func<Tuple<int, string>, string> tupleFormatter = t => $"{t.Item1} {t.Item2}{(t.Item1 == 1 ? string.Empty : "s")}";
//Func<Tuple<int, string>, string> tupleFormatter = t => $"{t.Item1} {t.Item2}{(t.Item1 == 1 ? string.Empty : "s")}";
Func<Tuple<int, string>, string> tupleFormatter = t => $"{t.Item1} {t.Item2}";
var components = new List<Tuple<int, string>>
{
Tuple.Create((int) timeSpan.TotalDays, "gg"),
Tuple.Create(timeSpan.Hours, "ore"),
Tuple.Create(timeSpan.Minutes, "min"),
Tuple.Create(timeSpan.Seconds, "sec"),
Tuple.Create(timeSpan.Hours, "h"),
Tuple.Create(timeSpan.Minutes, "m"),
Tuple.Create(timeSpan.Seconds, "s"),
};
components.RemoveAll(i => i.Item1 == 0);
@@ -60,7 +61,7 @@ namespace IOB_MAN
{
var finalComponent = components[components.Count - 1];
components.RemoveAt(components.Count - 1);
extra = $" and {tupleFormatter(finalComponent)}";
extra = $"e {tupleFormatter(finalComponent)}";
}
return $"{string.Join(", ", components.Select(tupleFormatter))}{extra}";
Jenkinsfile
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=630']) {
withEnv(['NEXT_BUILD_NUMBER=631']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'