From a76270470d1c118f9dc13370d931487426f947b4 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 13 Jan 2021 11:46:55 +0100
Subject: [PATCH 1/2] fix conf x test MAG

---
 LPA/App.config            | 6 ++++--
 LPA/LPA.csproj            | 8 ++++++--
 LPA/conf/serverSetup.json | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/LPA/App.config b/LPA/App.config
index 30f431a..5fcafd9 100644
--- a/LPA/App.config
+++ b/LPA/App.config
@@ -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/" />
diff --git a/LPA/LPA.csproj b/LPA/LPA.csproj
index 2e22d20..73b6705 100644
--- a/LPA/LPA.csproj
+++ b/LPA/LPA.csproj
@@ -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>
diff --git a/LPA/conf/serverSetup.json b/LPA/conf/serverSetup.json
index 96bb97b..9bd50a9 100644
--- a/LPA/conf/serverSetup.json
+++ b/LPA/conf/serverSetup.json
@@ -1,4 +1,4 @@
 {
     "serverIp": "iis01",
-    "serverBaseAddr": "http://iis01/NKC/"
+    "serverBaseAddr": "http://iis01/MP/MAG/"
 }
\ No newline at end of file

From 800409e849226e2ed3badfd35565a503277e5f83 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 13 Jan 2021 11:47:13 +0100
Subject: [PATCH 2/2] new rel

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f98f048..6d8e1e1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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'