diff --git a/.vs/GPW.sqlite b/.vs/GPW.sqlite index 3d08dec..0034136 100644 Binary files a/.vs/GPW.sqlite and b/.vs/GPW.sqlite differ diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config index 538e590..55fa6c8 100644 --- a/.vs/config/applicationhost.config +++ b/.vs/config/applicationhost.config @@ -186,7 +186,7 @@ - + diff --git a/GPW.sln b/GPW.sln index 2f9b5ad..822e76f 100644 --- a/GPW.sln +++ b/GPW.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26403.0 +VisualStudioVersion = 15.0.26403.3 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GPW", "GPW\GPW.csproj", "{6427F4E4-105A-4918-BAB4-5F94234320E4}" EndProject @@ -27,6 +27,8 @@ Global IIS01|Any CPU = IIS01|Any CPU IIS02|Any CPU = IIS02|Any CPU Release|Any CPU = Release|Any CPU + SPS_PROD|Any CPU = SPS_PROD|Any CPU + SPS_TEST|Any CPU = SPS_TEST|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {6427F4E4-105A-4918-BAB4-5F94234320E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -37,6 +39,10 @@ Global {6427F4E4-105A-4918-BAB4-5F94234320E4}.IIS02|Any CPU.Build.0 = Release|Any CPU {6427F4E4-105A-4918-BAB4-5F94234320E4}.Release|Any CPU.ActiveCfg = Release|Any CPU {6427F4E4-105A-4918-BAB4-5F94234320E4}.Release|Any CPU.Build.0 = Release|Any CPU + {6427F4E4-105A-4918-BAB4-5F94234320E4}.SPS_PROD|Any CPU.ActiveCfg = Release|Any CPU + {6427F4E4-105A-4918-BAB4-5F94234320E4}.SPS_PROD|Any CPU.Build.0 = Release|Any CPU + {6427F4E4-105A-4918-BAB4-5F94234320E4}.SPS_TEST|Any CPU.ActiveCfg = Release|Any CPU + {6427F4E4-105A-4918-BAB4-5F94234320E4}.SPS_TEST|Any CPU.Build.0 = Release|Any CPU {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Debug|Any CPU.ActiveCfg = Release|Any CPU {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Debug|Any CPU.Build.0 = Release|Any CPU {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.IIS01|Any CPU.ActiveCfg = Release|Any CPU @@ -45,6 +51,10 @@ Global {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.IIS02|Any CPU.Build.0 = Release|Any CPU {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Release|Any CPU.ActiveCfg = Release|Any CPU {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Release|Any CPU.Build.0 = Release|Any CPU + {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.SPS_PROD|Any CPU.ActiveCfg = Release|Any CPU + {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.SPS_PROD|Any CPU.Build.0 = Release|Any CPU + {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.SPS_TEST|Any CPU.ActiveCfg = Release|Any CPU + {7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.SPS_TEST|Any CPU.Build.0 = Release|Any CPU {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.Debug|Any CPU.ActiveCfg = Release|Any CPU {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.Debug|Any CPU.Build.0 = Release|Any CPU {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.IIS01|Any CPU.ActiveCfg = Release|Any CPU @@ -53,6 +63,10 @@ Global {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.IIS02|Any CPU.Build.0 = Release|Any CPU {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.Release|Any CPU.ActiveCfg = Release|Any CPU {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.Release|Any CPU.Build.0 = Release|Any CPU + {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.SPS_PROD|Any CPU.ActiveCfg = Release|Any CPU + {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.SPS_PROD|Any CPU.Build.0 = Release|Any CPU + {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.SPS_TEST|Any CPU.ActiveCfg = Release|Any CPU + {A8543046-1C1B-4810-BC08-9AA7F9814BB0}.SPS_TEST|Any CPU.Build.0 = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.ActiveCfg = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.Build.0 = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS01|Any CPU.ActiveCfg = Release|Any CPU @@ -61,6 +75,10 @@ Global {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02|Any CPU.Build.0 = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.ActiveCfg = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.Build.0 = Release|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SPS_PROD|Any CPU.ActiveCfg = Release|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SPS_PROD|Any CPU.Build.0 = Release|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SPS_TEST|Any CPU.ActiveCfg = Release|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SPS_TEST|Any CPU.Build.0 = Release|Any CPU {4A1F29A9-D692-4E42-873E-492496368777}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4A1F29A9-D692-4E42-873E-492496368777}.Debug|Any CPU.Build.0 = Debug|Any CPU {4A1F29A9-D692-4E42-873E-492496368777}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU @@ -69,6 +87,10 @@ Global {4A1F29A9-D692-4E42-873E-492496368777}.IIS02|Any CPU.Build.0 = IIS02|Any CPU {4A1F29A9-D692-4E42-873E-492496368777}.Release|Any CPU.ActiveCfg = Release|Any CPU {4A1F29A9-D692-4E42-873E-492496368777}.Release|Any CPU.Build.0 = Release|Any CPU + {4A1F29A9-D692-4E42-873E-492496368777}.SPS_PROD|Any CPU.ActiveCfg = SPS_PROD|Any CPU + {4A1F29A9-D692-4E42-873E-492496368777}.SPS_PROD|Any CPU.Build.0 = SPS_PROD|Any CPU + {4A1F29A9-D692-4E42-873E-492496368777}.SPS_TEST|Any CPU.ActiveCfg = SPS_TEST|Any CPU + {4A1F29A9-D692-4E42-873E-492496368777}.SPS_TEST|Any CPU.Build.0 = SPS_TEST|Any CPU {C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.Debug|Any CPU.Build.0 = Debug|Any CPU {C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU @@ -77,6 +99,10 @@ Global {C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.IIS02|Any CPU.Build.0 = IIS02|Any CPU {C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.Release|Any CPU.ActiveCfg = Release|Any CPU {C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.Release|Any CPU.Build.0 = Release|Any CPU + {C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.SPS_PROD|Any CPU.ActiveCfg = SPS_PROD|Any CPU + {C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.SPS_PROD|Any CPU.Build.0 = SPS_PROD|Any CPU + {C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.SPS_TEST|Any CPU.ActiveCfg = SPS_TEST|Any CPU + {C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.SPS_TEST|Any CPU.Build.0 = SPS_TEST|Any CPU {A74E74E3-77BC-45D3-BC54-8693313542E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A74E74E3-77BC-45D3-BC54-8693313542E2}.Debug|Any CPU.Build.0 = Debug|Any CPU {A74E74E3-77BC-45D3-BC54-8693313542E2}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU @@ -85,6 +111,10 @@ Global {A74E74E3-77BC-45D3-BC54-8693313542E2}.IIS02|Any CPU.Build.0 = IIS02|Any CPU {A74E74E3-77BC-45D3-BC54-8693313542E2}.Release|Any CPU.ActiveCfg = Release|Any CPU {A74E74E3-77BC-45D3-BC54-8693313542E2}.Release|Any CPU.Build.0 = Release|Any CPU + {A74E74E3-77BC-45D3-BC54-8693313542E2}.SPS_PROD|Any CPU.ActiveCfg = SPS_PROD|Any CPU + {A74E74E3-77BC-45D3-BC54-8693313542E2}.SPS_PROD|Any CPU.Build.0 = SPS_PROD|Any CPU + {A74E74E3-77BC-45D3-BC54-8693313542E2}.SPS_TEST|Any CPU.ActiveCfg = SPS_TEST|Any CPU + {A74E74E3-77BC-45D3-BC54-8693313542E2}.SPS_TEST|Any CPU.Build.0 = SPS_TEST|Any CPU {BE3DE583-5F7A-42D7-9CBB-3A31E7E70063}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BE3DE583-5F7A-42D7-9CBB-3A31E7E70063}.Debug|Any CPU.Build.0 = Debug|Any CPU {BE3DE583-5F7A-42D7-9CBB-3A31E7E70063}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU @@ -93,6 +123,10 @@ Global {BE3DE583-5F7A-42D7-9CBB-3A31E7E70063}.IIS02|Any CPU.Build.0 = IIS02|Any CPU {BE3DE583-5F7A-42D7-9CBB-3A31E7E70063}.Release|Any CPU.ActiveCfg = Release|Any CPU {BE3DE583-5F7A-42D7-9CBB-3A31E7E70063}.Release|Any CPU.Build.0 = Release|Any CPU + {BE3DE583-5F7A-42D7-9CBB-3A31E7E70063}.SPS_PROD|Any CPU.ActiveCfg = SPS_PROD|Any CPU + {BE3DE583-5F7A-42D7-9CBB-3A31E7E70063}.SPS_PROD|Any CPU.Build.0 = SPS_PROD|Any CPU + {BE3DE583-5F7A-42D7-9CBB-3A31E7E70063}.SPS_TEST|Any CPU.ActiveCfg = SPS_TEST|Any CPU + {BE3DE583-5F7A-42D7-9CBB-3A31E7E70063}.SPS_TEST|Any CPU.Build.0 = SPS_TEST|Any CPU {7D89DF90-4A60-45D5-9710-3EF25C58DA31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7D89DF90-4A60-45D5-9710-3EF25C58DA31}.Debug|Any CPU.Build.0 = Debug|Any CPU {7D89DF90-4A60-45D5-9710-3EF25C58DA31}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU @@ -101,6 +135,10 @@ Global {7D89DF90-4A60-45D5-9710-3EF25C58DA31}.IIS02|Any CPU.Build.0 = IIS02|Any CPU {7D89DF90-4A60-45D5-9710-3EF25C58DA31}.Release|Any CPU.ActiveCfg = Release|Any CPU {7D89DF90-4A60-45D5-9710-3EF25C58DA31}.Release|Any CPU.Build.0 = Release|Any CPU + {7D89DF90-4A60-45D5-9710-3EF25C58DA31}.SPS_PROD|Any CPU.ActiveCfg = SPS_PROD|Any CPU + {7D89DF90-4A60-45D5-9710-3EF25C58DA31}.SPS_PROD|Any CPU.Build.0 = SPS_PROD|Any CPU + {7D89DF90-4A60-45D5-9710-3EF25C58DA31}.SPS_TEST|Any CPU.ActiveCfg = SPS_TEST|Any CPU + {7D89DF90-4A60-45D5-9710-3EF25C58DA31}.SPS_TEST|Any CPU.Build.0 = SPS_TEST|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/GPW/GPW.csproj b/GPW/GPW.csproj index 12ed725..42303e8 100644 --- a/GPW/GPW.csproj +++ b/GPW/GPW.csproj @@ -1298,24 +1298,6 @@ 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - bin\ - TRACE - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - bin\ - TRACE - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset - diff --git a/GPW_Admin/GPW_Admin.csproj b/GPW_Admin/GPW_Admin.csproj index 7cd043c..9e225b2 100644 --- a/GPW_Admin/GPW_Admin.csproj +++ b/GPW_Admin/GPW_Admin.csproj @@ -771,6 +771,24 @@ prompt MinimumRecommendedRules.ruleset + + bin\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + bin\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + diff --git a/GPW_Barcode/GPW_Barcode.csproj b/GPW_Barcode/GPW_Barcode.csproj index d94a5b8..0fe6070 100644 --- a/GPW_Barcode/GPW_Barcode.csproj +++ b/GPW_Barcode/GPW_Barcode.csproj @@ -569,6 +569,24 @@ prompt MinimumRecommendedRules.ruleset + + bin\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + bin\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + diff --git a/GPW_Commesse/GPW_Commesse.csproj b/GPW_Commesse/GPW_Commesse.csproj index d155ad5..f745198 100644 --- a/GPW_Commesse/GPW_Commesse.csproj +++ b/GPW_Commesse/GPW_Commesse.csproj @@ -574,6 +574,24 @@ prompt MinimumRecommendedRules.ruleset + + bin\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + bin\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + diff --git a/GPW_Smart/GPW_Smart.csproj b/GPW_Smart/GPW_Smart.csproj index 900ff31..557e63e 100644 --- a/GPW_Smart/GPW_Smart.csproj +++ b/GPW_Smart/GPW_Smart.csproj @@ -767,6 +767,24 @@ prompt MinimumRecommendedRules.ruleset + + bin\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + bin\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + diff --git a/GPW_data/GPW_data.csproj b/GPW_data/GPW_data.csproj index 513ac72..e19aa2f 100644 --- a/GPW_data/GPW_data.csproj +++ b/GPW_data/GPW_data.csproj @@ -33,87 +33,6 @@ 4 false - - bin\SPS\ - TRACE - true - pdbonly - AnyCPU - bin\Release\GPW_data.dll.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - true - false - - - bin\218\ - TRACE - true - pdbonly - AnyCPU - bin\Release\GPW_data.dll.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - true - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - true - false - - - bin\ETS\ - TRACE - true - pdbonly - AnyCPU - bin\Release\GPW_data.dll.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - false - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - true - false - false - - - bin\ETS-218\ - TRACE - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset - false - - - bin\IIS01\ - TRACE - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset - false - - - bin\IIS02\ - TRACE - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset - false - diff --git a/HOME/HOME.csproj b/HOME/HOME.csproj index eb77cc0..5462c3b 100644 --- a/HOME/HOME.csproj +++ b/HOME/HOME.csproj @@ -193,6 +193,8 @@ GPWModel.edmx + + @@ -279,6 +281,26 @@ prompt MinimumRecommendedRules.ruleset + + true + bin\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + true + bin\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + diff --git a/HOME/HOME.csproj.user b/HOME/HOME.csproj.user index 0112a58..a9a7d07 100644 --- a/HOME/HOME.csproj.user +++ b/HOME/HOME.csproj.user @@ -3,7 +3,7 @@ true ShowAllFiles - IIS01 + SPS_TEST diff --git a/HOME/Properties/PublishProfiles/IIS01.pubxml b/HOME/Properties/PublishProfiles/IIS01.pubxml index d590655..45ae159 100644 --- a/HOME/Properties/PublishProfiles/IIS01.pubxml +++ b/HOME/Properties/PublishProfiles/IIS01.pubxml @@ -35,6 +35,7 @@ modificando il file MSBuild. Per altre informazioni su questo argomento, vedere DonotMerge + False diff --git a/HOME/Properties/PublishProfiles/SPS_PROD.pubxml b/HOME/Properties/PublishProfiles/SPS_PROD.pubxml new file mode 100644 index 0000000..5487c44 --- /dev/null +++ b/HOME/Properties/PublishProfiles/SPS_PROD.pubxml @@ -0,0 +1,50 @@ + + + + + Package + SPS_PROD + Any CPU + + True + True + ReleaseClienti\HOME.zip + true + Sito Web Predefinito/GPW/HOME + + + + + + + + + + + True + True + False + DonotMerge + + + + + False + + + False + + + False + + + False + + + False + + + \ No newline at end of file diff --git a/HOME/Properties/PublishProfiles/SPS_PROD.pubxml.user b/HOME/Properties/PublishProfiles/SPS_PROD.pubxml.user new file mode 100644 index 0000000..a527f4a --- /dev/null +++ b/HOME/Properties/PublishProfiles/SPS_PROD.pubxml.user @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/HOME/Properties/PublishProfiles/SPS_TEST.pubxml b/HOME/Properties/PublishProfiles/SPS_TEST.pubxml new file mode 100644 index 0000000..99eb232 --- /dev/null +++ b/HOME/Properties/PublishProfiles/SPS_TEST.pubxml @@ -0,0 +1,50 @@ + + + + + Package + SPS_TEST + Any CPU + + True + True + ReleaseClienti\HOME.zip + true + Sito Web Predefinito/GPW_TEST/HOME + + + + + + + + + + + True + True + False + DonotMerge + + + + + False + + + False + + + False + + + False + + + False + + + \ No newline at end of file diff --git a/HOME/Properties/PublishProfiles/SPS_TEST.pubxml.user b/HOME/Properties/PublishProfiles/SPS_TEST.pubxml.user new file mode 100644 index 0000000..a527f4a --- /dev/null +++ b/HOME/Properties/PublishProfiles/SPS_TEST.pubxml.user @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index b156a78..6478b39 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,13 +14,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { withEnv(['NEXT_BUILD_NUMBER=4056']) { - if (env.BRANCH_NAME == "master") { - env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) - } - else - { - env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMMdd"}.${BUILDS_TODAY, XX}', projectStartDate : '2006-01-01', skipFailedBuilds: true) - } + env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) /*env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')*/ env.APP_NAME = 'GPW' }