diff --git a/GPW_Admin/GPW_Admin.csproj b/GPW_Admin/GPW_Admin.csproj index 47f759a..0eacf92 100644 --- a/GPW_Admin/GPW_Admin.csproj +++ b/GPW_Admin/GPW_Admin.csproj @@ -314,9 +314,6 @@ - - - diff --git a/GPW_Admin/Properties/PublishProfiles/IIS01.pubxml b/GPW_Admin/Properties/PublishProfiles/IIS01.pubxml index 9e46c7e..ec8edf6 100644 --- a/GPW_Admin/Properties/PublishProfiles/IIS01.pubxml +++ b/GPW_Admin/Properties/PublishProfiles/IIS01.pubxml @@ -27,6 +27,16 @@ by editing this MSBuild file. In order to learn more about this please visit htt + + + + + + + + + + IIS01 @@ -41,6 +51,9 @@ by editing this MSBuild file. In order to learn more about this please visit htt DonotMerge + + False + False diff --git a/GPW_Admin/Properties/PublishProfiles/IIS01.pubxml.user b/GPW_Admin/Properties/PublishProfiles/IIS01.pubxml.user index 19ddf16..4c1941e 100644 --- a/GPW_Admin/Properties/PublishProfiles/IIS01.pubxml.user +++ b/GPW_Admin/Properties/PublishProfiles/IIS01.pubxml.user @@ -6,6 +6,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt - AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAH0adXzrANk+QkSQiwkrZoAAAAAACAAAAAAADZgAAwAAAABAAAABb6ElOBZBmVABKAa+64QWdAAAAAASAAACgAAAAEAAAAKZikr2c60gIfjtO43fxbZgYAAAAjKLcXmFApdJ2m2qD8ZN2+TTwRGDknnL4FAAAAMTrb97lcPYF0s+lNLqCN5gzfLpj + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAlt716CBqn0mhrhx25JUQAwAAAAACAAAAAAADZgAAwAAAABAAAAARM1b5xtWbaBzdA9cl8IU7AAAAAASAAACgAAAAEAAAAKsVa1HsNQqIgAfKhnKcdHwYAAAA153iVqGru9SR7hEYHaA+RHgUzjNMyyB4FAAAAFWPRXci9mPCPU/xaaPQedaUcKh7 \ No newline at end of file diff --git a/GPW_Admin/Properties/PublishProfiles/IIS02.pubxml b/GPW_Admin/Properties/PublishProfiles/IIS02.pubxml index 68b7d2e..1da7320 100644 --- a/GPW_Admin/Properties/PublishProfiles/IIS02.pubxml +++ b/GPW_Admin/Properties/PublishProfiles/IIS02.pubxml @@ -27,6 +27,16 @@ by editing this MSBuild file. In order to learn more about this please visit htt + + + + + + + + + + IIS02 @@ -41,6 +51,9 @@ by editing this MSBuild file. In order to learn more about this please visit htt DonotMerge + + False + False diff --git a/GPW_Admin/Properties/PublishProfiles/IISDEV.pubxml b/GPW_Admin/Properties/PublishProfiles/IISDEV.pubxml index 8c7181d..dfe6e05 100644 --- a/GPW_Admin/Properties/PublishProfiles/IISDEV.pubxml +++ b/GPW_Admin/Properties/PublishProfiles/IISDEV.pubxml @@ -27,6 +27,16 @@ by editing this MSBuild file. In order to learn more about this please visit htt + + + + + + + + + + Release @@ -41,6 +51,9 @@ by editing this MSBuild file. In order to learn more about this please visit htt DonotMerge + + False + False diff --git a/GPW_Admin/Properties/PublishProfiles/IISDEV.pubxml.user b/GPW_Admin/Properties/PublishProfiles/IISDEV.pubxml.user index 3e399a5..fd528e5 100644 --- a/GPW_Admin/Properties/PublishProfiles/IISDEV.pubxml.user +++ b/GPW_Admin/Properties/PublishProfiles/IISDEV.pubxml.user @@ -9,6 +9,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt Any CPU - AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAH0adXzrANk+QkSQiwkrZoAAAAAACAAAAAAADZgAAwAAAABAAAAAfzRDxm3RWtMnQW8dF8T+eAAAAAASAAACgAAAAEAAAAILouDWF/BRhWGHI/pZRVI0YAAAAKmH9LnVNFsewQIo0Hkk8L/OzH3jFB7WwFAAAALKoQaTWums2r8sZR6QsPyfIPWBh + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAlt716CBqn0mhrhx25JUQAwAAAAACAAAAAAADZgAAwAAAABAAAAAItbwwteM0AffuP1GXoFwrAAAAAASAAACgAAAAEAAAAHrIAlZZk1GEz4QX1v9+t0EYAAAAEcQ1bRelJ+gbhBIHmVGWjwLvgUxI6ZHHFAAAALKnSbzj1lX5SAV62Rw7H8b58qmD \ No newline at end of file diff --git a/GPW_Admin/Web.config b/GPW_Admin/Web.config index a7b3460..36bfad8 100644 --- a/GPW_Admin/Web.config +++ b/GPW_Admin/Web.config @@ -1,4 +1,4 @@ - + - + - - - - - - - + + + + + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - + + + - + - - - - + + + + - - - - + + + + - - - + + + - + - - + + - + - - + + - - + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - - + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - - + + + + + - - - - - - - - + + + + + + + + - - + + - + - + diff --git a/GPW_Barcode/GPW_Barcode.csproj b/GPW_Barcode/GPW_Barcode.csproj index 52f6fad..6a4719e 100644 --- a/GPW_Barcode/GPW_Barcode.csproj +++ b/GPW_Barcode/GPW_Barcode.csproj @@ -496,9 +496,6 @@ - - - diff --git a/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 1ead8b6..5d1e3c7 100644 Binary files a/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/GPW_Commesse/GPW_Commesse.csproj b/GPW_Commesse/GPW_Commesse.csproj index 6b5eb08..4bcfe20 100644 --- a/GPW_Commesse/GPW_Commesse.csproj +++ b/GPW_Commesse/GPW_Commesse.csproj @@ -332,9 +332,6 @@ - - - diff --git a/GPW_Smart/GPW_Smart.csproj b/GPW_Smart/GPW_Smart.csproj index efaa92c..1798602 100644 --- a/GPW_Smart/GPW_Smart.csproj +++ b/GPW_Smart/GPW_Smart.csproj @@ -511,9 +511,6 @@ - - - diff --git a/GPW_Smart/Web.config b/GPW_Smart/Web.config index 4a2b14f..7073f7e 100644 --- a/GPW_Smart/Web.config +++ b/GPW_Smart/Web.config @@ -1,4 +1,4 @@ - + - - + + - - - + + + - + - - - + + + - - - + + + - - - - + + + + - - - + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - + - - - - + + + + - - - - + + + + - - - + + + - + - - + + - + - - + + - - + + - + - - - - - + + + + + - + - - - + + + - + - - - - - + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - - - - - + + + + + + + + - - + + - - - - + + + + - - + + - + - + diff --git a/GPW_data/GPW_data.csproj b/GPW_data/GPW_data.csproj index 3ab7909..9e6f93b 100644 --- a/GPW_data/GPW_data.csproj +++ b/GPW_data/GPW_data.csproj @@ -251,9 +251,6 @@ - - - diff --git a/Jenkinsfile b/Jenkinsfile index f9bd5ed..78a63c1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=4124']) { + withEnv(['NEXT_BUILD_NUMBER=4125']) { // env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'GPW' @@ -34,23 +34,23 @@ pipeline { agent any steps { parallel ( - HOME: { - sleep 8 - bat "\"${tool 'MSBuild-16.0'}\" HOME\\HOME.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" - }, ADMIN: { + sleep 6 + bat "\"${tool 'MSBuild-16.0'}\" GPW_Admin\\GPW_Admin.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" + }, + SMART: { sleep 4 bat "\"${tool 'MSBuild-16.0'}\" GPW_Smart\\GPW_Smart.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" }, - BARCODE: { - sleep 6 + COMMESSE: { + sleep 2 + bat "\"${tool 'MSBuild-16.0'}\" HOME\\HOME.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" + }, + BCODE: { + sleep 1 bat "\"${tool 'MSBuild-16.0'}\" GPW_Barcode\\GPW_Barcode.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" }, - SMART: { - sleep 2 - bat "\"${tool 'MSBuild-16.0'}\" GPW_Smart\\GPW_Smart.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" - }, - COMMESSE: { + HOME: { bat "\"${tool 'MSBuild-16.0'}\" GPW_Commesse\\GPW_Commesse.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" }, failFast: false) @@ -71,24 +71,24 @@ pipeline { fixNuget("${WORKSPACE}\\GPW.sln") parallel ( ADMIN: { - sleep 3 + sleep 6 bat "\"${tool 'MSBuild-16.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Admin/GPW_Admin.csproj" }, - BCODE: { - sleep 2 - bat "\"${tool 'MSBuild-16.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Barcode/GPW_Barcode.csproj" + SMART: { + sleep 4 + bat "\"${tool 'MSBuild-16.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Smart/GPW_Smart.csproj" }, COMM: { - sleep 4 + sleep 2 bat "\"${tool 'MSBuild-16.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Commesse/GPW_Commesse.csproj" }, + BCODE: { + sleep 1 + bat "\"${tool 'MSBuild-16.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Barcode/GPW_Barcode.csproj" + }, HOME: { bat "\"${tool 'MSBuild-16.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ HOME/HOME.csproj" - }, - SMART: { - sleep 1 - bat "\"${tool 'MSBuild-16.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Smart/GPW_Smart.csproj" - }, + }, failFast: false) } else if (env.BRANCH_NAME == "master") { diff --git a/fart.exe b/fart.exe deleted file mode 100644 index 075563c..0000000 Binary files a/fart.exe and /dev/null differ