From c923bab373d0496769d5020a0004099224137ea8 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 4 Jan 2023 18:48:17 +0100 Subject: [PATCH 1/2] Rimozione conf installer! --- .gitlab-ci.yml | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 55b2f185..e57d12c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -681,27 +681,27 @@ INVE:installer: - *hashBuild - *nexusUpload -CONF:installer: - stage: installer - tags: - - win - variables: - APP_NAME: IobConf.UI - SOL_NAME: IobConf - NEXUS_PATH: IobConf - before_script: - - *nuget-fix - - dotnet restore "$env:SOL_NAME.sln" - only: - - develop - - master - needs: ["CONF: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 +# CONF:installer: +# stage: installer +# tags: +# - win +# variables: +# APP_NAME: IobConf.UI +# SOL_NAME: IobConf +# NEXUS_PATH: IobConf +# before_script: +# - *nuget-fix +# - dotnet restore "$env:SOL_NAME.sln" +# only: +# - develop +# - master +# needs: ["CONF: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 LAND:release: stage: release From ead4fa49093ab941bacc65cccad59480c9a5c2ed Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 5 Jan 2023 15:59:59 +0100 Subject: [PATCH 2/2] Fix stats x modello dati amcchine: - chiedeva valori accessori - non mappati nel sinonimo --- MP.Data/Controllers/MpStatsController.cs | 6 +++--- MP.Data/DatabaseModels/Macchine.cs | 14 +++++++------- MP.Stats/MP.Stats.csproj | 2 +- MP.Stats/Resources/ChangeLog.html | 2 +- MP.Stats/Resources/VersNum.txt | 2 +- MP.Stats/Resources/manifest.xml | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 8f41290e..fe23f682 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -94,9 +94,9 @@ namespace MP.Data.Controllers using (var dbCtx = new MoonPro_STATSContext(_configuration)) { dbResult = dbCtx - .DbSetMacchine - .OrderBy(x => x.IdxMacchina) - .ToList(); + .DbSetMacchine + .OrderBy(x => x.IdxMacchina) + .ToList(); } return dbResult; } diff --git a/MP.Data/DatabaseModels/Macchine.cs b/MP.Data/DatabaseModels/Macchine.cs index 4337b5ef..a2bbcc56 100644 --- a/MP.Data/DatabaseModels/Macchine.cs +++ b/MP.Data/DatabaseModels/Macchine.cs @@ -18,14 +18,14 @@ namespace MP.Data.DatabaseModels [Key] public string IdxMacchina { get; set; } public string CodMacchina { get; set; } = ""; - public string Descrizione { get; set; } = ""; public string Nome { get; set; } = ""; - public string Note { get; set; } = ""; - public string url { get; set; } = ""; - public string locazione { get; set; } = ""; - public string css { get; set; } = ""; - public int RowNum { get; set; } = 0; - public int ColNum { get; set; } = 0; + public string Descrizione { get; set; } = ""; + //public string Note { get; set; } = ""; + //public string url { get; set; } = ""; + //public string locazione { get; set; } = ""; + //public string css { get; set; } = ""; + //public int RowNum { get; set; } = 0; + //public int ColNum { get; set; } = 0; #endregion Public Properties } diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 39ac2560..0e6fd8b4 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,7 +4,7 @@ net6.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 6.16.2211.1517 + 6.16.2301.0515 diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html index 5e47116b..f6705649 100644 --- a/MP.Stats/Resources/ChangeLog.html +++ b/MP.Stats/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo statistiche MAPO -

Versione: 6.16.2211.1517

+

Versione: 6.16.2301.0515


Note di rilascio:
    diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt index b5d4a429..fa88e81f 100644 --- a/MP.Stats/Resources/VersNum.txt +++ b/MP.Stats/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2211.1517 +6.16.2301.0515 diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml index 920440d2..d54c4351 100644 --- a/MP.Stats/Resources/manifest.xml +++ b/MP.Stats/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2211.1517 + 6.16.2301.0515 https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html false