diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d46a457..0b80cbe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -124,7 +124,7 @@ CORE.Api:staging: - dotnet restore "$env:SOL_NAME.sln" script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj - - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj + - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj CORE.WLOG:staging: stage: staging @@ -141,7 +141,7 @@ CORE.WLOG:staging: - dotnet restore "$env:SOL_NAME.sln" script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj - - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj + - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj CORE.Smart:staging: stage: staging @@ -161,7 +161,7 @@ CORE.Smart:staging: - dotnet restore "$env:SOL_NAME.sln" script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj - - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj + - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj # ---------- DEPLOY ---------- CORE.Api:deploy: @@ -170,7 +170,7 @@ CORE.Api:deploy: - win environment: name: production - url: https://iis03.egalware.com/GPW/CORE.Smart + url: https://seriate.egalware.com/GPW/CORE.Smart variables: APP_NAME: GPW.CORE.Api SOL_NAME: GPW.CORE.WRKLOG @@ -182,10 +182,10 @@ CORE.Api:deploy: - dotnet restore "$env:SOL_NAME.sln" script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj - # IIS 02 - - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj - # IIS 03 - - dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj + # # IIS 02 + # - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj + # IIS PROD + - dotnet publish -p:PublishProfile=IIS-PROD.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj CORE.WLOG:deploy: stage: deploy @@ -202,10 +202,10 @@ CORE.WLOG:deploy: - dotnet restore "$env:SOL_NAME.sln" script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj - # IIS 02 - - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj - # IIS 03 - - dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj + # # IIS 02 + # - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj + # IIS PROD + - dotnet publish -p:PublishProfile=IIS-PROD.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj CORE.Smart:deploy: stage: deploy @@ -222,10 +222,10 @@ CORE.Smart:deploy: - dotnet restore "$env:SOL_NAME.sln" script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj - # IIS 02 - - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj - # IIS 03 - - dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj + # IIS EXT + - dotnet publish -p:PublishProfile=IIS-EXT.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj + # IIS INT + - dotnet publish -p:PublishProfile=IIS-INT.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj CORE.Api:release: stage: release diff --git a/GPW.CORE.Api/GPW.CORE.Api.csproj b/GPW.CORE.Api/GPW.CORE.Api.csproj index ea09d60..ecf409d 100644 --- a/GPW.CORE.Api/GPW.CORE.Api.csproj +++ b/GPW.CORE.Api/GPW.CORE.Api.csproj @@ -7,11 +7,13 @@ + <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS-PROD.pubxml" /> <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS03.pubxml" /> + diff --git a/GPW.CORE.Api/Properties/PublishProfiles/IIS-PROD.pubxml b/GPW.CORE.Api/Properties/PublishProfiles/IIS-PROD.pubxml new file mode 100644 index 0000000..449381f --- /dev/null +++ b/GPW.CORE.Api/Properties/PublishProfiles/IIS-PROD.pubxml @@ -0,0 +1,28 @@ + + + + + true + MSDeploy + True + Release + Any CPU + https://office.egalware.com/GPW/Api + False + ef8d5a17-0d60-4ef0-9262-57afac574843 + false + https://office.egalware.com:8172/MsDeploy.axd + office.egalware.com/GPW/Api + + True + WMSVC + True + True + jenkins + <_SavePWD>True + net6.0 + + \ No newline at end of file diff --git a/GPW.CORE.Api/Properties/PublishProfiles/IIS-PROD.pubxml.user b/GPW.CORE.Api/Properties/PublishProfiles/IIS-PROD.pubxml.user new file mode 100644 index 0000000..f7ef4c0 --- /dev/null +++ b/GPW.CORE.Api/Properties/PublishProfiles/IIS-PROD.pubxml.user @@ -0,0 +1,12 @@ + + + + + + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAk75miMJLMkCTEelQutKpbwAAAAACAAAAAAADZgAAwAAAABAAAAB43BVhUmznhAu3pUfV1IfOAAAAAASAAACgAAAAEAAAAEV8hgbujDFfsMjS77NS2oYYAAAAUHPGFaVWgRqQPDU4wk5KGABmVHKko4/9FAAAANtaROBOcPHljx4RnmQHj5aHdtYk + True|2022-01-27T09:34:09.2346456Z;True|2022-01-27T10:13:36.3080675+01:00;True|2022-01-27T10:05:45.6649507+01:00;True|2022-01-26T14:34:16.5263189+01:00;True|2022-01-26T13:04:22.2336648+01:00;False|2022-01-26T13:04:06.0677616+01:00;True|2021-11-08T09:03:37.7855257+01:00;True|2021-11-08T09:03:34.8263479+01:00;True|2021-11-08T09:03:31.8889390+01:00;True|2021-10-29T16:19:33.6539408+02:00;True|2021-10-29T16:19:28.2082360+02:00;True|2021-10-26T16:12:11.7740950+02:00;True|2021-10-26T16:11:56.2014641+02:00;True|2021-10-26T16:11:22.2897842+02:00;False|2021-10-26T16:10:58.3733037+02:00;False|2021-10-26T16:10:29.4793991+02:00;True|2021-10-21T17:35:11.9761128+02:00;True|2021-10-18T20:22:00.9305399+02:00;True|2021-10-18T18:32:29.4558070+02:00;True|2021-10-18T18:32:22.8950294+02:00;True|2021-10-18T18:16:13.7563877+02:00;True|2021-10-18T18:15:48.5678387+02:00;True|2021-10-18T12:45:45.7228681+02:00;True|2021-10-18T12:14:22.3221605+02:00;True|2021-10-18T12:14:15.7373530+02:00;True|2021-10-18T12:10:43.8607301+02:00; + + \ No newline at end of file diff --git a/GPW.CORE.Api/appsettings.json b/GPW.CORE.Api/appsettings.json index abb6c20..f028280 100644 --- a/GPW.CORE.Api/appsettings.json +++ b/GPW.CORE.Api/appsettings.json @@ -45,7 +45,7 @@ "Database": 15 }, "ServerConv": { - "baseUrl": "https://iis03.egalware.com/GPW/ADMIN/" + "baseUrl": "https://office.egalware.com/GPW/ADMIN/" }, "TimbraCheck": { "checkAnomAppr": true, diff --git a/GPW.CORE.SMART/GPW.CORE.SMART.csproj b/GPW.CORE.SMART/GPW.CORE.SMART.csproj index a2262bc..3d7c1e2 100644 --- a/GPW.CORE.SMART/GPW.CORE.SMART.csproj +++ b/GPW.CORE.SMART/GPW.CORE.SMART.csproj @@ -3,7 +3,7 @@ net6.0 enable - 3.0.2302.1709 + 3.0.2302.1715 enable www.egalware.com GPW Smart UI diff --git a/GPW.CORE.SMART/appsettings.json b/GPW.CORE.SMART/appsettings.json index 32fa560..579270f 100644 --- a/GPW.CORE.SMART/appsettings.json +++ b/GPW.CORE.SMART/appsettings.json @@ -34,12 +34,12 @@ "InfoRich": "samuele.locatelli@egalware.com,mara.baroni@egalware.com" }, "AdmApp": { - "LinkMal": "https://iis03.egalware.com/GPW/ADMIN/malattia", - "LinkRich": "https://iis03.egalware.com/GPW/ADMIN/richiesteDip" + "LinkMal": "https://office.egalware.com/GPW/ADMIN/malattia", + "LinkRich": "https://office.egalware.com/GPW/ADMIN/richiesteDip" }, "OptPar": { - "UrlLinkInt": "https://iis03.egalware.com/GPW/CORE.Smart/", - "UrlLinkExt": "https://seriate.steamware.net:8483/GPW/CORE.Smart/" + "UrlLinkInt": "https://office.egalware.com/GPW/CORE.Smart/", + "UrlLinkExt": "https://seriate.egalware.com/GPW/CORE.Smart/" }, "VetoIns": "true" } diff --git a/GPW.CORE.Smart/Properties/PublishProfiles/IIS-EXT.pubxml b/GPW.CORE.Smart/Properties/PublishProfiles/IIS-EXT.pubxml new file mode 100644 index 0000000..e76b05b --- /dev/null +++ b/GPW.CORE.Smart/Properties/PublishProfiles/IIS-EXT.pubxml @@ -0,0 +1,27 @@ + + + + + MSDeploy + true + Release + Any CPU + https://seriate.egalware.com/GPW/CORE.SMART + false + 9e5a3295-08bf-4603-9fa3-d38a2f1100e5 + false + https://seriate.egalware.com:8172/MsDeploy.axd + seriate.egalware.com/GPW/CORE.SMART + + false + WMSVC + true + true + jenkins + <_SavePWD>true + <_TargetId>IISWebDeploy + net6.0 + + \ No newline at end of file diff --git a/GPW.CORE.Smart/Properties/PublishProfiles/IIS-INT.pubxml b/GPW.CORE.Smart/Properties/PublishProfiles/IIS-INT.pubxml new file mode 100644 index 0000000..2d48914 --- /dev/null +++ b/GPW.CORE.Smart/Properties/PublishProfiles/IIS-INT.pubxml @@ -0,0 +1,27 @@ + + + + + MSDeploy + true + Release + Any CPU + https://office.egalware.com/GPW/CORE.SMART + false + 9e5a3295-08bf-4603-9fa3-d38a2f1100e5 + false + https://office.egalware.com:8172/MsDeploy.axd + office.egalware.com/GPW/CORE.SMART + + false + WMSVC + true + true + jenkins + <_SavePWD>true + <_TargetId>IISWebDeploy + net6.0 + + \ No newline at end of file diff --git a/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj b/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj index e87d43d..9a9ce4d 100644 --- a/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj +++ b/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj @@ -2,7 +2,7 @@ net6.0 - 3.0.2302.0319 + 3.0.2303.0319 enable enable diff --git a/GPW.CORE.WRKLOG/Properties/PublishProfiles/IIS-PROD.pubxml b/GPW.CORE.WRKLOG/Properties/PublishProfiles/IIS-PROD.pubxml new file mode 100644 index 0000000..7bafc40 --- /dev/null +++ b/GPW.CORE.WRKLOG/Properties/PublishProfiles/IIS-PROD.pubxml @@ -0,0 +1,27 @@ + + + + + MSDeploy + true + Release + Any CPU + https://office.egalware.com/GPW/CORE.WRKLOG + false + e4229ee4-ed4f-4507-8058-b01dc3ca1b28 + false + https://office.egalware.com:8172/MsDeploy.axd + office.egalware.com/GPW/CORE.WRKLOG + + true + WMSVC + true + true + jenkins + <_SavePWD>true + net6.0 + + \ No newline at end of file diff --git a/GPW.CORE.WRKLOG/Properties/PublishProfiles/IIS01.pubxml.user b/GPW.CORE.WRKLOG/Properties/PublishProfiles/IIS01.pubxml.user new file mode 100644 index 0000000..2baa13e --- /dev/null +++ b/GPW.CORE.WRKLOG/Properties/PublishProfiles/IIS01.pubxml.user @@ -0,0 +1,12 @@ + + + + + + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAw3dMMgC4FUywyOTV2xvCRgAAAAACAAAAAAADZgAAwAAAABAAAACGzXDK3zvXrM23DG9mcGE7AAAAAASAAACgAAAAEAAAAGyTdpfrCO34B/zMyya7+GAYAAAA0bmIiJbto8OwHhtlJG6RVMBv+aGxPm7pFAAAAF/Yr6uOS9vHRpx6NybbZsJ0uMXC + True|2022-04-21T16:35:38.6752750Z;False|2022-04-21T18:33:27.2112658+02:00; + + \ No newline at end of file diff --git a/GPW.CORE.WRKLOG/Properties/PublishProfiles/IIS02.pubxml.user b/GPW.CORE.WRKLOG/Properties/PublishProfiles/IIS02.pubxml.user new file mode 100644 index 0000000..b6928cd --- /dev/null +++ b/GPW.CORE.WRKLOG/Properties/PublishProfiles/IIS02.pubxml.user @@ -0,0 +1,11 @@ + + + + + + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAw3dMMgC4FUywyOTV2xvCRgAAAAACAAAAAAADZgAAwAAAABAAAACZ8mE3PAzYaMbEEJuz/qlCAAAAAASAAACgAAAAEAAAAMTImMeH8TO14ck041m7b7wYAAAAuCLX99F8xlTqDNnN3YpA76aC7IdXTgsVFAAAAHnIwAQapxZrj/ognLXRDjIDhXLu + + \ No newline at end of file diff --git a/GPW.CORE.WRKLOG/appsettings.json b/GPW.CORE.WRKLOG/appsettings.json index 08f3065..9f2c15c 100644 --- a/GPW.CORE.WRKLOG/appsettings.json +++ b/GPW.CORE.WRKLOG/appsettings.json @@ -29,8 +29,8 @@ "InfoRich": "samuele.locatelli@egalware.com,mara.baroni@egalware.com" }, "AdmApp": { - "LinkMal": "https://iis03.egalware.com/GPW/ADMIN/malattia", - "LinkRich": "https://iis03.egalware.com/GPW/ADMIN/richiesteDip" + "LinkMal": "https://office.egalware.com/GPW/ADMIN/malattia", + "LinkRich": "https://office.egalware.com/GPW/ADMIN/richiesteDip" }, "VetoIns": "true", "Redis": { diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index bf06c5a..c34d76a 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GPW - Gestione Presenze Web -

Versione: 3.0.2302.1709

+

Versione: 3.0.2303.0319


Note di rilascio: