diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 597614a8..e2265a00 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -271,7 +271,7 @@ ADM:staging: - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-ADM/MP-ADM.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Debug /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-ADM/MP-ADM.csproj' needs: ["ADM:build"] IO:staging: @@ -285,7 +285,7 @@ IO:staging: - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-IO/MP-IO.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Debug /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-IO/MP-IO.csproj' needs: ["IO:build"] SITE:staging: @@ -299,7 +299,7 @@ SITE:staging: - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-SITE/MP-SITE.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Debug /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-SITE/MP-SITE.csproj' needs: ["SITE:build"] # MON:staging: @@ -313,7 +313,7 @@ SITE:staging: # - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet' # - *version-fix # script: -# - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj' +# - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Debug /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj' # needs: ["MON:build"] TAB:staging: @@ -327,7 +327,7 @@ TAB:staging: - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-TAB/MP-TAB.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Debug /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-TAB/MP-TAB.csproj' needs: ["TAB:build"] MAG:staging: @@ -341,7 +341,7 @@ MAG:staging: - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MAG/MP-MAG.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Debug /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MAG/MP-MAG.csproj' needs: ["MAG:build"] ADM:deploy: @@ -355,7 +355,7 @@ ADM:deploy: - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS03 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-ADM/MP-ADM.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-ADM/MP-ADM.csproj' needs: ["ADM:build"] IO:deploy: @@ -369,7 +369,7 @@ IO:deploy: - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS03 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-IO/MP-IO.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-IO/MP-IO.csproj' needs: ["IO:build"] SITE:deploy: @@ -383,7 +383,7 @@ SITE:deploy: - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS03 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-SITE/MP-SITE.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-SITE/MP-SITE.csproj' needs: ["SITE:build"] # MON:deploy: @@ -397,7 +397,7 @@ SITE:deploy: # - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet' # - *version-fix # script: -# - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS03 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj' +# - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj' # needs: ["MON:build"] TAB:deploy: @@ -411,7 +411,7 @@ TAB:deploy: - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS03 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-TAB/MP-TAB.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-TAB/MP-TAB.csproj' needs: ["TAB:build"] MAG:deploy: @@ -425,7 +425,7 @@ MAG:deploy: - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS03 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MAG/MP-MAG.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MAG/MP-MAG.csproj' needs: ["MAG:build"] ADM:install: diff --git a/MP-ADM/Web.Release.config b/MP-ADM/Web.Release.config index d291a2b0..fb81ed8d 100644 --- a/MP-ADM/Web.Release.config +++ b/MP-ADM/Web.Release.config @@ -3,20 +3,14 @@ - - - - - + \ No newline at end of file diff --git a/MP-IO/Controllers/IOBController.cs b/MP-IO/Controllers/IOBController.cs index 5770e5db..1c08f3fd 100644 --- a/MP-IO/Controllers/IOBController.cs +++ b/MP-IO/Controllers/IOBController.cs @@ -1572,12 +1572,14 @@ namespace MP_IO.Controllers // GET: IOB (è un check alive del server) public string Index() { - if (memLayer.ML.CRB("IOB_RedEnab")) + //if (memLayer.ML.CRB("IOB_RedEnab")) + if (true) { // conto la richiesta nel contatore REDIS long nCall = memLayer.ML.setRCntI(DataLayer.mHash("COUNT:pCall:IOB_INDEX")); //... se == nCall2Log scrivo su log e resetto - long nCall2Log = memLayer.ML.cdvi("nCall2Log"); + long nCall2Log = 100;// memLayer.ML.cdvi("nCall2Log"); + //long nCall2Log = memLayer.ML.cdvi("nCall2Log"); if (nCall >= nCall2Log) { // loggo diff --git a/MP-IO/MP-IO.csproj.user b/MP-IO/MP-IO.csproj.user index 9ee9ffcb..9e08f9d6 100644 --- a/MP-IO/MP-IO.csproj.user +++ b/MP-IO/MP-IO.csproj.user @@ -1,7 +1,7 @@ - + - C:\Users\samuele.steamw\source\MoonPro.net\MP-IO\Properties\PublishProfiles\IIS03.pubxml + C:\Users\samuele.steamw\source\MoonPro.net\MP-IO\Properties\PublishProfiles\IIS01.pubxml true ShowAllFiles @@ -10,7 +10,7 @@ - Debug|Any CPU + Release|Any CPU MvcControllerEmptyScaffolder root/Common/MVC/Controller 600 diff --git a/MP-IO/Properties/PublishProfiles/IIS01.pubxml.user b/MP-IO/Properties/PublishProfiles/IIS01.pubxml.user index b32207a5..b2e3acdb 100644 --- a/MP-IO/Properties/PublishProfiles/IIS01.pubxml.user +++ b/MP-IO/Properties/PublishProfiles/IIS01.pubxml.user @@ -7,5 +7,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAH0adXzrANk+QkSQiwkrZoAAAAAACAAAAAAADZgAAwAAAABAAAABHE5oPoHlG6fwYbvPGkksuAAAAAASAAACgAAAAEAAAALhOWzlQAPxJ2VE8lisaR9gYAAAAkDFsctmhzdLpUmOVleVAckCWeuODp7F1FAAAAAxKlaqhbiV+t3IJ+FqzhN+bBKS/ + True|2025-06-04T11:11:35.2130452Z||;True|2025-06-04T13:05:51.8038152+02:00||; + \ No newline at end of file diff --git a/MP-IO/Web.Release.config b/MP-IO/Web.Release.config index 2410afa2..cd6b9a2b 100644 --- a/MP-IO/Web.Release.config +++ b/MP-IO/Web.Release.config @@ -4,11 +4,11 @@ - - - - - + + + + + diff --git a/MP-IO/Web.config b/MP-IO/Web.config index 63becdb7..7743938e 100644 --- a/MP-IO/Web.config +++ b/MP-IO/Web.config @@ -14,11 +14,11 @@ - - + + - - + + diff --git a/MP-MAG/Web.Release.config b/MP-MAG/Web.Release.config index 36ab23ba..102564af 100644 --- a/MP-MAG/Web.Release.config +++ b/MP-MAG/Web.Release.config @@ -3,17 +3,11 @@ - + + + + + - + + + + + - \ No newline at end of file diff --git a/MP-Site/Web.config b/MP-Site/Web.config index e196412c..bea816ba 100644 --- a/MP-Site/Web.config +++ b/MP-Site/Web.config @@ -14,8 +14,8 @@ - - + + diff --git a/MP-TAB/Web.Release.config b/MP-TAB/Web.Release.config index dcae2e8c..716356dd 100644 --- a/MP-TAB/Web.Release.config +++ b/MP-TAB/Web.Release.config @@ -1,9 +1,12 @@  - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/MapoSDK/dataConf.cs b/MapoSDK/dataConf.cs index 8bc0f11c..568fc6cd 100644 --- a/MapoSDK/dataConf.cs +++ b/MapoSDK/dataConf.cs @@ -29,6 +29,11 @@ namespace MapoSDK /// public string memAddr { get; set; } = ""; + /// + /// Struttura Valore composto a partire da altre variabili read/write esistenti + /// + public string ComposedVal { get; set; } = ""; + /// /// Tipo di dato ///