Egalware/LPA
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
2021-01-13 11:47:19 +01:00
parent 99ddaf2e49 800409e849
commit 2ec962f815
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=89']) {
withEnv(['NEXT_BUILD_NUMBER=90']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'LPA'
LPA/App.config
+4 -2
View File
@@ -5,8 +5,10 @@
</startup>
<appSettings>
<add key="appName" value="LPA" />
<add key="serverBaseAddr" value="http://iis02/NKC/" />
<add key="serverIp" value="iis02" />
<add key="serverBaseAddr" value="http://iis01/MP/MAG/" />
<add key="serverIp" value="iis01" />
<!--<add key="serverBaseAddr" value="http://iis02/NKC/" />
<add key="serverIp" value="iis02" />-->
<add key="localReportPath" value="reports" />
<add key="localPdfPath" value="pdf" />
<add key="_logDir" value="/logs/" />
LPA/LPA.csproj
+6 -2
View File
@@ -203,7 +203,9 @@
<None Include="..\.editorconfig">
<Link>.editorconfig</Link>
</None>
<None Include="conf\serverSetup.json" />
<None Include="conf\serverSetup.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="reports\DemoA4.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
@@ -216,7 +218,9 @@
<None Include="conf\queueSetupDemo.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="conf\queueSetup.json" />
<None Include="conf\queueSetup.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="demo\DemoA6.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
LPA/conf/serverSetup.json
+1 -1
View File
@@ -1,4 +1,4 @@
{
"serverIp": "iis01",
"serverBaseAddr": "http://iis01/NKC/"
"serverBaseAddr": "http://iis01/MP/MAG/"
}