From f3931efb19f97545f81e947a7eb3d8c9befffc06 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 19 Mar 2018 17:24:20 +0100
Subject: [PATCH] Inizio update x XPST...

---
 Jenkinsfile                                  |  6 +++---
 VersGen/VersGen.csproj                       |  5 +++++
 XPS/XPS.csproj                               |  3 +++
 XPST/Properties/PublishProfiles/EQUA.pubxml  |  8 ++++----
 XPST/Properties/PublishProfiles/IIS01.pubxml |  8 ++++----
 XPST/Properties/PublishProfiles/IIS02.pubxml |  8 ++++----
 XPST/Web.config                              | 16 ++++++++--------
 XPST/XPST.csproj                             |  3 +++
 8 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 95dd690..3981a2c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,12 +9,12 @@ pipeline {
       steps {
 				/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
 				script {
-					withEnv(['NEXT_BUILD_NUMBER=222']) {
+					withEnv(['NEXT_BUILD_NUMBER=223']) {
 						// env.versionNumber = VersionNumber(versionNumberString : '1.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
 						env.versionNumber = VersionNumber(versionNumberString : '1.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
     					env.APP_NAME = 'CMS-SC'
 					}
-				}				
+				}
 				script {
 					currentBuild.displayName = "${env.versionNumber}"
 					if (env.BRANCH_NAME == "develop") { 
@@ -23,7 +23,7 @@ pipeline {
 					else {
 						currentBuild.description = "BUILD ${env.versionNumber}"
 					}
-				}				
+				}
 				/* CAMBIO numero versione in file sorgente!!! */
 				bat "e:\\fart.exe ${WORKSPACE}\\VersGen\\VersGen.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0"
       }
diff --git a/VersGen/VersGen.csproj b/VersGen/VersGen.csproj
index 7340910..52ef32e 100644
--- a/VersGen/VersGen.csproj
+++ b/VersGen/VersGen.csproj
@@ -57,6 +57,11 @@
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="ChangeLog.html" />
+    <Content Include="logoSteamware.png" />
+    <Content Include="manifest.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/XPS/XPS.csproj b/XPS/XPS.csproj
index 09c1e96..30ee0e7 100644
--- a/XPS/XPS.csproj
+++ b/XPS/XPS.csproj
@@ -336,6 +336,9 @@
     <Content Include="fonts\fontawesome-webfont.woff" />
     <Content Include="fonts\fontawesome-webfont.ttf" />
     <Content Include="fonts\fontawesome-webfont.eot" />
+    <Content Include="Resources\ChangeLog.html" />
+    <Content Include="Resources\logoSteamware.png" />
+    <Content Include="Resources\manifest.xml" />
     <Content Include="Scripts\bootstrap.js" />
     <Content Include="Scripts\bootstrap.min.js" />
     <Content Include="Bootstrap.Master" />
diff --git a/XPST/Properties/PublishProfiles/EQUA.pubxml b/XPST/Properties/PublishProfiles/EQUA.pubxml
index 9dd8e7e..cc7e94a 100644
--- a/XPST/Properties/PublishProfiles/EQUA.pubxml
+++ b/XPST/Properties/PublishProfiles/EQUA.pubxml
@@ -18,21 +18,21 @@ by editing this MSBuild file. In order to learn more about this please visit htt
         <ObjectGroup Name="XPS_data.Properties.Settings.Equa_AnagraficaConnectionString" Order="1" Enabled="False">
           <Destination Path="" />
           <Object Type="DbDacFx">
-            <PreSource Path="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" includeData="False" />
+            <PreSource Path="Data Source=SQL2016DEV;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16;" includeData="False" />
             <Source Path="$(IntermediateOutputPath)AutoScripts\XPS_data.Properties.Settings.Equa_AnagraficaConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
           </Object>
           <UpdateFrom Type="Web.Config">
-            <Source MatchValue="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
+            <Source MatchValue="Data Source=SQL2016DEV;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16;" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
           </UpdateFrom>
         </ObjectGroup>
         <ObjectGroup Name="XPS_data.Properties.Settings.Equa_XPSConnectionString" Order="2" Enabled="False">
           <Destination Path="" />
           <Object Type="DbDacFx">
-            <PreSource Path="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" includeData="False" />
+            <PreSource Path="Data Source=SQL2016DEV;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16;" includeData="False" />
             <Source Path="$(IntermediateOutputPath)AutoScripts\XPS_data.Properties.Settings.Equa_XPSConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
           </Object>
           <UpdateFrom Type="Web.Config">
-            <Source MatchValue="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
+            <Source MatchValue="Data Source=SQL2016DEV;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16;" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
           </UpdateFrom>
         </ObjectGroup>
         <ObjectGroup Name="XPS_data.Properties.Settings.si_dt30ConnectionString" Order="3" Enabled="False">
diff --git a/XPST/Properties/PublishProfiles/IIS01.pubxml b/XPST/Properties/PublishProfiles/IIS01.pubxml
index 4e4937d..75ac391 100644
--- a/XPST/Properties/PublishProfiles/IIS01.pubxml
+++ b/XPST/Properties/PublishProfiles/IIS01.pubxml
@@ -23,21 +23,21 @@ by editing this MSBuild file. In order to learn more about this please visit htt
         <ObjectGroup Name="XPS_data.Properties.Settings.Equa_AnagraficaConnectionString" Order="1" Enabled="False">
           <Destination Path="" />
           <Object Type="DbDacFx">
-            <PreSource Path="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" includeData="False" />
+            <PreSource Path="Data Source=SQL2016DEV;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16;" includeData="False" />
             <Source Path="$(IntermediateOutputPath)AutoScripts\XPS_data.Properties.Settings.Equa_AnagraficaConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
           </Object>
           <UpdateFrom Type="Web.Config">
-            <Source MatchValue="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
+            <Source MatchValue="Data Source=SQL2016DEV;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16;" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
           </UpdateFrom>
         </ObjectGroup>
         <ObjectGroup Name="XPS_data.Properties.Settings.Equa_XPSConnectionString" Order="2" Enabled="False">
           <Destination Path="" />
           <Object Type="DbDacFx">
-            <PreSource Path="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" includeData="False" />
+            <PreSource Path="Data Source=SQL2016DEV;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16;" includeData="False" />
             <Source Path="$(IntermediateOutputPath)AutoScripts\XPS_data.Properties.Settings.Equa_XPSConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
           </Object>
           <UpdateFrom Type="Web.Config">
-            <Source MatchValue="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
+            <Source MatchValue="Data Source=SQL2016DEV;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16;" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
           </UpdateFrom>
         </ObjectGroup>
         <ObjectGroup Name="XPS_data.Properties.Settings.si_dt30ConnectionString" Order="3" Enabled="False">
diff --git a/XPST/Properties/PublishProfiles/IIS02.pubxml b/XPST/Properties/PublishProfiles/IIS02.pubxml
index 40d650b..6826616 100644
--- a/XPST/Properties/PublishProfiles/IIS02.pubxml
+++ b/XPST/Properties/PublishProfiles/IIS02.pubxml
@@ -23,21 +23,21 @@ by editing this MSBuild file. In order to learn more about this please visit htt
         <ObjectGroup Name="XPS_data.Properties.Settings.Equa_AnagraficaConnectionString" Order="1" Enabled="False">
           <Destination Path="" />
           <Object Type="DbDacFx">
-            <PreSource Path="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" includeData="False" />
+            <PreSource Path="Data Source=SQL2016DEV;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16;" includeData="False" />
             <Source Path="$(IntermediateOutputPath)AutoScripts\XPS_data.Properties.Settings.Equa_AnagraficaConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
           </Object>
           <UpdateFrom Type="Web.Config">
-            <Source MatchValue="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
+            <Source MatchValue="Data Source=SQL2016DEV;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16;" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
           </UpdateFrom>
         </ObjectGroup>
         <ObjectGroup Name="XPS_data.Properties.Settings.Equa_XPSConnectionString" Order="2" Enabled="False">
           <Destination Path="" />
           <Object Type="DbDacFx">
-            <PreSource Path="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" includeData="False" />
+            <PreSource Path="Data Source=SQL2016DEV;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16;" includeData="False" />
             <Source Path="$(IntermediateOutputPath)AutoScripts\XPS_data.Properties.Settings.Equa_XPSConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
           </Object>
           <UpdateFrom Type="Web.Config">
-            <Source MatchValue="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
+            <Source MatchValue="Data Source=SQL2016DEV;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16;" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
           </UpdateFrom>
         </ObjectGroup>
         <ObjectGroup Name="XPS_data.Properties.Settings.si_dt30ConnectionString" Order="3" Enabled="False">
diff --git a/XPST/Web.config b/XPST/Web.config
index 1aec00c..1b0a0b0 100644
--- a/XPST/Web.config
+++ b/XPST/Web.config
@@ -101,18 +101,18 @@
     <!--area auth-->
     <add key="AuthCookieName" value="XPST_Auth" />
     <add key="enablePlain" value="true" />
-    <add key="DevicesAuthConnectionString" value="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User id=sa;Password=keyhammer16" />
+    <add key="DevicesAuthConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Equa_XPS;Persist Security Info=True;User id=sa;Password=keyhammer16;" />
     <!--area DB-->
-    <add key="XPSConnectionString" value="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User id=sa;Password=keyhammer16" />
-    <add key="PermessiConnectionString" value="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User id=sa;Password=keyhammer16" />
-    <add key="UtenteCdcConnectionString" value="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User id=sa;Password=keyhammer16" />
-    <add key="VocabolarioConnectionString" value="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User id=sa;Password=keyhammer16" />
+    <add key="XPSConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Equa_XPS;Persist Security Info=True;User id=sa;Password=keyhammer16;" />
+    <add key="PermessiConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Equa_XPS;Persist Security Info=True;User id=sa;Password=keyhammer16;" />
+    <add key="UtenteCdcConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Equa_XPS;Persist Security Info=True;User id=sa;Password=keyhammer16;" />
+    <add key="VocabolarioConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Equa_XPS;Persist Security Info=True;User id=sa;Password=keyhammer16;" />
     <!--Area barcode-->
     <add key="bCodeRetMain" value="bcex" />
     <!-- Setup link a reporting -->
     <add key="urlReporting" value="http://{0}/ReportServer?/{1}/{2}&amp;rs:Command=Render&amp;rc:Parameters=false&amp;rc:Toolbar=true&amp;IdxObj={3}{4}" />
     <!-- NB: "/" == "%2f" -->
-    <add key="reportingServerAddress" value="WIN2016-SQL" />
+    <add key="reportingServerAddress" value="SQL2016DEV" />
     <add key="reportDir" value="ReportEqua" />
     <add key="reportName_mod" value="ReportSchedaIdentificazione" />
     <add key="reportName_lbl" value="LabelEqua" />
@@ -122,8 +122,8 @@
   </appSettings>
   <connectionStrings>
     <add name="XPS_data.Properties.Settings.si_dt30ConnectionString" connectionString="Provider=Microsoft.Jet.OLEDB.4.0;Data Source=C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\XPS\XPS_data\MDB_Data\si_dt30.mdb;Persist Security Info=True" providerName="System.Data.OleDb" />
-    <add name="XPS_data.Properties.Settings.Equa_AnagraficaConnectionString" connectionString="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" providerName="System.Data.SqlClient" />
-    <add name="XPS_data.Properties.Settings.Equa_XPSConnectionString" connectionString="Data Source=WIN2016-SQL;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16" providerName="System.Data.SqlClient" />
+    <add name="XPS_data.Properties.Settings.Equa_AnagraficaConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
+    <add name="XPS_data.Properties.Settings.Equa_XPSConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=Equa_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false" />
diff --git a/XPST/XPST.csproj b/XPST/XPST.csproj
index 2f74efc..53c0673 100644
--- a/XPST/XPST.csproj
+++ b/XPST/XPST.csproj
@@ -124,6 +124,9 @@
     <Content Include="Global.asax" />
     <Content Include="jumper.aspx" />
     <Content Include="login.aspx" />
+    <Content Include="Resources\ChangeLog.html" />
+    <Content Include="Resources\logoSteamware.png" />
+    <Content Include="Resources\manifest.xml" />
     <Content Include="Scripts\jquery-1.8.3-vsdoc.js" />
     <Content Include="Scripts\jquery-1.8.3.js" />
     <Content Include="Scripts\jquery-1.8.3.min.js" />