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

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-11-26 19:03:41 +01:00
parent bff15b990d 9de1b5f10d
commit 6b80a0c7c3
3 changed files with 9 additions and 5 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=688']) {
withEnv(['NEXT_BUILD_NUMBER=689']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
SteamWareLib/fileMover.cs
+1 -1
View File
@@ -774,7 +774,7 @@ namespace SteamWare
setDirs(_path);
}
/// <summary>
/// imposta la dir di lavoro impostandola dal mapPath corretto della web app...
/// imposta la dir di lavoro impostandola dal mapPath corretto della web app... (come subfolder della web app)
/// </summary>
/// <param name="_path"></param>
public void setDirectoryMapPath(string _path)
SteamWareLib/pdfUtils.cs
+7 -3
View File
@@ -32,9 +32,13 @@ namespace SteamWare
// copio ogni SINGOLA pagina
foreach (var fileName in pdfInFileList)
{
currPdfIn = PdfReader.Open(fileName, PdfDocumentOpenMode.Import);
CopyPages(currPdfIn, outPdf);
try
{
currPdfIn = PdfReader.Open(fileName, PdfDocumentOpenMode.Import);
CopyPages(currPdfIn, outPdf);
}
catch
{ }
}
// salvo!
outPdf.Save(pdfOutFilename);