diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f731a786..04c811f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,10 +90,16 @@ LAND:build: variables: APP_NAME: MP.Land SOL_NAME: MP-LAND + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH =~ /^feature\/LAND.+/ + when: always before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" script: + - echo $CI_COMMIT_BRANCH - dotnet build $env:APP_NAME/$env:APP_NAME.csproj PROG:build: @@ -103,6 +109,11 @@ PROG:build: variables: APP_NAME: MP.Prog SOL_NAME: MP-PROG + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH =~ /^feature\/PROG.+/ + when: always before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -116,6 +127,11 @@ STAT:build: variables: APP_NAME: MP.Stats SOL_NAME: MP-STATS + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH =~ /^feature\/STAT.+/ + when: always before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -129,6 +145,11 @@ MON:build: variables: APP_NAME: MP.Mon SOL_NAME: MP-MON + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH =~ /^feature\/MON.+/ + when: always before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -142,6 +163,11 @@ SPEC:build: variables: APP_NAME: MP.SPEC SOL_NAME: MP-SPEC + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH =~ /^feature\/SPEC.+/ + when: always before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -155,6 +181,11 @@ INVE:build: variables: APP_NAME: MP.INVE SOL_NAME: MP-INVE + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH =~ /^feature\/INVE.+/ + when: always before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -168,6 +199,11 @@ CONF:build: variables: APP_NAME: IobConf.UI SOL_NAME: IobConf + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH =~ /^feature\/CONF.+/ + when: always before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -181,6 +217,11 @@ IOC:build: variables: APP_NAME: MP.IOC SOL_NAME: MP-IOC + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH =~ /^feature\/IOC.+/ + when: always before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -194,6 +235,11 @@ TAB3:build: variables: APP_NAME: MP-TAB-SERV SOL_NAME: MP-TAB3 + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH =~ /^feature\/TAB.+/ + when: always before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" @@ -212,8 +258,10 @@ LAND:IIS01:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH =~ /^feature\/LAND.+/ + when: always needs: ["LAND:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -229,8 +277,10 @@ PROG:IIS01:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH =~ /^feature\/PROG.+/ + when: always needs: ["PROG:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -246,8 +296,10 @@ STAT:IIS01:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH =~ /^feature\/STAT.+/ + when: always needs: ["STAT:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -263,8 +315,10 @@ MON:IIS01:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop + 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 @@ -280,8 +334,10 @@ SPEC:IIS01:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH =~ /^feature\/SPEC.+/ + when: always needs: ["SPEC:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -297,8 +353,10 @@ INVE:IIS01:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH =~ /^feature\/INVE.+/ + when: always needs: ["INVE:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -314,8 +372,10 @@ CONF:IIS01:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH =~ /^feature\/CONF.+/ + when: always needs: ["CONF:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -331,8 +391,10 @@ IOC:IIS01:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH =~ /^feature\/IOC.+/ + when: always needs: ["IOC:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -348,8 +410,10 @@ TAB3:IIS01:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop + rules: + - if: $CI_COMMIT_BRANCH == 'develop' + - if: $CI_COMMIT_BRANCH =~ /^feature\/TAB.+/ + when: always needs: ["TAB3:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -366,8 +430,8 @@ LAND:IIS02:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' needs: ["LAND:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -384,8 +448,8 @@ PROG:IIS02:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' needs: ["PROG:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -402,8 +466,8 @@ STAT:IIS02:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' needs: ["STAT:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -420,8 +484,8 @@ MON:IIS02:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' needs: ["MON:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -438,8 +502,8 @@ SPEC:IIS02:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' needs: ["SPEC:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -456,8 +520,8 @@ INVE:IIS02:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' needs: ["INVE:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -474,8 +538,8 @@ CONF:IIS02:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' needs: ["CONF:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -492,8 +556,8 @@ IOC:IIS02:deploy: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop + rules: + - if: $CI_COMMIT_BRANCH == 'master' needs: ["IOC:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -512,9 +576,9 @@ LAND:installer: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH == 'develop' needs: ["LAND:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -534,9 +598,9 @@ PROG:installer: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH == 'develop' needs: ["PROG:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -556,9 +620,9 @@ STAT:installer: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH == 'develop' needs: ["STAT:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -578,9 +642,9 @@ MON:installer: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH == 'develop' needs: ["MON:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -600,9 +664,9 @@ SPEC:installer: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH == 'develop' needs: ["SPEC:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -622,9 +686,9 @@ INVE:installer: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH == 'develop' needs: ["INVE:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -666,9 +730,9 @@ IOC:installer: before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" - only: - - develop - - master + rules: + - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH == 'develop' needs: ["IOC:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj @@ -713,8 +777,6 @@ PROG:release: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" only: - #- feature/Deploy_CI_CD - # - master - tags except: - branches @@ -738,8 +800,6 @@ STAT:release: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" only: - #- feature/Deploy_CI_CD - # - master - tags except: - branches diff --git a/MP.Land/Components/CmpFooter.razor b/MP.Land/Components/CmpFooter.razor index 75e13002..1ba50c22 100644 --- a/MP.Land/Components/CmpFooter.razor +++ b/MP.Land/Components/CmpFooter.razor @@ -4,7 +4,7 @@
@adesso - Egalware + Egalware  
diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj index 2cc99106..424ea1e4 100644 --- a/MP.Land/MP.Land.csproj +++ b/MP.Land/MP.Land.csproj @@ -3,7 +3,7 @@ net6.0 MP.Land - 6.16.2311.1009 + 6.16.2311.1619 @@ -44,6 +44,8 @@ + + diff --git a/MP.Land/Pages/About.razor b/MP.Land/Pages/About.razor index 945c6f4d..58a78d18 100644 --- a/MP.Land/Pages/About.razor +++ b/MP.Land/Pages/About.razor @@ -6,7 +6,7 @@
-
+
@@ -16,7 +16,7 @@ @@ -41,51 +41,51 @@

Info installazione


-
+
Remote Server:
-
+
@ServerStatus
-
+
Cliente:
-
+
@Installazione
-
+
App:
-
+
@Applicazione
-
+
Licenze:
-
+
@Licenze
-
+
Scadenza:
-
+
@($"{Scadenza:yyyy/MM/dd}")
-
+
Key
-
- @MastKey +
+
diff --git a/MP.Land/Pages/Contacts.razor b/MP.Land/Pages/Contacts.razor index d621d0db..0c2f4157 100644 --- a/MP.Land/Pages/Contacts.razor +++ b/MP.Land/Pages/Contacts.razor @@ -5,7 +5,7 @@
-
+
@@ -15,7 +15,7 @@ diff --git a/MP.Land/Pages/Index.razor b/MP.Land/Pages/Index.razor index 1d0d640f..95835196 100644 --- a/MP.Land/Pages/Index.razor +++ b/MP.Land/Pages/Index.razor @@ -3,7 +3,7 @@ @using MP.Land.Data @using MP.Land.Components -
+

MAPO Land

@@ -24,7 +24,7 @@
-
+
@if (ListRecords == null) { diff --git a/MP.Land/Pages/SysInfo.razor b/MP.Land/Pages/SysInfo.razor index f4e8ffe2..810db569 100644 --- a/MP.Land/Pages/SysInfo.razor +++ b/MP.Land/Pages/SysInfo.razor @@ -9,7 +9,7 @@
-
+
@@ -19,7 +19,7 @@ diff --git a/MP.Land/Pages/UpdateManager.razor b/MP.Land/Pages/UpdateManager.razor index 454cea83..8e50d9b2 100644 --- a/MP.Land/Pages/UpdateManager.razor +++ b/MP.Land/Pages/UpdateManager.razor @@ -4,7 +4,7 @@ @using MP.Land.Components @inject LicenseService LicServ -
+
@@ -43,7 +43,7 @@
} -
+
@if (ListRecords == null) { diff --git a/MP.Land/Pages/UserQr.razor b/MP.Land/Pages/UserQr.razor index 9f46b8c4..02a5b38c 100644 --- a/MP.Land/Pages/UserQr.razor +++ b/MP.Land/Pages/UserQr.razor @@ -3,7 +3,7 @@ @using MP.Land.Data @using MP.Land.Components -
+
@if (ListRecords == null) diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html index 2076f49f..609a99c8 100644 --- a/MP.Land/Resources/ChangeLog.html +++ b/MP.Land/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo gestione Programmi MAPO -

Versione: 6.16.2311.1009

+

Versione: 6.16.2311.1619


Note di rilascio:
    diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt index cf39a0ed..1cc366fe 100644 --- a/MP.Land/Resources/VersNum.txt +++ b/MP.Land/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2311.1009 +6.16.2311.1619 diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml index e09e8ed5..faf03670 100644 --- a/MP.Land/Resources/manifest.xml +++ b/MP.Land/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2311.1009 + 6.16.2311.1619 https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html false diff --git a/MP.Land/wwwroot/img/LogoEgalware.svg b/MP.Land/wwwroot/img/LogoEgalware.svg new file mode 100644 index 00000000..afcdb10c --- /dev/null +++ b/MP.Land/wwwroot/img/LogoEgalware.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/MP.Land/wwwroot/img/LogoEgalwareBianco.svg b/MP.Land/wwwroot/img/LogoEgalwareBianco.svg new file mode 100644 index 00000000..acb59f58 --- /dev/null +++ b/MP.Land/wwwroot/img/LogoEgalwareBianco.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +