diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9394d30..d78758b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -390,24 +390,24 @@ STAT:IIS01:deploy: - 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=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj -MON:IIS01:deploy: - stage: deploy - tags: - - win - variables: - APP_NAME: MP.Mon - SOL_NAME: MP-MON - before_script: - - *nuget-fix - - dotnet restore "$env:SOL_NAME.sln" - rules: - - if: $CI_COMMIT_BRANCH == 'develop' - - if: $CI_COMMIT_BRANCH =~ /^feature\/MON.+/ - when: always - needs: ["MON:build"] - 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=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj +# MON:IIS01:deploy: +# stage: deploy +# tags: +# - win +# variables: +# APP_NAME: MP.Mon +# SOL_NAME: MP-MON +# before_script: +# - *nuget-fix +# - dotnet restore "$env:SOL_NAME.sln" +# rules: +# - if: $CI_COMMIT_BRANCH == 'develop' +# - if: $CI_COMMIT_BRANCH =~ /^feature\/MON.+/ +# when: always +# needs: ["MON:build"] +# 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=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj SPEC:IIS01:deploy: stage: deploy @@ -564,23 +564,23 @@ STAT:IIS03:deploy: - dotnet publish -p:PublishProfile=IIS03.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 - dotnet publish -p:PublishProfile=IIS04.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 -MON:IIS03:deploy: - stage: deploy - tags: - - win - variables: - APP_NAME: MP.Mon - SOL_NAME: MP-MON - before_script: - - *nuget-fix - - dotnet restore "$env:SOL_NAME.sln" - rules: - - if: $CI_COMMIT_BRANCH == 'master' - needs: ["MON:build"] - script: - - dotnet build $env:APP_NAME/$env:APP_NAME.csproj - - dotnet publish -p:PublishProfile=IIS03.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 - - dotnet publish -p:PublishProfile=IIS04.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 +# MON:IIS03:deploy: +# stage: deploy +# tags: +# - win +# variables: +# APP_NAME: MP.Mon +# SOL_NAME: MP-MON +# before_script: +# - *nuget-fix +# - dotnet restore "$env:SOL_NAME.sln" +# rules: +# - if: $CI_COMMIT_BRANCH == 'master' +# needs: ["MON:build"] +# script: +# - dotnet build $env:APP_NAME/$env:APP_NAME.csproj +# - dotnet publish -p:PublishProfile=IIS03.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 +# - dotnet publish -p:PublishProfile=IIS04.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 SPEC:IIS03:deploy: stage: deploy @@ -741,27 +741,27 @@ STAT:installer: - *hashBuild - *nexusUpload -MON:installer: - stage: installer - tags: - - win - variables: - APP_NAME: MP.Mon - SOL_NAME: MP-MON - NEXUS_PATH: MP-MON - before_script: - - *nuget-fix - - dotnet restore "$env:SOL_NAME.sln" - rules: - - if: $CI_COMMIT_BRANCH == 'master' - - if: $CI_COMMIT_BRANCH == 'develop' - needs: ["MON:build"] - script: - - dotnet build $env:APP_NAME/$env:APP_NAME.csproj - - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:APP_NAME/$env:APP_NAME.csproj -o:publish -p:verbosity=quiet - # qui il deploy su nexus... - - *hashBuild - - *nexusUpload +# MON:installer: +# stage: installer +# tags: +# - win +# variables: +# APP_NAME: MP.Mon +# SOL_NAME: MP-MON +# NEXUS_PATH: MP-MON +# before_script: +# - *nuget-fix +# - dotnet restore "$env:SOL_NAME.sln" +# rules: +# - if: $CI_COMMIT_BRANCH == 'master' +# - if: $CI_COMMIT_BRANCH == 'develop' +# needs: ["MON:build"] +# script: +# - dotnet build $env:APP_NAME/$env:APP_NAME.csproj +# - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:APP_NAME/$env:APP_NAME.csproj -o:publish -p:verbosity=quiet +# # qui il deploy su nexus... +# - *hashBuild +# - *nexusUpload SPEC:installer: stage: installer @@ -962,26 +962,26 @@ STAT:release: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj - dotnet publish -c Release -o ./publish $env:APP_NAME/$env:APP_NAME.csproj -p:verbosity=quiet -MON:release: - stage: release - tags: - - win - variables: - APP_NAME: MP.Mon - SOL_NAME: MP-MON - NEXUS_PATH: MP-MON - before_script: - - *nuget-fix - - dotnet restore "$env:SOL_NAME.sln" - rules: - - if: $CI_COMMIT_TAG - needs: ["MON:build"] - artifacts: - paths: - - publish/ - script: - - dotnet build $env:APP_NAME/$env:APP_NAME.csproj - - dotnet publish -c Release -o ./publish $env:APP_NAME/$env:APP_NAME.csproj -p:verbosity=quiet +# MON:release: +# stage: release +# tags: +# - win +# variables: +# APP_NAME: MP.Mon +# SOL_NAME: MP-MON +# NEXUS_PATH: MP-MON +# before_script: +# - *nuget-fix +# - dotnet restore "$env:SOL_NAME.sln" +# rules: +# - if: $CI_COMMIT_TAG +# needs: ["MON:build"] +# artifacts: +# paths: +# - publish/ +# script: +# - dotnet build $env:APP_NAME/$env:APP_NAME.csproj +# - dotnet publish -c Release -o ./publish $env:APP_NAME/$env:APP_NAME.csproj -p:verbosity=quiet SPEC:release: stage: release diff --git a/MP-MON/MP-MON.Client/MP-MON.Client.csproj b/MP-MON/MP-MON.Client/MP-MON.Client.csproj index 154419dc..6ade8940 100644 --- a/MP-MON/MP-MON.Client/MP-MON.Client.csproj +++ b/MP-MON/MP-MON.Client/MP-MON.Client.csproj @@ -8,6 +8,8 @@ Default MP.MON.Client $(AssemblyName.Replace(' ', '_')) + true + true diff --git a/MP-MON/MP-MON/.config/dotnet-tools.json b/MP-MON/MP-MON/.config/dotnet-tools.json new file mode 100644 index 00000000..0280531d --- /dev/null +++ b/MP-MON/MP-MON/.config/dotnet-tools.json @@ -0,0 +1,13 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "dotnet-ef": { + "version": "9.0.3", + "commands": [ + "dotnet-ef" + ], + "rollForward": false + } + } +} \ No newline at end of file diff --git a/MP-MON8/MP-MON8.csproj b/MP-MON8/MP-MON8.csproj index bb6c0668..fcd6759f 100644 --- a/MP-MON8/MP-MON8.csproj +++ b/MP-MON8/MP-MON8.csproj @@ -19,12 +19,12 @@ - - + + - + diff --git a/MP-TAB3/Components/CheckControls.razor.cs b/MP-TAB3/Components/CheckControls.razor.cs index a0b229f0..9852fa03 100644 --- a/MP-TAB3/Components/CheckControls.razor.cs +++ b/MP-TAB3/Components/CheckControls.razor.cs @@ -121,12 +121,9 @@ namespace MP_TAB3.Components { if (RecMSE != null) { - if (MServ.LastIdxMacchina != RecMSE.IdxMacchina) - { - ShowInsFermata = CheckShowInsFermata; - ShowReqControls = await CheckShowReqControls(); - MServ.LastIdxMacchina = RecMSE.IdxMacchina; - } + ShowInsFermata = CheckShowInsFermata; + ShowReqControls = await CheckShowReqControls(); + MServ.LastIdxMacchina = RecMSE.IdxMacchina; } } diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 659e5d51..d354439b 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2503.1316 + 6.16.2503.1410 enable MP_TAB3 @@ -36,13 +36,14 @@ - - - + + + + - - + + diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 73d7d868..407fcaf8 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2503.1316

+

Versione: 6.16.2503.1410


Note di rilascio: