diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config index 45d32f0f..4c1a361d 100644 --- a/.vs/config/applicationhost.config +++ b/.vs/config/applicationhost.config @@ -170,7 +170,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -186,7 +186,7 @@ - + @@ -202,7 +202,7 @@ - + @@ -226,7 +226,7 @@ - + @@ -234,7 +234,7 @@ - + diff --git a/Jenkinsfile b/Jenkinsfile index c76c21d0..682e087f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=704']) { + withEnv(['NEXT_BUILD_NUMBER=705']) { // env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MP-Tablet/MP-Tablet.csproj b/MP-Tablet/MP-Tablet.csproj index bc26a397..f5b194a9 100644 --- a/MP-Tablet/MP-Tablet.csproj +++ b/MP-Tablet/MP-Tablet.csproj @@ -412,7 +412,9 @@ Always - + + Always + Always @@ -420,43 +422,117 @@ Always - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + Always @@ -1007,7 +1083,11 @@ --> - "$(ProjectDir)setupTgt.bat" "$(ConfigurationName)" "$(ProjectDir)" + + + + + "$(ProjectDir)setupTgt.bat" "$(ConfigurationName)" "$(ProjectDir)" diff --git a/MP-Tablet/Resources/Jetco/macchine/Combi_A.jpg b/MP-Tablet/Resources/Jetco/macchine/Combi_A.jpg deleted file mode 100644 index 4150531d..00000000 Binary files a/MP-Tablet/Resources/Jetco/macchine/Combi_A.jpg and /dev/null differ diff --git a/MP-Tablet/Resources/Jetco/macchine/Combi_B.jpg b/MP-Tablet/Resources/Jetco/macchine/Combi_B.jpg deleted file mode 100644 index ccc94c0c..00000000 Binary files a/MP-Tablet/Resources/Jetco/macchine/Combi_B.jpg and /dev/null differ diff --git a/MP-Tablet/Resources/Jetco/macchine/Combi_C.jpg b/MP-Tablet/Resources/Jetco/macchine/Combi_C.jpg deleted file mode 100644 index c5c6b517..00000000 Binary files a/MP-Tablet/Resources/Jetco/macchine/Combi_C.jpg and /dev/null differ diff --git a/MP-Tablet/Resources/Jetco/macchine/cosmap.jpg b/MP-Tablet/Resources/Jetco/macchine/cosmap.jpg deleted file mode 100644 index ad72da48..00000000 Binary files a/MP-Tablet/Resources/Jetco/macchine/cosmap.jpg and /dev/null differ