diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac5ff74..d69822b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,6 +48,7 @@ variables: stages: - build - deploy + - installer admin:build: @@ -130,6 +131,8 @@ admin:deploy: # when: # manual + + bcode:deploy: stage: deploy before_script: @@ -151,4 +154,54 @@ bcode:deploy: # - test_job # when: # manual - \ No newline at end of file + +admin:install: + stage: installer +# rules: +# - if: '$CI_COMMIT_BRANCH == "develop"' +# only: +# - tags # the build process will only be started by git tag commits + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore GPW.sln' + - *version-fix + script: + # IIS 02 + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=Minimal GPW_Admin/GPW_Admin.csproj' + # IIS DEV + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IISDEV.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=Minimal GPW_Admin/GPW_Admin.csproj' + # ZIP package + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$newRel/GPW_Admin.zip /p:DeployIisAppPath=Default Web Site/GPW/ADMIN /p:PackageAsSingleFile=True /p:OutputPath=bin/ GPW_Admin/GPW_Admin.csproj' + needs: ["admin:build"] +# dependencies: +# - admin:build + # - test_job + when: + manual + +bcode:install: + stage: installer + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore GPW.sln' + - *version-fix + script: + # IIS 02 + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=Minimal GPW_Barcode/GPW_Barcode.csproj' + # IIS DEV + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IISDEV.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /p:verbosity=Minimal GPW_Barcode/GPW_Barcode.csproj' + # ZIP package + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/$newRel/GPW_Barcode.zip /p:DeployIisAppPath=Default Web Site/GPW/ADMIN /p:PackageAsSingleFile=True /p:OutputPath=bin/ GPW_Barcode/GPW_Barcode.csproj' +# cache: +# #key: ${CI_COMMIT_REF_SLUG} +# # key: ${CI_JOB_NAME} +# key: GPW-pack +# paths: +# - packages/ +# policy: pull + needs: ["bcode:build"] +# dependencies: +# - bcode:build + # - test_job + when: + manual \ No newline at end of file diff --git a/GPW_Admin/GPW_Admin.csproj b/GPW_Admin/GPW_Admin.csproj index 79c1edf..c54a24b 100644 --- a/GPW_Admin/GPW_Admin.csproj +++ b/GPW_Admin/GPW_Admin.csproj @@ -1,7 +1,6 @@  - - + @@ -26,7 +25,7 @@ - 3.9 + Latest true @@ -59,8 +58,8 @@ ..\packages\AspNet.ScriptManager.bootstrap.4.6.0\lib\net45\AspNet.ScriptManager.bootstrap.dll - - ..\packages\AspNet.ScriptManager.jQuery.3.5.1\lib\net45\AspNet.ScriptManager.jQuery.dll + + ..\packages\AspNet.ScriptManager.jQuery.3.6.0\lib\net45\AspNet.ScriptManager.jQuery.dll ..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll @@ -85,23 +84,23 @@ ..\packages\Microsoft.Web.RedisSessionStateProvider.4.0.1\lib\net462\Microsoft.Web.RedisSessionStateProvider.dll - - ..\packages\MongoDB.Bson.2.12.0\lib\net452\MongoDB.Bson.dll + + ..\packages\MongoDB.Bson.2.12.1\lib\net452\MongoDB.Bson.dll - - ..\packages\MongoDB.Driver.2.12.0\lib\net452\MongoDB.Driver.dll + + ..\packages\MongoDB.Driver.2.12.1\lib\net452\MongoDB.Driver.dll - - ..\packages\MongoDB.Driver.Core.2.12.0\lib\net452\MongoDB.Driver.Core.dll + + ..\packages\MongoDB.Driver.Core.2.12.1\lib\net452\MongoDB.Driver.Core.dll ..\packages\MongoDB.Libmongocrypt.1.2.1\lib\net452\MongoDB.Libmongocrypt.dll - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.7.8\lib\net45\NLog.dll + ..\packages\NLog.4.7.9\lib\net45\NLog.dll ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll @@ -556,11 +555,11 @@ - - - - - + + + + + @@ -746,10 +745,10 @@ - - + + Web.config @@ -1282,10 +1281,8 @@ - - - - + + 10.0 @@ -1355,17 +1352,14 @@ - - - - - + + + - - - + + - \ No newline at end of file + diff --git a/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx.cs b/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx.cs index c3074eb..4790fe1 100644 --- a/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx.cs +++ b/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx.cs @@ -421,7 +421,7 @@ namespace GPW_Commesse.WebUserControls ddlFase_int.SelectedIndex = 1; ddlFase_int.DataBind(); } - catch (Exception exc) + catch { } } } diff --git a/GPW_Commesse/packages.config b/GPW_Commesse/packages.config index a59b932..e8d902e 100644 --- a/GPW_Commesse/packages.config +++ b/GPW_Commesse/packages.config @@ -4,7 +4,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -31,13 +31,13 @@ - - - + + + - - + + diff --git a/GPW_Data/packages.config b/GPW_Data/packages.config index 80ce3d4..3b45909 100644 --- a/GPW_Data/packages.config +++ b/GPW_Data/packages.config @@ -6,13 +6,13 @@ - - - + + + - - + + diff --git a/GPW_Smart/GPW_Smart.csproj b/GPW_Smart/GPW_Smart.csproj index b8192f1..57541bc 100644 --- a/GPW_Smart/GPW_Smart.csproj +++ b/GPW_Smart/GPW_Smart.csproj @@ -24,7 +24,7 @@ - 3.9 + Latest true @@ -57,8 +57,8 @@ ..\packages\AspNet.ScriptManager.bootstrap.4.6.0\lib\net45\AspNet.ScriptManager.bootstrap.dll - - ..\packages\AspNet.ScriptManager.jQuery.3.5.1\lib\net45\AspNet.ScriptManager.jQuery.dll + + ..\packages\AspNet.ScriptManager.jQuery.3.6.0\lib\net45\AspNet.ScriptManager.jQuery.dll ..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll @@ -83,23 +83,23 @@ ..\packages\Microsoft.Web.RedisSessionStateProvider.4.0.1\lib\net462\Microsoft.Web.RedisSessionStateProvider.dll - - ..\packages\MongoDB.Bson.2.12.0\lib\net452\MongoDB.Bson.dll + + ..\packages\MongoDB.Bson.2.12.1\lib\net452\MongoDB.Bson.dll - - ..\packages\MongoDB.Driver.2.12.0\lib\net452\MongoDB.Driver.dll + + ..\packages\MongoDB.Driver.2.12.1\lib\net452\MongoDB.Driver.dll - - ..\packages\MongoDB.Driver.Core.2.12.0\lib\net452\MongoDB.Driver.Core.dll + + ..\packages\MongoDB.Driver.Core.2.12.1\lib\net452\MongoDB.Driver.Core.dll ..\packages\MongoDB.Libmongocrypt.1.2.1\lib\net452\MongoDB.Libmongocrypt.dll - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.7.8\lib\net45\NLog.dll + ..\packages\NLog.4.7.9\lib\net45\NLog.dll ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll @@ -550,11 +550,11 @@ - - - - - + + + + + @@ -740,10 +740,10 @@ - - + + Web.config @@ -1084,12 +1084,12 @@ Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}. - + - +