From 3a7bf32963f097928072de56ebd8de8c1124b879 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 19 Mar 2018 12:02:02 +0100
Subject: [PATCH] Inserito "content" x reports rdlc

---
 CMS_SC/CMS_SC.csproj            | 14 +++++---------
 CMS_SC/Reports/PlaceHolder.file |  1 +
 Jenkinsfile                     |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)
 create mode 100644 CMS_SC/Reports/PlaceHolder.file

diff --git a/CMS_SC/CMS_SC.csproj b/CMS_SC/CMS_SC.csproj
index 1d8af97..f4d15f4 100644
--- a/CMS_SC/CMS_SC.csproj
+++ b/CMS_SC/CMS_SC.csproj
@@ -325,6 +325,7 @@
     <Content Include="Content\bootstrap-reboot.css.map" />
     <Content Include="Content\bootstrap-grid.min.css.map" />
     <Content Include="Content\bootstrap-grid.css.map" />
+    <Content Include="Reports\PlaceHolder.file" />
     <None Include="Reports\ReportFull_Vers3.rdl" />
     <Content Include="NLog.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -993,16 +994,11 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Reports\Report_C.rdlc">
+    <Content Include="Reports\Report_C.rdlc">
       <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Reports\Report_S.rdlc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Reports\Report_F.rdlc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    </Content>
+    <Content Include="Reports\Report_S.rdlc" />
+    <Content Include="Reports\Report_F.rdlc" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{4A0DDDB5-7A95-4FBF-97CC-616D07737A77}" />
diff --git a/CMS_SC/Reports/PlaceHolder.file b/CMS_SC/Reports/PlaceHolder.file
new file mode 100644
index 0000000..5f28270
--- /dev/null
+++ b/CMS_SC/Reports/PlaceHolder.file
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index 62862ae..0a54d4d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
 
 				/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
 				script {
-					withEnv(['NEXT_BUILD_NUMBER=4242']) {
+					withEnv(['NEXT_BUILD_NUMBER=4243']) {
 						// env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
 						env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
     					env.APP_NAME = 'CMS-SC'