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

Merge branch 'develop' into ovh

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-02-18 15:58:22 +01:00
parent 74bed08ece 931e88ccb3
commit d547f0352b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=73']) {
withEnv(['NEXT_BUILD_NUMBER=74']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'ZCode'
ZCode/Properties/PublishProfiles/OVH-PROD.pubxml
+1 -1
View File
@@ -17,7 +17,7 @@ modificando il file MSBuild. Per altre informazioni su questo argomento, vedere
<SkipExtraFilesOnServer>True</SkipExtraFilesOnServer>
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
<EnableMSDeployBackup>True</EnableMSDeployBackup>
<UserName>jenkins</UserName>
<UserName>WPROD01\Steamware</UserName>
<_SavePWD>True</_SavePWD>
</PropertyGroup>
</Project>
ZCode/Properties/PublishProfiles/OVH-PROD.pubxml.user
+1 -1
View File
@@ -6,6 +6,6 @@ modificando il file MSBuild. Per altre informazioni su questo argomento, vedere
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAI/S2yHlOzEGsfZnJFESRYAAAAAACAAAAAAADZgAAwAAAABAAAADRGyRflF9zMzRp57A+PBt9AAAAAASAAACgAAAAEAAAALl7FQBp0w39dqC/KjfHYQEYAAAAViubc54Evmg1amaBPgWawo/pbmtTlnk3FAAAAKTJS8XBVzk2R3uxaOszcDc41aX4</EncryptedPassword>
<EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAI/S2yHlOzEGsfZnJFESRYAAAAAACAAAAAAADZgAAwAAAABAAAAC2yzctLprEUQyVqVgfNNxlAAAAAASAAACgAAAAEAAAAGWL6jizcAvdj5WNZgfTVP4YAAAAtnDimU0ff0iguoiY6jmWASvwaN9mX2hiFAAAAFMzaMx6H7kXtkwj2t7bys80o5Yi</EncryptedPassword>
</PropertyGroup>
</Project>