Egalware/SteamWare
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update XML info format

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-02-12 13:04:15 +01:00
parent e7821e6858
commit 2cf8d7ffdb
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=717']) {
withEnv(['NEXT_BUILD_NUMBER=718']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '3.5.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
SteamWareLib/devInfoParam.cs
+7 -7
View File
@@ -65,13 +65,13 @@
get
{
return string.Format("<DeviceInfo>" +
" <OutputFormat>{0}</OutputFormat>" +
" <PageWidth>{1}</PageWidth>" +
" <PageHeight>{2}</PageHeight>" +
" <MarginTop>{3}</MarginTop>" +
" <MarginLeft>{4}</MarginLeft>" +
" <MarginRight>{5}</MarginRight>" +
" <MarginBottom>{6}</MarginBottom>" +
"<OutputFormat>{0}</OutputFormat>" +
"<PageWidth>{1}</PageWidth>" +
"<PageHeight>{2}</PageHeight>" +
"<MarginTop>{3}</MarginTop>" +
"<MarginLeft>{4}</MarginLeft>" +
"<MarginRight>{5}</MarginRight>" +
"<MarginBottom>{6}</MarginBottom>" +
"</DeviceInfo>", OutputFormat, PageWidth, PageHeight, MarginTop, MarginLeft, MarginRight, MarginBottom);
}
}