From 16fd43be038301f04d382686b8bb57d427271940 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 20 Apr 2022 19:08:49 +0200 Subject: [PATCH 01/31] Aggiunto tipo HLPInt: interi calcolati moltiplicando HIGH value x mezzo Uint16.Max --- MapoSDK/Enums.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/MapoSDK/Enums.cs b/MapoSDK/Enums.cs index a041f6cc..d0e5c1a4 100644 --- a/MapoSDK/Enums.cs +++ b/MapoSDK/Enums.cs @@ -99,7 +99,12 @@ /// /// Tipo stringa /// - String + String, + + /// + /// Timpo intero da High/Low Bit positivo (high bit va moltiplicato x 32768 = Uint16Max/2) + /// + HLPInt } /// From 68993ba2b30d8573ee666d7b5a78a33541a973d3 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 20 Apr 2022 19:22:49 +0200 Subject: [PATCH 02/31] Cambio da int --> double x factor di scalatura --- MapoSDK/dataConf.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MapoSDK/dataConf.cs b/MapoSDK/dataConf.cs index 1c91903b..9c4e22fa 100644 --- a/MapoSDK/dataConf.cs +++ b/MapoSDK/dataConf.cs @@ -16,9 +16,9 @@ namespace MapoSDK public string description { get; set; } = ""; /// - /// Fattore per eventuale divisione (es leggo 1234 --> 12,34 con factor=100) + /// Fattore per eventuale scalatura (es leggo 1234 --> 12,34 con factor=0.01, 123'400 con factor=100) /// - public int factor { get; set; } = 1; + public double factor { get; set; } = 1; /// /// Indice nell'area di memoria (da valore iniziale = 0) From 4eba76ba5820c76ff6d7d9117b2a4111e77ed676 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 21 Apr 2022 08:31:28 +0200 Subject: [PATCH 03/31] Update controller x aggiunta sendReboot da IOB + test fix yaml nuget --- .gitlab-ci.yml | 2 +- MP-IO/Controllers/IOBController.cs | 37 ++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a846f19..e89762d0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -120,7 +120,7 @@ SDK: script: - '& "$env:MSBUILD_PATH" MapoSDK/MapoSDK.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/Release /verbosity:minimal /m' - '& Remove-Item *.nupkg' - - '& $env:NUGET_PATH pack MapoSDK\MapoSDK.csproj -properties Configuration=$env:APP_CONF -Version $env:NEW_REL' + - '& $env:NUGET_PATH pack MapoSDK\MapoSDK.csproj -properties Configuration=$env:APP_CONF,owners=EgalWare,authors=S.E.Locatelli -Version $env:NEW_REL' - '& $env:NUGET_PATH setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source https://nexus.steamware.net/repository/nuget-hosted' - '& $env:NUGET_PATH push MapoSDK.$env:NEW_REL.nupkg -Source https://nexus.steamware.net/repository/nuget-hosted' # - *sendSDK diff --git a/MP-IO/Controllers/IOBController.cs b/MP-IO/Controllers/IOBController.cs index f9a7dc9d..3cff397a 100644 --- a/MP-IO/Controllers/IOBController.cs +++ b/MP-IO/Controllers/IOBController.cs @@ -1195,6 +1195,43 @@ namespace MP_IO.Controllers return answ; } + /// + /// Salva MAC adress + IP dopo il reboot + /// GET: IOB/sendReboot?idxMacchina=5&mac=18:C0:4D:37:3C:8C + /// + /// IP del Gateway + /// + public string sendReboot(string idxMacchina, string mac) + { + string answ = "NO"; + string IPv4 = ""; + string agent = ""; + try + { + // recupero IP del client remoto + IPv4 = Request.UserHostName; + agent = Request.UserAgent; + } + catch + { } + try + { + // ora salvo che la macchina è stata (ri)avviata... + MapoDb.MapoDb MapoDbObj = new MapoDb.MapoDb(); + MapoDbObj.registraStartup(idxMacchina, IPv4, agent, mac); + answ = "OK"; + } + catch (Exception exc) + { + if (memLayer.ML.CRI("_logLevel") > 5) + { + string errore = string.Format("Errore: {0}{1}", Environment.NewLine, exc); + logger.lg.scriviLog(errore, tipoLog.EXCEPTION); + } + } + return answ; + } + /// /// Salva IP del gateway dopo il reboot /// From f88df90038c43ba70391f98d0471d90e628ff033 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 21 Apr 2022 15:28:34 +0200 Subject: [PATCH 04/31] Update x pubblicazione nuget --- .gitlab-ci.yml | 2 +- MapoSDK/MapoSDK.csproj | 5 +++++ MapoSDK/Properties/AssemblyInfo.cs | 2 +- VersGen/MoonPro.cs | 2 +- VersGen/MoonPro.tt | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e89762d0..6a846f19 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -120,7 +120,7 @@ SDK: script: - '& "$env:MSBUILD_PATH" MapoSDK/MapoSDK.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/Release /verbosity:minimal /m' - '& Remove-Item *.nupkg' - - '& $env:NUGET_PATH pack MapoSDK\MapoSDK.csproj -properties Configuration=$env:APP_CONF,owners=EgalWare,authors=S.E.Locatelli -Version $env:NEW_REL' + - '& $env:NUGET_PATH pack MapoSDK\MapoSDK.csproj -properties Configuration=$env:APP_CONF -Version $env:NEW_REL' - '& $env:NUGET_PATH setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source https://nexus.steamware.net/repository/nuget-hosted' - '& $env:NUGET_PATH push MapoSDK.$env:NEW_REL.nupkg -Source https://nexus.steamware.net/repository/nuget-hosted' # - *sendSDK diff --git a/MapoSDK/MapoSDK.csproj b/MapoSDK/MapoSDK.csproj index 99951053..3e2e358c 100644 --- a/MapoSDK/MapoSDK.csproj +++ b/MapoSDK/MapoSDK.csproj @@ -11,6 +11,11 @@ MapoSDK MapoSDK v4.0 + Samuele E. Locatelli + EgalWare + SDK for MAPO solutions + MAPO;MES;SDK + Copyright (c) 2007-2022 EgalWare 512 true diff --git a/MapoSDK/Properties/AssemblyInfo.cs b/MapoSDK/Properties/AssemblyInfo.cs index 2e872eb4..135003d2 100644 --- a/MapoSDK/Properties/AssemblyInfo.cs +++ b/MapoSDK/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; // set di attributi. Modificare i valori di questi attributi per modificare le informazioni // associate a un assembly. [assembly: AssemblyTitle("MapoSDK")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("MAPO Assembly SDK")] [assembly: AssemblyConfiguration("")] //[assembly: AssemblyCompany("")] [assembly: AssemblyProduct("MapoSDK")] diff --git a/VersGen/MoonPro.cs b/VersGen/MoonPro.cs index 395f4dbd..d935ce48 100644 --- a/VersGen/MoonPro.cs +++ b/VersGen/MoonPro.cs @@ -7,5 +7,5 @@ using System.Reflection; [assembly: AssemblyVersion("0.0.0.0")] [assembly: AssemblyFileVersion("0.0.0.0")] -[assembly: AssemblyCopyright("SteamWare-EgalWare © 2007+")] +[assembly: AssemblyCopyright("SteamWare & EgalWare © 2007+")] [assembly: AssemblyCompany("EgalWare")] diff --git a/VersGen/MoonPro.tt b/VersGen/MoonPro.tt index bbca491c..7c6e8885 100644 --- a/VersGen/MoonPro.tt +++ b/VersGen/MoonPro.tt @@ -8,5 +8,5 @@ using System.Reflection; [assembly: AssemblyVersion("0.0.0.0")] [assembly: AssemblyFileVersion("0.0.0.0")] -[assembly: AssemblyCopyright("SteamWare-EgalWare © 2007+")] +[assembly: AssemblyCopyright("SteamWare & EgalWare © 2007+")] [assembly: AssemblyCompany("EgalWare")] From 60b66179d44b4fe3716a5c9b6db9030e98fde49b Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 14:52:17 +0200 Subject: [PATCH 05/31] Aggiunta preliminare file nuspec --- MapoSDK.nuspec | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 MapoSDK.nuspec diff --git a/MapoSDK.nuspec b/MapoSDK.nuspec new file mode 100644 index 00000000..7ba67fa4 --- /dev/null +++ b/MapoSDK.nuspec @@ -0,0 +1,18 @@ + + + + MapoSDK + $version$ + Mapo SDK LIbrary + Samuele E. Locatelli + false + MIT + $description$ + $releaseNotes$ + $copyright$ + MAPO;SDK;IOB + + + + + \ No newline at end of file From e1c7af08208078d0a0edd4501bcf3ebf586c4ca0 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 15:22:26 +0200 Subject: [PATCH 06/31] Aggiunta conf nuspec --- MapoSDK.Develop.nuspec | 18 ++++++++++++++++++ MapoSDK.nuspec => MapoSDK.Release.nuspec | 10 +++++----- 2 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 MapoSDK.Develop.nuspec rename MapoSDK.nuspec => MapoSDK.Release.nuspec (65%) diff --git a/MapoSDK.Develop.nuspec b/MapoSDK.Develop.nuspec new file mode 100644 index 00000000..1adcb020 --- /dev/null +++ b/MapoSDK.Develop.nuspec @@ -0,0 +1,18 @@ + + + + MapoSDK + #version# + MapoSDK + Samuele E. Locatelli + false + MIT + SDK for MAPO solutions - beta/unstable + #releaseNotes# + #copyright# + MAPO;SDK;IOB + + + + + \ No newline at end of file diff --git a/MapoSDK.nuspec b/MapoSDK.Release.nuspec similarity index 65% rename from MapoSDK.nuspec rename to MapoSDK.Release.nuspec index 7ba67fa4..1f896c8e 100644 --- a/MapoSDK.nuspec +++ b/MapoSDK.Release.nuspec @@ -2,14 +2,14 @@ MapoSDK - $version$ - Mapo SDK LIbrary + #version# + MapoSDK Samuele E. Locatelli false MIT - $description$ - $releaseNotes$ - $copyright$ + SDK for MAPO solutions + #releaseNotes# + #copyright# MAPO;SDK;IOB From 5bd685e6cae42b192a343dd881e4673424698d29 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 15:22:35 +0200 Subject: [PATCH 07/31] Update yaml (da testare) --- .gitlab-ci.yml | 22 ++++++++++++++++++++++ MP-IO/MP-IO.csproj.user | 2 +- MP-Site/MP-Site.csproj.user | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a846f19..90a8172b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,9 +92,31 @@ variables: - | $env:NEW_REL = $env:VERS_MAIN+"."+(get-date –format yyMM)+"."+(get-date –format dHH) echo "Set vers: $env:NEW_REL" + $anno = (get-date -format yyyy) + $adesso = (get-date -format dd:HH:mm) $contenuto = Get-Content -path 'VersGen\MoonPro.cs' -Raw $newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL $newContenuto | Set-Content -Path 'VersGen\MoonPro.cs' + echo "Modifica dati file nuspec Release" + $currRelease = $env:NEW_REL + $currDebug = $currRelease.Substring(0, $lastDot)+"-beta"+$currRelease.Substring($lastDot); + $find = "(.|\n)*?"; + $fileNameRel = "MapoSDK.Release.nuspec"; + $replRel = "" + $currRelease + ""; + $nuspDataRel = Get-Content $fileNameRel; + $nuspDataRelUpd = $nuspDataRel -replace $find, $replRel; + $nuspDataRelUpd = $nuspDataRelUpd -replace "#copyright#" "SteamWare-EgalWare, 2007-$anno" + $nuspDataRelUpd = $nuspDataRelUpd -replace "#releaseNotes#" "Build $adesso" + Set-Content -Path $fileNameRel -Value $nuspDataRelUpd; + echo "Modifica dati file nuspec Debug" + $fileNameDeb = "MapoSDK.Debug.nuspec"; + $replDeb = "" + $currDebug + ""; + $nuspDataDeb = Get-Content $fileNameDeb; + $nuspDataDebUpd = $nuspDataDeb -replace $find, $replDeb; + $nuspDataDebUpd = $nuspDataDebUpd -replace "#copyright#" "SteamWare-EgalWare, 2007-$anno" + $nuspDataDebUpd = $nuspDataDebUpd -replace "#releaseNotes#" "Build $adesso" + Set-Content -Path $fileNameDeb -Value $nuspDataDebUpd; + echo "replace completati" stages: - build diff --git a/MP-IO/MP-IO.csproj.user b/MP-IO/MP-IO.csproj.user index e85dec40..391097c4 100644 --- a/MP-IO/MP-IO.csproj.user +++ b/MP-IO/MP-IO.csproj.user @@ -10,7 +10,7 @@ - Debug|Any CPU + Release|Any CPU MvcControllerEmptyScaffolder root/Common/MVC/Controller 600 diff --git a/MP-Site/MP-Site.csproj.user b/MP-Site/MP-Site.csproj.user index c2cb7f33..3679bec0 100644 --- a/MP-Site/MP-Site.csproj.user +++ b/MP-Site/MP-Site.csproj.user @@ -8,7 +8,7 @@ - Debug|Any CPU + Release|Any CPU ShowAllFiles IIS02 From be4a64289d3fca2aa7c049c1819638c21d5ed277 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 15:35:37 +0200 Subject: [PATCH 08/31] typo replace string --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 90a8172b..b51fafb0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,9 +103,10 @@ variables: $find = "(.|\n)*?"; $fileNameRel = "MapoSDK.Release.nuspec"; $replRel = "" + $currRelease + ""; + $replCopy = "Copyright SteamWare-EgalWare, 2007-" + $anno $nuspDataRel = Get-Content $fileNameRel; $nuspDataRelUpd = $nuspDataRel -replace $find, $replRel; - $nuspDataRelUpd = $nuspDataRelUpd -replace "#copyright#" "SteamWare-EgalWare, 2007-$anno" + $nuspDataRelUpd = $nuspDataRelUpd -replace "#copyright#" $replCopy $nuspDataRelUpd = $nuspDataRelUpd -replace "#releaseNotes#" "Build $adesso" Set-Content -Path $fileNameRel -Value $nuspDataRelUpd; echo "Modifica dati file nuspec Debug" @@ -113,7 +114,7 @@ variables: $replDeb = "" + $currDebug + ""; $nuspDataDeb = Get-Content $fileNameDeb; $nuspDataDebUpd = $nuspDataDeb -replace $find, $replDeb; - $nuspDataDebUpd = $nuspDataDebUpd -replace "#copyright#" "SteamWare-EgalWare, 2007-$anno" + $nuspDataDebUpd = $nuspDataDebUpd -replace "#copyright#" $replCopy $nuspDataDebUpd = $nuspDataDebUpd -replace "#releaseNotes#" "Build $adesso" Set-Content -Path $fileNameDeb -Value $nuspDataDebUpd; echo "replace completati" From 76640c9e5a7a15d4e225a119983ef56de2d98541 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 15:36:51 +0200 Subject: [PATCH 09/31] ancora replace typo fix --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b51fafb0..38c96db1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -106,16 +106,16 @@ variables: $replCopy = "Copyright SteamWare-EgalWare, 2007-" + $anno $nuspDataRel = Get-Content $fileNameRel; $nuspDataRelUpd = $nuspDataRel -replace $find, $replRel; - $nuspDataRelUpd = $nuspDataRelUpd -replace "#copyright#" $replCopy - $nuspDataRelUpd = $nuspDataRelUpd -replace "#releaseNotes#" "Build $adesso" + $nuspDataRelUpd = $nuspDataRelUpd -replace "#copyright#", $replCopy; + $nuspDataRelUpd = $nuspDataRelUpd -replace "#releaseNotes#", "Build $adesso"; Set-Content -Path $fileNameRel -Value $nuspDataRelUpd; echo "Modifica dati file nuspec Debug" $fileNameDeb = "MapoSDK.Debug.nuspec"; $replDeb = "" + $currDebug + ""; $nuspDataDeb = Get-Content $fileNameDeb; $nuspDataDebUpd = $nuspDataDeb -replace $find, $replDeb; - $nuspDataDebUpd = $nuspDataDebUpd -replace "#copyright#" $replCopy - $nuspDataDebUpd = $nuspDataDebUpd -replace "#releaseNotes#" "Build $adesso" + $nuspDataDebUpd = $nuspDataDebUpd -replace "#copyright#", $replCopy; + $nuspDataDebUpd = $nuspDataDebUpd -replace "#releaseNotes#", "Build $adesso"; Set-Content -Path $fileNameDeb -Value $nuspDataDebUpd; echo "replace completati" From 604f2e92626057d9894833e58b38f0e96caebed0 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 15:38:03 +0200 Subject: [PATCH 10/31] Fix debug name typo --- MapoSDK.Develop.nuspec => MapoSDK.Debug.nuspec | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename MapoSDK.Develop.nuspec => MapoSDK.Debug.nuspec (100%) diff --git a/MapoSDK.Develop.nuspec b/MapoSDK.Debug.nuspec similarity index 100% rename from MapoSDK.Develop.nuspec rename to MapoSDK.Debug.nuspec From be6ccc9ed2abdd4f86b630b7845bd981ae603dfa Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 15:43:43 +0200 Subject: [PATCH 11/31] Pubblicazioni anche su develop di versione unstable --- .gitlab-ci.yml | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 38c96db1..11b2e6d0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,7 +127,7 @@ stages: - installer -SDK: +SDK-stable: stage: sdk tags: - win @@ -143,11 +143,30 @@ SDK: script: - '& "$env:MSBUILD_PATH" MapoSDK/MapoSDK.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/Release /verbosity:minimal /m' - '& Remove-Item *.nupkg' - - '& $env:NUGET_PATH pack MapoSDK\MapoSDK.csproj -properties Configuration=$env:APP_CONF -Version $env:NEW_REL' + - '& $env:NUGET_PATH pack MapoSDK.Release.nuspec' - '& $env:NUGET_PATH setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source https://nexus.steamware.net/repository/nuget-hosted' - '& $env:NUGET_PATH push MapoSDK.$env:NEW_REL.nupkg -Source https://nexus.steamware.net/repository/nuget-hosted' - # - *sendSDK - + +SDK-unstable: + stage: sdk + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "develop"' + variables: + APP_NAME: MP-ADM + NEXUS_PATH: MP-ADM + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" MapoSDK/MapoSDK.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/Release /verbosity:minimal /m' + - '& Remove-Item *.nupkg' + - '& $env:NUGET_PATH pack MapoSDK.Debug.nuspec' + - '& $env:NUGET_PATH setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source https://nexus.steamware.net/repository/nuget-hosted' + - '& $env:NUGET_PATH push MapoSDK.$env:NEW_REL.nupkg -Source https://nexus.steamware.net/repository/nuget-hosted' + ADM:build: stage: build variables: From 6e2ccc39275c04249bc39a3e5c280d8c7765abee Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 15:46:10 +0200 Subject: [PATCH 12/31] Fix tag + last dot --- .gitlab-ci.yml | 1 + MapoSDK.Debug.nuspec | 2 +- MapoSDK.Release.nuspec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 11b2e6d0..991800e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,6 +99,7 @@ variables: $newContenuto | Set-Content -Path 'VersGen\MoonPro.cs' echo "Modifica dati file nuspec Release" $currRelease = $env:NEW_REL + $lastDot = $currRelease.LastIndexOf("."); $currDebug = $currRelease.Substring(0, $lastDot)+"-beta"+$currRelease.Substring($lastDot); $find = "(.|\n)*?"; $fileNameRel = "MapoSDK.Release.nuspec"; diff --git a/MapoSDK.Debug.nuspec b/MapoSDK.Debug.nuspec index 1adcb020..f03586db 100644 --- a/MapoSDK.Debug.nuspec +++ b/MapoSDK.Debug.nuspec @@ -10,7 +10,7 @@ SDK for MAPO solutions - beta/unstable #releaseNotes# #copyright# - MAPO;SDK;IOB + MAPO SDK IOB diff --git a/MapoSDK.Release.nuspec b/MapoSDK.Release.nuspec index 1f896c8e..3fe162e3 100644 --- a/MapoSDK.Release.nuspec +++ b/MapoSDK.Release.nuspec @@ -10,7 +10,7 @@ SDK for MAPO solutions #releaseNotes# #copyright# - MAPO;SDK;IOB + MAPO SDK IOB From 959b538d0ef01bdd9005e1407331c132f7b3f3cc Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 15:58:36 +0200 Subject: [PATCH 13/31] Correzione invio versione debug selezionando solo dll puntuale --- .gitlab-ci.yml | 6 ++++-- MapoSDK.Debug.nuspec | 3 +++ MapoSDK.Release.nuspec | 6 +++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 991800e5..ad4d1e05 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,7 @@ variables: DEPLOY_FOLDER: 'c:\Projects\Deploy\MoonPro\Builds' VERS_MAIN: '6.14' NEW_REL: '' + NEW_DEB: '' NEXUS_PATH: 'MP-XXXX' APP_NAME: 'MP.Xxxx' APP_CONF: 'Release' @@ -101,6 +102,7 @@ variables: $currRelease = $env:NEW_REL $lastDot = $currRelease.LastIndexOf("."); $currDebug = $currRelease.Substring(0, $lastDot)+"-beta"+$currRelease.Substring($lastDot); + $env:NEW_DEB = $currDebug $find = "(.|\n)*?"; $fileNameRel = "MapoSDK.Release.nuspec"; $replRel = "" + $currRelease + ""; @@ -162,11 +164,11 @@ SDK-unstable: - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' - *version-fix script: - - '& "$env:MSBUILD_PATH" MapoSDK/MapoSDK.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/Release /verbosity:minimal /m' + - '& "$env:MSBUILD_PATH" MapoSDK/MapoSDK.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/Debug /verbosity:minimal /m' - '& Remove-Item *.nupkg' - '& $env:NUGET_PATH pack MapoSDK.Debug.nuspec' - '& $env:NUGET_PATH setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source https://nexus.steamware.net/repository/nuget-hosted' - - '& $env:NUGET_PATH push MapoSDK.$env:NEW_REL.nupkg -Source https://nexus.steamware.net/repository/nuget-hosted' + - '& $env:NUGET_PATH push MapoSDK.$env:NEW_DEB.nupkg -Source https://nexus.steamware.net/repository/nuget-hosted' ADM:build: stage: build diff --git a/MapoSDK.Debug.nuspec b/MapoSDK.Debug.nuspec index f03586db..aded2fbe 100644 --- a/MapoSDK.Debug.nuspec +++ b/MapoSDK.Debug.nuspec @@ -15,4 +15,7 @@ + + + \ No newline at end of file diff --git a/MapoSDK.Release.nuspec b/MapoSDK.Release.nuspec index 3fe162e3..d8463710 100644 --- a/MapoSDK.Release.nuspec +++ b/MapoSDK.Release.nuspec @@ -4,7 +4,7 @@ MapoSDK #version# MapoSDK - Samuele E. Locatelli + Samuele E. Locatelli, EgalWare false MIT SDK for MAPO solutions @@ -15,4 +15,8 @@ + + + + \ No newline at end of file From fcdcb1b13d8f482c9e1fc4d9516ab1c5a96a1e6e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 16:07:02 +0200 Subject: [PATCH 14/31] fix nuspec invertiti debug/release --- MapoSDK.Release.nuspec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MapoSDK.Release.nuspec b/MapoSDK.Release.nuspec index d8463710..cbc0b199 100644 --- a/MapoSDK.Release.nuspec +++ b/MapoSDK.Release.nuspec @@ -16,7 +16,6 @@ - - + \ No newline at end of file From dc29400bfd56527dc1dba8b307aa4867027bcd68 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 16:07:08 +0200 Subject: [PATCH 15/31] fix altro nuspec --- MapoSDK.Debug.nuspec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MapoSDK.Debug.nuspec b/MapoSDK.Debug.nuspec index aded2fbe..3af1ad7b 100644 --- a/MapoSDK.Debug.nuspec +++ b/MapoSDK.Debug.nuspec @@ -16,6 +16,7 @@ - + + \ No newline at end of file From 5bc5763fd5a364f3ff62a8d89702303d89c3892b Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 26 Apr 2022 16:11:26 +0200 Subject: [PATCH 16/31] Typo x vers instabile --- MapoSDK.Debug.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MapoSDK.Debug.nuspec b/MapoSDK.Debug.nuspec index 3af1ad7b..b6a20479 100644 --- a/MapoSDK.Debug.nuspec +++ b/MapoSDK.Debug.nuspec @@ -4,7 +4,7 @@ MapoSDK #version# MapoSDK - Samuele E. Locatelli + Samuele E. Locatelli, EgalWare false MIT SDK for MAPO solutions - beta/unstable From c46d94e51a22134a05f57df6386263729a486c3a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 29 Apr 2022 09:23:42 +0200 Subject: [PATCH 17/31] Bozza gestione company selector --- MP-ADM/Azienda.aspx | 7 +++ MP-ADM/Azienda.aspx.cs | 24 +++++++++ MP-ADM/Azienda.aspx.designer.cs | 26 +++++++++ .../WebUserControls/cmp_CompanySelector.ascx | 20 +++++++ .../cmp_CompanySelector.ascx.cs | 48 +++++++++++++++++ .../cmp_CompanySelector.ascx.designer.cs | 53 +++++++++++++++++++ MP-ADM/WebUserControls/mod_main_help.ascx | 4 ++ 7 files changed, 182 insertions(+) create mode 100644 MP-ADM/Azienda.aspx create mode 100644 MP-ADM/Azienda.aspx.cs create mode 100644 MP-ADM/Azienda.aspx.designer.cs create mode 100644 MP-ADM/WebUserControls/cmp_CompanySelector.ascx create mode 100644 MP-ADM/WebUserControls/cmp_CompanySelector.ascx.cs create mode 100644 MP-ADM/WebUserControls/cmp_CompanySelector.ascx.designer.cs diff --git a/MP-ADM/Azienda.aspx b/MP-ADM/Azienda.aspx new file mode 100644 index 00000000..c2fc36ea --- /dev/null +++ b/MP-ADM/Azienda.aspx @@ -0,0 +1,7 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/MoonPro.master" AutoEventWireup="true" CodeBehind="Azienda.aspx.cs" Inherits="MP_ADM.Azienda" %> + +<%@ Register Src="~/WebUserControls/cmp_CompanySelector.ascx" TagPrefix="uc1" TagName="cmp_CompanySelector" %> + + + + diff --git a/MP-ADM/Azienda.aspx.cs b/MP-ADM/Azienda.aspx.cs new file mode 100644 index 00000000..a6a91f11 --- /dev/null +++ b/MP-ADM/Azienda.aspx.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MP_ADM +{ + public partial class Azienda : BasePage + { + #region Protected Methods + + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + ((MoonPro)this.Master).showSearch = false; + } + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP-ADM/Azienda.aspx.designer.cs b/MP-ADM/Azienda.aspx.designer.cs new file mode 100644 index 00000000..da432ef3 --- /dev/null +++ b/MP-ADM/Azienda.aspx.designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace MP_ADM +{ + + + public partial class Azienda + { + + /// + /// cmp_CompanySelector control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::MP_ADM.WebUserControls.cmp_CompanySelector cmp_CompanySelector; + } +} diff --git a/MP-ADM/WebUserControls/cmp_CompanySelector.ascx b/MP-ADM/WebUserControls/cmp_CompanySelector.ascx new file mode 100644 index 00000000..5a41986a --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_CompanySelector.ascx @@ -0,0 +1,20 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_CompanySelector.ascx.cs" Inherits="MP_ADM.WebUserControls.cmp_CompanySelector" %> + +
+
+
+
+
+

<%: traduci("CurrentCompany") %>

+ + +
+
+
+ +
+
+ +
+
+ diff --git a/MP-ADM/WebUserControls/cmp_CompanySelector.ascx.cs b/MP-ADM/WebUserControls/cmp_CompanySelector.ascx.cs new file mode 100644 index 00000000..37e2099a --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_CompanySelector.ascx.cs @@ -0,0 +1,48 @@ +using SteamWare; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MP_ADM.WebUserControls +{ + public partial class cmp_CompanySelector : BaseUserControl + { + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + showBtn(false); + ddlCodGruppo.SelectedValue = memLayer.ML.cdv("AZIENDA"); + } + } + + + protected void ddlCodGruppo_SelectedIndexChanged(object sender, EventArgs e) + { + showBtn(true); + } + + private void showBtn(bool doShow) + { + lbtSetCompany.Visible = doShow; + lbtCancel.Visible = doShow; + } + + protected void lbtSetCompany_Click(object sender, EventArgs e) + { + // imposto company... + showBtn(false); + } + + protected void lbtCancel_Click(object sender, EventArgs e) + { + // reset company... + ddlCodGruppo.SelectedValue = memLayer.ML.cdv("AZIENDA"); + showBtn(false); + } + + } +} \ No newline at end of file diff --git a/MP-ADM/WebUserControls/cmp_CompanySelector.ascx.designer.cs b/MP-ADM/WebUserControls/cmp_CompanySelector.ascx.designer.cs new file mode 100644 index 00000000..8369ea78 --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_CompanySelector.ascx.designer.cs @@ -0,0 +1,53 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace MP_ADM.WebUserControls +{ + + + public partial class cmp_CompanySelector + { + + /// + /// ddlCodGruppo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlCodGruppo; + + /// + /// odsCodGruppo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsCodGruppo; + + /// + /// lbtSetCompany control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtSetCompany; + + /// + /// lbtCancel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtCancel; + } +} diff --git a/MP-ADM/WebUserControls/mod_main_help.ascx b/MP-ADM/WebUserControls/mod_main_help.ascx index 383afe70..799e3efc 100644 --- a/MP-ADM/WebUserControls/mod_main_help.ascx +++ b/MP-ADM/WebUserControls/mod_main_help.ascx @@ -51,6 +51,10 @@ <%: traduci("TechSheetMan") %> + + + <%: traduci("Azienda") %> + <%: traduci("Vocabolario") %> From b5c5900e02a63210602d6e094677ca902d136125 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 29 Apr 2022 09:23:55 +0200 Subject: [PATCH 18/31] Refresh Yaml --- .gitlab-ci.yml | 2 +- MP-ADM/MP-ADM.csproj | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad4d1e05..fd9d9cf4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -106,7 +106,7 @@ variables: $find = "(.|\n)*?"; $fileNameRel = "MapoSDK.Release.nuspec"; $replRel = "" + $currRelease + ""; - $replCopy = "Copyright SteamWare-EgalWare, 2007-" + $anno + $replCopy = "Copyright EgalWare, ©2007-" + $anno $nuspDataRel = Get-Content $fileNameRel; $nuspDataRelUpd = $nuspDataRel -replace $find, $replRel; $nuspDataRelUpd = $nuspDataRelUpd -replace "#copyright#", $replCopy; diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index 1883e98d..3b81a7d7 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -235,6 +235,7 @@ + @@ -601,6 +602,7 @@ + @@ -732,6 +734,13 @@ + + Azienda.aspx + ASPXCodeBehind + + + Azienda.aspx + Barcode.aspx ASPXCodeBehind @@ -924,6 +933,13 @@ MoonPro_noAjax.master + + cmp_CompanySelector.ascx + ASPXCodeBehind + + + cmp_CompanySelector.ascx + cmp_fileUpload.ascx ASPXCodeBehind From 70586ffdc8b11939310f9719be94895683264cbb Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 29 Apr 2022 09:25:19 +0200 Subject: [PATCH 19/31] Update nuget x Steamware libs --- MP-MAG/MP-MAG.csproj | 4 ++-- MP-MAG/packages.config | 2 +- MagData/MagData.csproj | 4 ++-- MagData/packages.config | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MP-MAG/MP-MAG.csproj b/MP-MAG/MP-MAG.csproj index bc8005c3..2bc4678f 100644 --- a/MP-MAG/MP-MAG.csproj +++ b/MP-MAG/MP-MAG.csproj @@ -135,8 +135,8 @@ ..\packages\SteamWare.Logger.5.1.2202.1818\lib\net462\SteamWare.Logger.dll - - ..\packages\SteamWare.Reports.5.1.2202.1818\lib\net462\SteamWare.Reports.dll + + ..\packages\SteamWare.Reports.5.2.2204.2819\lib\net462\SteamWare.Reports.dll diff --git a/MP-MAG/packages.config b/MP-MAG/packages.config index 650ff122..9b8f8e7f 100644 --- a/MP-MAG/packages.config +++ b/MP-MAG/packages.config @@ -56,7 +56,7 @@ - + diff --git a/MagData/MagData.csproj b/MagData/MagData.csproj index 66b3676f..c2d44014 100644 --- a/MagData/MagData.csproj +++ b/MagData/MagData.csproj @@ -94,8 +94,8 @@ ..\packages\SteamWare.Logger.5.1.2202.1818\lib\net462\SteamWare.Logger.dll - - ..\packages\SteamWare.Reports.5.1.2202.1818\lib\net462\SteamWare.Reports.dll + + ..\packages\SteamWare.Reports.5.2.2204.2819\lib\net462\SteamWare.Reports.dll ..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.2\System.dll diff --git a/MagData/packages.config b/MagData/packages.config index 7f32fa05..f73f6f4c 100644 --- a/MagData/packages.config +++ b/MagData/packages.config @@ -18,7 +18,7 @@ - + From 661662406df48bab02e584aad4ff7e0badcbc2ca Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 29 Apr 2022 09:43:31 +0200 Subject: [PATCH 20/31] Completo udpate delle steamware libs + pulizia files lib extra --- MP-ADM/App_Readme/README_SteamWare.txt | 2 +- .../SteamWare_demo/example-NLog.config | 4 +- MP-ADM/MP-ADM.csproj | 16 +- .../cmp_CompanySelector.ascx.cs | 1 + MP-ADM/packages.config | 4 +- MP-IO/App_Readme/README_SteamWare.txt | 2 +- .../SteamWare_demo/example-NLog.config | 4 +- MP-IO/MP-IO.csproj | 34 +- MP-IO/Web.config | 751 ++++++++-------- MP-IO/packages.config | 16 +- MP-MAG/App_Readme/README_SteamWare.txt | 2 +- .../SteamWare_demo/example-NLog.config | 4 +- MP-MAG/MP-MAG.csproj | 78 +- MP-MAG/Web.config | 841 +++++++++--------- MP-MAG/packages.config | 16 +- MP-Site/App_Readme/README_SteamWare.txt | 2 +- .../SteamWare_demo/example-NLog.config | 4 +- MP-Site/MP-Site.csproj | 16 +- MP-Site/packages.config | 4 +- MP-TAB/App_Readme/README_SteamWare.txt | 2 +- .../SteamWare_demo/example-NLog.config | 4 +- MP-TAB/MP-TAB.csproj | 16 +- MP-TAB/packages.config | 4 +- MagData/App_Readme/README_SteamWare.txt | 2 +- MagData/MagData.csproj | 14 +- MagData/packages.config | 4 +- MapoDb/App_Readme/README_SteamWare.txt | 2 +- .../SteamWare_demo/example-NLog.config | 4 +- MapoDb/MapoDb.csproj | 16 +- MapoDb/packages.config | 4 +- 30 files changed, 957 insertions(+), 916 deletions(-) diff --git a/MP-ADM/App_Readme/README_SteamWare.txt b/MP-ADM/App_Readme/README_SteamWare.txt index bf60ed18..954eff8b 100644 --- a/MP-ADM/App_Readme/README_SteamWare.txt +++ b/MP-ADM/App_Readme/README_SteamWare.txt @@ -1,5 +1,5 @@ --------------------------------------------------------------- -------- SteamWareLib SDK ------- +------- SteamWare SDK ------- --------------------------------------------------------------- Libreria di utility base di SteamWare. diff --git a/MP-ADM/App_Readme/SteamWare_demo/example-NLog.config b/MP-ADM/App_Readme/SteamWare_demo/example-NLog.config index a11a39e6..3461e583 100644 --- a/MP-ADM/App_Readme/SteamWare_demo/example-NLog.config +++ b/MP-ADM/App_Readme/SteamWare_demo/example-NLog.config @@ -19,13 +19,13 @@ - + \ No newline at end of file diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index 3b81a7d7..c4303894 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -120,11 +120,11 @@ ..\packages\StackExchange.Redis.2.2.88\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.5.1.2202.1818\lib\net462\SteamWare.dll + + ..\packages\SteamWare.5.2.2204.2819\lib\net462\SteamWare.dll - - ..\packages\SteamWare.Logger.5.1.2202.1818\lib\net462\SteamWare.Logger.dll + + ..\packages\SteamWare.Logger.5.2.2204.2819\lib\net462\SteamWare.Logger.dll ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -472,8 +472,10 @@ + + @@ -515,6 +517,10 @@ + + + + @@ -596,6 +602,8 @@ + + diff --git a/MP-ADM/WebUserControls/cmp_CompanySelector.ascx.cs b/MP-ADM/WebUserControls/cmp_CompanySelector.ascx.cs index 37e2099a..ddbb2ac2 100644 --- a/MP-ADM/WebUserControls/cmp_CompanySelector.ascx.cs +++ b/MP-ADM/WebUserControls/cmp_CompanySelector.ascx.cs @@ -34,6 +34,7 @@ namespace MP_ADM.WebUserControls protected void lbtSetCompany_Click(object sender, EventArgs e) { // imposto company... + memLayer.ML.up showBtn(false); } diff --git a/MP-ADM/packages.config b/MP-ADM/packages.config index 8f277e41..c0bb3ec9 100644 --- a/MP-ADM/packages.config +++ b/MP-ADM/packages.config @@ -43,8 +43,8 @@ - - + + diff --git a/MP-IO/App_Readme/README_SteamWare.txt b/MP-IO/App_Readme/README_SteamWare.txt index bf60ed18..954eff8b 100644 --- a/MP-IO/App_Readme/README_SteamWare.txt +++ b/MP-IO/App_Readme/README_SteamWare.txt @@ -1,5 +1,5 @@ --------------------------------------------------------------- -------- SteamWareLib SDK ------- +------- SteamWare SDK ------- --------------------------------------------------------------- Libreria di utility base di SteamWare. diff --git a/MP-IO/App_Readme/SteamWare_demo/example-NLog.config b/MP-IO/App_Readme/SteamWare_demo/example-NLog.config index a11a39e6..3461e583 100644 --- a/MP-IO/App_Readme/SteamWare_demo/example-NLog.config +++ b/MP-IO/App_Readme/SteamWare_demo/example-NLog.config @@ -19,13 +19,13 @@ - + \ No newline at end of file diff --git a/MP-IO/MP-IO.csproj b/MP-IO/MP-IO.csproj index 864f8802..3bf5ba15 100644 --- a/MP-IO/MP-IO.csproj +++ b/MP-IO/MP-IO.csproj @@ -116,11 +116,11 @@ ..\packages\StackExchange.Redis.2.2.88\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.5.1.2202.1818\lib\net462\SteamWare.dll + + ..\packages\SteamWare.5.2.2204.2819\lib\net462\SteamWare.dll - - ..\packages\SteamWare.Logger.5.1.2202.1818\lib\net462\SteamWare.Logger.dll + + ..\packages\SteamWare.Logger.5.2.2204.2819\lib\net462\SteamWare.Logger.dll ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -192,7 +192,7 @@ - ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll + ..\packages\Microsoft.AspNet.WebPages.3.2.8\lib\net45\System.Web.Helpers.dll ..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll @@ -200,20 +200,20 @@ ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll - - ..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll + + ..\packages\Microsoft.AspNet.Mvc.5.2.8\lib\net45\System.Web.Mvc.dll - ..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll + ..\packages\Microsoft.AspNet.Razor.3.2.8\lib\net45\System.Web.Razor.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll + ..\packages\Microsoft.AspNet.WebPages.3.2.8\lib\net45\System.Web.WebPages.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll + ..\packages\Microsoft.AspNet.WebPages.3.2.8\lib\net45\System.Web.WebPages.Deployment.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll + ..\packages\Microsoft.AspNet.WebPages.3.2.8\lib\net45\System.Web.WebPages.Razor.dll @@ -268,6 +268,8 @@ + + @@ -282,6 +284,8 @@ + + Designer @@ -362,11 +366,15 @@ - - PreserveNewest + + + + + + Designer diff --git a/MP-IO/Web.config b/MP-IO/Web.config index 4b3ffb92..f3101701 100644 --- a/MP-IO/Web.config +++ b/MP-IO/Web.config @@ -4,370 +4,379 @@ http://go.microsoft.com/fwlink/?LinkId=169433 --> - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/MP-IO/packages.config b/MP-IO/packages.config index 304fb43c..f2739eca 100644 --- a/MP-IO/packages.config +++ b/MP-IO/packages.config @@ -9,10 +9,10 @@ - - - - + + + + @@ -21,8 +21,8 @@ - - + + @@ -42,8 +42,8 @@ - - + + diff --git a/MP-MAG/App_Readme/README_SteamWare.txt b/MP-MAG/App_Readme/README_SteamWare.txt index bf60ed18..954eff8b 100644 --- a/MP-MAG/App_Readme/README_SteamWare.txt +++ b/MP-MAG/App_Readme/README_SteamWare.txt @@ -1,5 +1,5 @@ --------------------------------------------------------------- -------- SteamWareLib SDK ------- +------- SteamWare SDK ------- --------------------------------------------------------------- Libreria di utility base di SteamWare. diff --git a/MP-MAG/App_Readme/SteamWare_demo/example-NLog.config b/MP-MAG/App_Readme/SteamWare_demo/example-NLog.config index a11a39e6..3461e583 100644 --- a/MP-MAG/App_Readme/SteamWare_demo/example-NLog.config +++ b/MP-MAG/App_Readme/SteamWare_demo/example-NLog.config @@ -19,13 +19,13 @@ - + \ No newline at end of file diff --git a/MP-MAG/MP-MAG.csproj b/MP-MAG/MP-MAG.csproj index 2bc4678f..cb14a98b 100644 --- a/MP-MAG/MP-MAG.csproj +++ b/MP-MAG/MP-MAG.csproj @@ -129,11 +129,11 @@ ..\packages\StackExchange.Redis.2.2.88\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.5.1.2202.1818\lib\net462\SteamWare.dll + + ..\packages\SteamWare.5.2.2204.2819\lib\net462\SteamWare.dll - - ..\packages\SteamWare.Logger.5.1.2202.1818\lib\net462\SteamWare.Logger.dll + + ..\packages\SteamWare.Logger.5.2.2204.2819\lib\net462\SteamWare.Logger.dll ..\packages\SteamWare.Reports.5.2.2204.2819\lib\net462\SteamWare.Reports.dll @@ -204,7 +204,25 @@ + + ..\packages\Microsoft.AspNet.WebPages.3.2.8\lib\net45\System.Web.Helpers.dll + + + ..\packages\Microsoft.AspNet.Mvc.5.2.8\lib\net45\System.Web.Mvc.dll + + + ..\packages\Microsoft.AspNet.Razor.3.2.8\lib\net45\System.Web.Razor.dll + + + ..\packages\Microsoft.AspNet.WebPages.3.2.8\lib\net45\System.Web.WebPages.dll + + + ..\packages\Microsoft.AspNet.WebPages.3.2.8\lib\net45\System.Web.WebPages.Deployment.dll + + + ..\packages\Microsoft.AspNet.WebPages.3.2.8\lib\net45\System.Web.WebPages.Razor.dll + @@ -221,39 +239,15 @@ - - True - ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll - - True - ..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll - - True - ..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - True ..\packages\WebGrease.1.6.0\lib\WebGrease.dll @@ -299,9 +293,7 @@ - - ASPXCodeBehind - + ASPXCodeBehind @@ -316,7 +308,6 @@ jumper.aspx - ASPXCodeBehind jumper.aspx @@ -338,7 +329,6 @@ Default.aspx - ASPXCodeBehind Default.aspx @@ -352,56 +342,48 @@ EnrollDevice.aspx - ASPXCodeBehind EnrollDevice.aspx jumper.aspx - ASPXCodeBehind jumper.aspx login.aspx - ASPXCodeBehind login.aspx packList.aspx - ASPXCodeBehind packList.aspx PLScanner.aspx - ASPXCodeBehind PLScanner.aspx printCartOdl.aspx - ASPXCodeBehind printCartOdl.aspx Reset.aspx - ASPXCodeBehind Reset.aspx SmartStarter.aspx - ASPXCodeBehind SmartStarter.aspx @@ -415,7 +397,6 @@ tryLogin.aspx - ASPXCodeBehind tryLogin.aspx @@ -443,35 +424,30 @@ elencoLotti.aspx - ASPXCodeBehind elencoLotti.aspx prtFiniti.aspx - ASPXCodeBehind prtFiniti.aspx gestPedane.aspx - ASPXCodeBehind gestPedane.aspx prtSemilav.aspx - ASPXCodeBehind prtSemilav.aspx menu.aspx - ASPXCodeBehind menu.aspx @@ -827,6 +803,8 @@ + + Always @@ -886,6 +864,10 @@ + + + + @@ -931,6 +913,8 @@ + + diff --git a/MP-MAG/Web.config b/MP-MAG/Web.config index 4f4eec80..fcc410bd 100644 --- a/MP-MAG/Web.config +++ b/MP-MAG/Web.config @@ -4,423 +4,422 @@ https://go.microsoft.com/fwlink/?LinkId=301879 --> - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/MP-MAG/packages.config b/MP-MAG/packages.config index 9b8f8e7f..4c84713a 100644 --- a/MP-MAG/packages.config +++ b/MP-MAG/packages.config @@ -14,10 +14,10 @@ - - - - + + + + @@ -32,8 +32,8 @@ - - + + @@ -54,8 +54,8 @@ - - + + diff --git a/MP-Site/App_Readme/README_SteamWare.txt b/MP-Site/App_Readme/README_SteamWare.txt index bf60ed18..954eff8b 100644 --- a/MP-Site/App_Readme/README_SteamWare.txt +++ b/MP-Site/App_Readme/README_SteamWare.txt @@ -1,5 +1,5 @@ --------------------------------------------------------------- -------- SteamWareLib SDK ------- +------- SteamWare SDK ------- --------------------------------------------------------------- Libreria di utility base di SteamWare. diff --git a/MP-Site/App_Readme/SteamWare_demo/example-NLog.config b/MP-Site/App_Readme/SteamWare_demo/example-NLog.config index a11a39e6..3461e583 100644 --- a/MP-Site/App_Readme/SteamWare_demo/example-NLog.config +++ b/MP-Site/App_Readme/SteamWare_demo/example-NLog.config @@ -19,13 +19,13 @@ - + \ No newline at end of file diff --git a/MP-Site/MP-Site.csproj b/MP-Site/MP-Site.csproj index b2c6dff5..0db8ea1d 100644 --- a/MP-Site/MP-Site.csproj +++ b/MP-Site/MP-Site.csproj @@ -116,11 +116,11 @@ ..\packages\StackExchange.Redis.2.2.88\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.5.1.2202.1818\lib\net462\SteamWare.dll + + ..\packages\SteamWare.5.2.2204.2819\lib\net462\SteamWare.dll - - ..\packages\SteamWare.Logger.5.1.2202.1818\lib\net462\SteamWare.Logger.dll + + ..\packages\SteamWare.Logger.5.2.2204.2819\lib\net462\SteamWare.Logger.dll ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -312,8 +312,10 @@ + + @@ -356,6 +358,10 @@ + + + + @@ -440,6 +446,8 @@ + + diff --git a/MP-Site/packages.config b/MP-Site/packages.config index 441380d6..1fcfd6b4 100644 --- a/MP-Site/packages.config +++ b/MP-Site/packages.config @@ -41,8 +41,8 @@ - - + + diff --git a/MP-TAB/App_Readme/README_SteamWare.txt b/MP-TAB/App_Readme/README_SteamWare.txt index bf60ed18..954eff8b 100644 --- a/MP-TAB/App_Readme/README_SteamWare.txt +++ b/MP-TAB/App_Readme/README_SteamWare.txt @@ -1,5 +1,5 @@ --------------------------------------------------------------- -------- SteamWareLib SDK ------- +------- SteamWare SDK ------- --------------------------------------------------------------- Libreria di utility base di SteamWare. diff --git a/MP-TAB/App_Readme/SteamWare_demo/example-NLog.config b/MP-TAB/App_Readme/SteamWare_demo/example-NLog.config index a11a39e6..3461e583 100644 --- a/MP-TAB/App_Readme/SteamWare_demo/example-NLog.config +++ b/MP-TAB/App_Readme/SteamWare_demo/example-NLog.config @@ -19,13 +19,13 @@ - + \ No newline at end of file diff --git a/MP-TAB/MP-TAB.csproj b/MP-TAB/MP-TAB.csproj index 799a6c37..95af13be 100644 --- a/MP-TAB/MP-TAB.csproj +++ b/MP-TAB/MP-TAB.csproj @@ -178,11 +178,11 @@ ..\packages\StackExchange.Redis.2.2.88\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.5.1.2202.1818\lib\net462\SteamWare.dll + + ..\packages\SteamWare.5.2.2204.2819\lib\net462\SteamWare.dll - - ..\packages\SteamWare.Logger.5.1.2202.1818\lib\net462\SteamWare.Logger.dll + + ..\packages\SteamWare.Logger.5.2.2204.2819\lib\net462\SteamWare.Logger.dll ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -507,8 +507,10 @@ + + @@ -545,6 +547,10 @@ PreserveNewest + + + + Designer @@ -684,6 +690,8 @@ + + diff --git a/MP-TAB/packages.config b/MP-TAB/packages.config index deaa4443..67442a7c 100644 --- a/MP-TAB/packages.config +++ b/MP-TAB/packages.config @@ -43,8 +43,8 @@ - - + + diff --git a/MagData/App_Readme/README_SteamWare.txt b/MagData/App_Readme/README_SteamWare.txt index bf60ed18..954eff8b 100644 --- a/MagData/App_Readme/README_SteamWare.txt +++ b/MagData/App_Readme/README_SteamWare.txt @@ -1,5 +1,5 @@ --------------------------------------------------------------- -------- SteamWareLib SDK ------- +------- SteamWare SDK ------- --------------------------------------------------------------- Libreria di utility base di SteamWare. diff --git a/MagData/MagData.csproj b/MagData/MagData.csproj index c2d44014..d0741404 100644 --- a/MagData/MagData.csproj +++ b/MagData/MagData.csproj @@ -89,10 +89,10 @@ ..\packages\StackExchange.Redis.2.2.88\lib\net461\StackExchange.Redis.dll - ..\packages\SteamWare.IO.5.1.2202.1818\lib\net462\SteamWare.IO.dll + ..\packages\SteamWare.IO.5.2.2204.2819\lib\net462\SteamWare.IO.dll - - ..\packages\SteamWare.Logger.5.1.2202.1818\lib\net462\SteamWare.Logger.dll + + ..\packages\SteamWare.Logger.5.2.2204.2819\lib\net462\SteamWare.Logger.dll ..\packages\SteamWare.Reports.5.2.2204.2819\lib\net462\SteamWare.Reports.dll @@ -255,6 +255,10 @@ DS_Utility.xsd + + + + SettingsSingleFileGenerator @@ -267,6 +271,10 @@ + + + + diff --git a/MagData/packages.config b/MagData/packages.config index f73f6f4c..120fd6b4 100644 --- a/MagData/packages.config +++ b/MagData/packages.config @@ -16,8 +16,8 @@ - - + + diff --git a/MapoDb/App_Readme/README_SteamWare.txt b/MapoDb/App_Readme/README_SteamWare.txt index bf60ed18..954eff8b 100644 --- a/MapoDb/App_Readme/README_SteamWare.txt +++ b/MapoDb/App_Readme/README_SteamWare.txt @@ -1,5 +1,5 @@ --------------------------------------------------------------- -------- SteamWareLib SDK ------- +------- SteamWare SDK ------- --------------------------------------------------------------- Libreria di utility base di SteamWare. diff --git a/MapoDb/App_Readme/SteamWare_demo/example-NLog.config b/MapoDb/App_Readme/SteamWare_demo/example-NLog.config index a11a39e6..3461e583 100644 --- a/MapoDb/App_Readme/SteamWare_demo/example-NLog.config +++ b/MapoDb/App_Readme/SteamWare_demo/example-NLog.config @@ -19,13 +19,13 @@ - + \ No newline at end of file diff --git a/MapoDb/MapoDb.csproj b/MapoDb/MapoDb.csproj index 0059bdc8..8f148643 100644 --- a/MapoDb/MapoDb.csproj +++ b/MapoDb/MapoDb.csproj @@ -130,11 +130,11 @@ ..\packages\StackExchange.Redis.2.2.88\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.5.1.2202.1818\lib\net462\SteamWare.dll + + ..\packages\SteamWare.5.2.2204.2819\lib\net462\SteamWare.dll - - ..\packages\SteamWare.Logger.5.1.2202.1818\lib\net462\SteamWare.Logger.dll + + ..\packages\SteamWare.Logger.5.2.2204.2819\lib\net462\SteamWare.Logger.dll @@ -378,6 +378,10 @@ DS_Utility.xsd + + + + SettingsSingleFileGenerator @@ -430,6 +434,10 @@ + + + + diff --git a/MapoDb/packages.config b/MapoDb/packages.config index e340c5bb..9255b11e 100644 --- a/MapoDb/packages.config +++ b/MapoDb/packages.config @@ -21,8 +21,8 @@ - - + + From 6039686a3c51a2097c8ff2c88a4a1c318afd94b7 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 29 Apr 2022 09:46:29 +0200 Subject: [PATCH 21/31] completo refresh nuget steamware libs --- MP-ADM/MP-ADM.csproj | 8 -------- MP-IO/MP-IO.csproj | 8 -------- MP-MAG/MP-MAG.csproj | 28 +++++++++++++++++++--------- MP-Site/MP-Site.csproj | 8 -------- MP-TAB/MP-TAB.csproj | 8 -------- MagData/MagData.csproj | 8 -------- MapoDb/MapoDb.csproj | 8 -------- 7 files changed, 19 insertions(+), 57 deletions(-) diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index c4303894..13034c09 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -472,10 +472,8 @@ - - @@ -517,10 +515,6 @@ - - - - @@ -602,8 +596,6 @@ - - diff --git a/MP-IO/MP-IO.csproj b/MP-IO/MP-IO.csproj index 3bf5ba15..4673c173 100644 --- a/MP-IO/MP-IO.csproj +++ b/MP-IO/MP-IO.csproj @@ -268,8 +268,6 @@ - - @@ -284,8 +282,6 @@ - - Designer @@ -369,10 +365,6 @@ PreserveNewest - - - - diff --git a/MP-MAG/MP-MAG.csproj b/MP-MAG/MP-MAG.csproj index cb14a98b..58865caf 100644 --- a/MP-MAG/MP-MAG.csproj +++ b/MP-MAG/MP-MAG.csproj @@ -293,7 +293,9 @@ - + + ASPXCodeBehind + ASPXCodeBehind @@ -308,6 +310,7 @@ jumper.aspx + ASPXCodeBehind jumper.aspx @@ -329,6 +332,7 @@ Default.aspx + ASPXCodeBehind Default.aspx @@ -342,48 +346,56 @@ EnrollDevice.aspx + ASPXCodeBehind EnrollDevice.aspx jumper.aspx + ASPXCodeBehind jumper.aspx login.aspx + ASPXCodeBehind login.aspx packList.aspx + ASPXCodeBehind packList.aspx PLScanner.aspx + ASPXCodeBehind PLScanner.aspx printCartOdl.aspx + ASPXCodeBehind printCartOdl.aspx Reset.aspx + ASPXCodeBehind Reset.aspx SmartStarter.aspx + ASPXCodeBehind SmartStarter.aspx @@ -397,6 +409,7 @@ tryLogin.aspx + ASPXCodeBehind tryLogin.aspx @@ -424,30 +437,35 @@ elencoLotti.aspx + ASPXCodeBehind elencoLotti.aspx prtFiniti.aspx + ASPXCodeBehind prtFiniti.aspx gestPedane.aspx + ASPXCodeBehind gestPedane.aspx prtSemilav.aspx + ASPXCodeBehind prtSemilav.aspx menu.aspx + ASPXCodeBehind menu.aspx @@ -803,8 +821,6 @@ - - Always @@ -864,10 +880,6 @@ - - - - @@ -913,8 +925,6 @@ - - diff --git a/MP-Site/MP-Site.csproj b/MP-Site/MP-Site.csproj index 0db8ea1d..c09b0014 100644 --- a/MP-Site/MP-Site.csproj +++ b/MP-Site/MP-Site.csproj @@ -312,10 +312,8 @@ - - @@ -358,10 +356,6 @@ - - - - @@ -446,8 +440,6 @@ - - diff --git a/MP-TAB/MP-TAB.csproj b/MP-TAB/MP-TAB.csproj index 95af13be..5ad81a7f 100644 --- a/MP-TAB/MP-TAB.csproj +++ b/MP-TAB/MP-TAB.csproj @@ -507,10 +507,8 @@ - - @@ -547,10 +545,6 @@ PreserveNewest - - - - Designer @@ -690,8 +684,6 @@ - - diff --git a/MagData/MagData.csproj b/MagData/MagData.csproj index d0741404..c11d2553 100644 --- a/MagData/MagData.csproj +++ b/MagData/MagData.csproj @@ -255,10 +255,6 @@ DS_Utility.xsd - - - - SettingsSingleFileGenerator @@ -271,10 +267,6 @@ - - - - diff --git a/MapoDb/MapoDb.csproj b/MapoDb/MapoDb.csproj index 8f148643..5d3e4ce6 100644 --- a/MapoDb/MapoDb.csproj +++ b/MapoDb/MapoDb.csproj @@ -378,10 +378,6 @@ DS_Utility.xsd - - - - SettingsSingleFileGenerator @@ -434,10 +430,6 @@ - - - - From 58ca857f8318f2f666ac2fd3b2e2f6aea2c0be8b Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 29 Apr 2022 09:46:43 +0200 Subject: [PATCH 22/31] aggiunta preliminare gestione cambio valore config x azienda --- .../cmp_CompanySelector.ascx.cs | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/MP-ADM/WebUserControls/cmp_CompanySelector.ascx.cs b/MP-ADM/WebUserControls/cmp_CompanySelector.ascx.cs index ddbb2ac2..7f8d3289 100644 --- a/MP-ADM/WebUserControls/cmp_CompanySelector.ascx.cs +++ b/MP-ADM/WebUserControls/cmp_CompanySelector.ascx.cs @@ -15,7 +15,7 @@ namespace MP_ADM.WebUserControls if (!Page.IsPostBack) { showBtn(false); - ddlCodGruppo.SelectedValue = memLayer.ML.cdv("AZIENDA"); + aziendaSel = memLayer.ML.cdv("AZIENDA"); } } @@ -31,17 +31,34 @@ namespace MP_ADM.WebUserControls lbtCancel.Visible = doShow; } + protected string aziendaSel + { + get + { + string answ = ""; + answ = ddlCodGruppo.SelectedValue; + return answ; + } + set + { + ddlCodGruppo.SelectedValue = value; + } + } + protected void lbtSetCompany_Click(object sender, EventArgs e) { // imposto company... - memLayer.ML.up + if (!string.IsNullOrEmpty(aziendaSel)) + { + memLayer.ML.updateAppConf("AZIENDA", aziendaSel); + } showBtn(false); } protected void lbtCancel_Click(object sender, EventArgs e) { // reset company... - ddlCodGruppo.SelectedValue = memLayer.ML.cdv("AZIENDA"); + aziendaSel = memLayer.ML.cdv("AZIENDA"); showBtn(false); } From a63aa502f9e6d9764b13fba0bea901fbfde60db1 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 29 Apr 2022 09:51:37 +0200 Subject: [PATCH 23/31] Completo editing company selector --- .../WebUserControls/cmp_CompanySelector.ascx | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/MP-ADM/WebUserControls/cmp_CompanySelector.ascx b/MP-ADM/WebUserControls/cmp_CompanySelector.ascx index 5a41986a..f5014833 100644 --- a/MP-ADM/WebUserControls/cmp_CompanySelector.ascx +++ b/MP-ADM/WebUserControls/cmp_CompanySelector.ascx @@ -3,18 +3,22 @@
-
+
-

<%: traduci("CurrentCompany") %>

- - +
+
+

<%: traduci("CurrentCompany") %>

+ + +
+
+ +
+
+ +
+
-
- -
-
- -
From a264d6cbc03c88f6397361e98ddad9422388ea6e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 29 Apr 2022 09:52:50 +0200 Subject: [PATCH 24/31] Nuget update NLog --- MP-ADM/MP-ADM.csproj | 2 +- MP-ADM/packages.config | 2 +- MP-IO/MP-IO.csproj | 6 +- MP-IO/NLog.xsd | 260 +++++++++++++++++++++++++--------------- MP-IO/packages.config | 6 +- MP-MAG/MP-MAG.csproj | 2 +- MP-MAG/packages.config | 2 +- MP-Site/MP-Site.csproj | 2 +- MP-Site/packages.config | 2 +- MP-TAB/MP-TAB.csproj | 2 +- MP-TAB/NLog.xsd | 260 +++++++++++++++++++++++++--------------- MP-TAB/packages.config | 6 +- MagData/MagData.csproj | 2 +- MagData/packages.config | 2 +- MapoDb/MapoDb.csproj | 2 +- MapoDb/packages.config | 2 +- 16 files changed, 352 insertions(+), 208 deletions(-) diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index 13034c09..b51bf213 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -100,7 +100,7 @@ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.7.13\lib\net45\NLog.dll + ..\packages\NLog.4.7.15\lib\net45\NLog.dll ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll diff --git a/MP-ADM/packages.config b/MP-ADM/packages.config index c0bb3ec9..9c1dafe1 100644 --- a/MP-ADM/packages.config +++ b/MP-ADM/packages.config @@ -35,7 +35,7 @@ - + diff --git a/MP-IO/MP-IO.csproj b/MP-IO/MP-IO.csproj index 4673c173..d9ae70b8 100644 --- a/MP-IO/MP-IO.csproj +++ b/MP-IO/MP-IO.csproj @@ -96,7 +96,7 @@ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.7.13\lib\net45\NLog.dll + ..\packages\NLog.4.7.15\lib\net45\NLog.dll ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll @@ -362,11 +362,11 @@ + + PreserveNewest - - Designer diff --git a/MP-IO/NLog.xsd b/MP-IO/NLog.xsd index eefeec81..d1674723 100644 --- a/MP-IO/NLog.xsd +++ b/MP-IO/NLog.xsd @@ -457,19 +457,21 @@ - + + + - + - + @@ -552,16 +554,21 @@ NDLC item separator. + + + NDC item separator. + + + + + Indicates whether to include dictionary contents. + + Indicates whether to include source info (file name and line number) in the information sent over the network. - - - Renderer for log4j:event logger-xml-attribute (Default ${logger}) - - Indicates whether to include NLog-specific extensions to log4j schema. @@ -587,6 +594,11 @@ Indicates whether to include dictionary contents. + + + Option to include all properties from the log events + + Indicates whether to include call site (class and method name) in the information sent over the network. @@ -602,9 +614,9 @@ AppInfo field. By default it's the friendly name of the current AppDomain. - + - NDC item separator. + Renderer for log4j:event logger-xml-attribute (Default ${logger}) @@ -2240,19 +2252,21 @@ - + + + - + - + @@ -2335,16 +2349,21 @@ NDLC item separator. + + + NDC item separator. + + + + + Indicates whether to include dictionary contents. + + Indicates whether to include source info (file name and line number) in the information sent over the network. - - - Renderer for log4j:event logger-xml-attribute (Default ${logger}) - - Indicates whether to include NLog-specific extensions to log4j schema. @@ -2370,6 +2389,11 @@ Indicates whether to include dictionary contents. + + + Option to include all properties from the log events + + Indicates whether to include call site (class and method name) in the information sent over the network. @@ -2385,9 +2409,9 @@ AppInfo field. By default it's the friendly name of the current AppDomain. - + - NDC item separator. + Renderer for log4j:event logger-xml-attribute (Default ${logger}) @@ -2993,9 +3017,11 @@ + + @@ -3028,6 +3054,11 @@ Option to include all properties from the log event (as JSON) + + + Option to include all properties from the log event (as JSON) + + Indicates whether to include contents of the dictionary. @@ -3043,6 +3074,11 @@ Indicates whether to include contents of the dictionary. + + + Indicates whether to include contents of the dictionary. + + How far should the JSON serializer follow object references before backing off @@ -3123,10 +3159,12 @@ + + @@ -3140,6 +3178,11 @@ Indicates whether to include call site (class and method name) in the information sent over the network. + + + Option to include all properties from the log events + + Indicates whether to include contents of the dictionary. @@ -3160,6 +3203,11 @@ Indicates whether to include contents of the stack. + + + Indicates whether to include contents of the dictionary. + + Indicates whether to include source info (file name and line number) in the information sent over the network. @@ -3186,34 +3234,46 @@ - - - - - - + + + + + + - - - - - - + + + + + + + + - - - List of property names to exclude when is true - - Option to include all properties from the log event (as XML) - + + + XML attribute name to use when rendering property-key When null (or empty) then key-attribute is not included + + + + + XML element name to use for rendering IList-collections items + + + + + How far should the XML serializer follow object references before backing off + + + Indicates whether to include contents of the dictionary. @@ -3223,24 +3283,14 @@ Indicates whether to include contents of the dictionary. - + - How far should the XML serializer follow object references before backing off + Indicates whether to include contents of the dictionary. - + - XML element name to use for rendering IList-collections items - - - - - XML attribute name to use when rendering property-key When null (or empty) then key-attribute is not included - - - - - XML element name to use when rendering properties + Option to include all properties from the log event (as XML) @@ -3248,24 +3298,14 @@ XML attribute name to use when rendering property-value When null (or empty) then value-attribute is not included and value is formatted as XML-element-value - + - Name of the root XML element + List of property names to exclude when is true - + - Value inside the root XML element - - - - - Whether a ElementValue with empty value should be included in the output - - - - - Auto indent and create new lines + XML element name to use when rendering properties @@ -3273,37 +3313,29 @@ Determines whether or not this attribute will be Xml encoded. + + + Auto indent and create new lines + + + + + Whether a ElementValue with empty value should be included in the output + + + + + Value inside the root XML element + + + + + Name of the root XML element + + - - - - - - - - - - Layout that will be rendered as the attribute's value. - - - - - Name of the attribute. - - - - - Determines whether or not this attribute will be Xml encoded. - - - - - Whether an attribute with empty value should be included in the output - - - @@ -3315,8 +3347,10 @@ + + @@ -3358,6 +3392,11 @@ Option to include all properties from the log event (as XML) + + + Option to include all properties from the log event (as XML) + + Indicates whether to include contents of the dictionary. @@ -3368,6 +3407,11 @@ Indicates whether to include contents of the dictionary. + + + Indicates whether to include contents of the dictionary. + + How far should the XML serializer follow object references before backing off @@ -3394,6 +3438,34 @@ + + + + + + + + + + Layout that will be rendered as the attribute's value. + + + + + Name of the attribute. + + + + + Determines whether or not this attribute will be Xml encoded. + + + + + Whether an attribute with empty value should be included in the output + + + diff --git a/MP-IO/packages.config b/MP-IO/packages.config index f2739eca..a3916368 100644 --- a/MP-IO/packages.config +++ b/MP-IO/packages.config @@ -33,9 +33,9 @@ - - - + + + diff --git a/MP-MAG/MP-MAG.csproj b/MP-MAG/MP-MAG.csproj index 58865caf..16ccabea 100644 --- a/MP-MAG/MP-MAG.csproj +++ b/MP-MAG/MP-MAG.csproj @@ -109,7 +109,7 @@ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.7.13\lib\net45\NLog.dll + ..\packages\NLog.4.7.15\lib\net45\NLog.dll ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll diff --git a/MP-MAG/packages.config b/MP-MAG/packages.config index 4c84713a..8de07630 100644 --- a/MP-MAG/packages.config +++ b/MP-MAG/packages.config @@ -46,7 +46,7 @@ - + diff --git a/MP-Site/MP-Site.csproj b/MP-Site/MP-Site.csproj index c09b0014..93d94945 100644 --- a/MP-Site/MP-Site.csproj +++ b/MP-Site/MP-Site.csproj @@ -96,7 +96,7 @@ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.7.13\lib\net45\NLog.dll + ..\packages\NLog.4.7.15\lib\net45\NLog.dll ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll diff --git a/MP-Site/packages.config b/MP-Site/packages.config index 1fcfd6b4..bdf5c67d 100644 --- a/MP-Site/packages.config +++ b/MP-Site/packages.config @@ -33,7 +33,7 @@ - + diff --git a/MP-TAB/MP-TAB.csproj b/MP-TAB/MP-TAB.csproj index 5ad81a7f..ca0aaf53 100644 --- a/MP-TAB/MP-TAB.csproj +++ b/MP-TAB/MP-TAB.csproj @@ -158,7 +158,7 @@ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.7.13\lib\net45\NLog.dll + ..\packages\NLog.4.7.15\lib\net45\NLog.dll ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll diff --git a/MP-TAB/NLog.xsd b/MP-TAB/NLog.xsd index eefeec81..d1674723 100644 --- a/MP-TAB/NLog.xsd +++ b/MP-TAB/NLog.xsd @@ -457,19 +457,21 @@ - + + + - + - + @@ -552,16 +554,21 @@ NDLC item separator. + + + NDC item separator. + + + + + Indicates whether to include dictionary contents. + + Indicates whether to include source info (file name and line number) in the information sent over the network. - - - Renderer for log4j:event logger-xml-attribute (Default ${logger}) - - Indicates whether to include NLog-specific extensions to log4j schema. @@ -587,6 +594,11 @@ Indicates whether to include dictionary contents. + + + Option to include all properties from the log events + + Indicates whether to include call site (class and method name) in the information sent over the network. @@ -602,9 +614,9 @@ AppInfo field. By default it's the friendly name of the current AppDomain. - + - NDC item separator. + Renderer for log4j:event logger-xml-attribute (Default ${logger}) @@ -2240,19 +2252,21 @@ - + + + - + - + @@ -2335,16 +2349,21 @@ NDLC item separator. + + + NDC item separator. + + + + + Indicates whether to include dictionary contents. + + Indicates whether to include source info (file name and line number) in the information sent over the network. - - - Renderer for log4j:event logger-xml-attribute (Default ${logger}) - - Indicates whether to include NLog-specific extensions to log4j schema. @@ -2370,6 +2389,11 @@ Indicates whether to include dictionary contents. + + + Option to include all properties from the log events + + Indicates whether to include call site (class and method name) in the information sent over the network. @@ -2385,9 +2409,9 @@ AppInfo field. By default it's the friendly name of the current AppDomain. - + - NDC item separator. + Renderer for log4j:event logger-xml-attribute (Default ${logger}) @@ -2993,9 +3017,11 @@ + + @@ -3028,6 +3054,11 @@ Option to include all properties from the log event (as JSON) + + + Option to include all properties from the log event (as JSON) + + Indicates whether to include contents of the dictionary. @@ -3043,6 +3074,11 @@ Indicates whether to include contents of the dictionary. + + + Indicates whether to include contents of the dictionary. + + How far should the JSON serializer follow object references before backing off @@ -3123,10 +3159,12 @@ + + @@ -3140,6 +3178,11 @@ Indicates whether to include call site (class and method name) in the information sent over the network. + + + Option to include all properties from the log events + + Indicates whether to include contents of the dictionary. @@ -3160,6 +3203,11 @@ Indicates whether to include contents of the stack. + + + Indicates whether to include contents of the dictionary. + + Indicates whether to include source info (file name and line number) in the information sent over the network. @@ -3186,34 +3234,46 @@ - - - - - - + + + + + + - - - - - - + + + + + + + + - - - List of property names to exclude when is true - - Option to include all properties from the log event (as XML) - + + + XML attribute name to use when rendering property-key When null (or empty) then key-attribute is not included + + + + + XML element name to use for rendering IList-collections items + + + + + How far should the XML serializer follow object references before backing off + + + Indicates whether to include contents of the dictionary. @@ -3223,24 +3283,14 @@ Indicates whether to include contents of the dictionary. - + - How far should the XML serializer follow object references before backing off + Indicates whether to include contents of the dictionary. - + - XML element name to use for rendering IList-collections items - - - - - XML attribute name to use when rendering property-key When null (or empty) then key-attribute is not included - - - - - XML element name to use when rendering properties + Option to include all properties from the log event (as XML) @@ -3248,24 +3298,14 @@ XML attribute name to use when rendering property-value When null (or empty) then value-attribute is not included and value is formatted as XML-element-value - + - Name of the root XML element + List of property names to exclude when is true - + - Value inside the root XML element - - - - - Whether a ElementValue with empty value should be included in the output - - - - - Auto indent and create new lines + XML element name to use when rendering properties @@ -3273,37 +3313,29 @@ Determines whether or not this attribute will be Xml encoded. + + + Auto indent and create new lines + + + + + Whether a ElementValue with empty value should be included in the output + + + + + Value inside the root XML element + + + + + Name of the root XML element + + - - - - - - - - - - Layout that will be rendered as the attribute's value. - - - - - Name of the attribute. - - - - - Determines whether or not this attribute will be Xml encoded. - - - - - Whether an attribute with empty value should be included in the output - - - @@ -3315,8 +3347,10 @@ + + @@ -3358,6 +3392,11 @@ Option to include all properties from the log event (as XML) + + + Option to include all properties from the log event (as XML) + + Indicates whether to include contents of the dictionary. @@ -3368,6 +3407,11 @@ Indicates whether to include contents of the dictionary. + + + Indicates whether to include contents of the dictionary. + + How far should the XML serializer follow object references before backing off @@ -3394,6 +3438,34 @@ + + + + + + + + + + Layout that will be rendered as the attribute's value. + + + + + Name of the attribute. + + + + + Determines whether or not this attribute will be Xml encoded. + + + + + Whether an attribute with empty value should be included in the output + + + diff --git a/MP-TAB/packages.config b/MP-TAB/packages.config index 67442a7c..6e2ecc10 100644 --- a/MP-TAB/packages.config +++ b/MP-TAB/packages.config @@ -33,9 +33,9 @@ - - - + + + diff --git a/MagData/MagData.csproj b/MagData/MagData.csproj index c11d2553..b2e267a8 100644 --- a/MagData/MagData.csproj +++ b/MagData/MagData.csproj @@ -74,7 +74,7 @@ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.7.13\lib\net45\NLog.dll + ..\packages\NLog.4.7.15\lib\net45\NLog.dll ..\packages\Pipelines.Sockets.Unofficial.2.2.2\lib\net461\Pipelines.Sockets.Unofficial.dll diff --git a/MagData/packages.config b/MagData/packages.config index 120fd6b4..d6aece77 100644 --- a/MagData/packages.config +++ b/MagData/packages.config @@ -10,7 +10,7 @@ - + diff --git a/MapoDb/MapoDb.csproj b/MapoDb/MapoDb.csproj index 5d3e4ce6..5a63b616 100644 --- a/MapoDb/MapoDb.csproj +++ b/MapoDb/MapoDb.csproj @@ -110,7 +110,7 @@ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.7.13\lib\net45\NLog.dll + ..\packages\NLog.4.7.15\lib\net45\NLog.dll ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll diff --git a/MapoDb/packages.config b/MapoDb/packages.config index 9255b11e..09ae1544 100644 --- a/MapoDb/packages.config +++ b/MapoDb/packages.config @@ -14,7 +14,7 @@ - + From eacc1575b150aa06e376ec01ce163431e936262b Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 29 Apr 2022 09:56:54 +0200 Subject: [PATCH 25/31] Nuget update WebAPI --- MP-IO/MP-IO.csproj | 12 +- MP-IO/Web.config | 6 +- MP-IO/packages.config | 14 +- .../HelpPageSampleGenerator.cs | 289 ++++++++---------- MP-MAG/Areas/HelpPage/Views/Help/Index.cshtml | 46 ++- MP-MAG/Areas/HelpPage/Views/Web.config | 68 ++--- MP-MAG/Areas/HelpPage/Views/_ViewStart.cshtml | 6 +- MP-MAG/MP-MAG.csproj | 52 ++-- MP-MAG/Web.config | 14 +- MP-MAG/packages.config | 16 +- 10 files changed, 246 insertions(+), 277 deletions(-) diff --git a/MP-IO/MP-IO.csproj b/MP-IO/MP-IO.csproj index d9ae70b8..8e982d9c 100644 --- a/MP-IO/MP-IO.csproj +++ b/MP-IO/MP-IO.csproj @@ -141,8 +141,8 @@ ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll + + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.8\lib\net45\System.Net.Http.Formatting.dll @@ -194,11 +194,11 @@ ..\packages\Microsoft.AspNet.WebPages.3.2.8\lib\net45\System.Web.Helpers.dll - - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll + + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.8\lib\net45\System.Web.Http.dll - - ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll + + ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.8\lib\net45\System.Web.Http.WebHost.dll ..\packages\Microsoft.AspNet.Mvc.5.2.8\lib\net45\System.Web.Mvc.dll diff --git a/MP-IO/Web.config b/MP-IO/Web.config index f3101701..c1cfaf30 100644 --- a/MP-IO/Web.config +++ b/MP-IO/Web.config @@ -360,13 +360,13 @@ - + + - - + diff --git a/MP-IO/packages.config b/MP-IO/packages.config index a3916368..8c7544af 100644 --- a/MP-IO/packages.config +++ b/MP-IO/packages.config @@ -14,13 +14,13 @@ - - - - - - - + + + + + + + diff --git a/MP-MAG/Areas/HelpPage/SampleGeneration/HelpPageSampleGenerator.cs b/MP-MAG/Areas/HelpPage/SampleGeneration/HelpPageSampleGenerator.cs index 71aa8e80..64b655d1 100644 --- a/MP-MAG/Areas/HelpPage/SampleGeneration/HelpPageSampleGenerator.cs +++ b/MP-MAG/Areas/HelpPage/SampleGeneration/HelpPageSampleGenerator.cs @@ -20,8 +20,6 @@ namespace MP_MAG.Areas.HelpPage ///
public class HelpPageSampleGenerator { - #region Public Constructors - /// /// Initializes a new instance of the class. /// @@ -36,9 +34,10 @@ namespace MP_MAG.Areas.HelpPage }; } - #endregion Public Constructors - - #region Public Properties + /// + /// Gets CLR types that are used as the content of or . + /// + public IDictionary ActualHttpMessageTypes { get; internal set; } /// /// Gets the objects that are used directly as samples for certain actions. @@ -46,9 +45,9 @@ namespace MP_MAG.Areas.HelpPage public IDictionary ActionSamples { get; internal set; } /// - /// Gets CLR types that are used as the content of or . + /// Gets the objects that are serialized as samples by the supported formatters. /// - public IDictionary ActualHttpMessageTypes { get; internal set; } + public IDictionary SampleObjects { get; internal set; } /// /// Gets factories for the objects that the supported formatters will serialize as samples. Processed in order, @@ -63,138 +62,23 @@ namespace MP_MAG.Areas.HelpPage public IList> SampleObjectFactories { get; private set; } /// - /// Gets the objects that are serialized as samples by the supported formatters. + /// Gets the request body samples for a given . /// - public IDictionary SampleObjects { get; internal set; } - - #endregion Public Properties - - #region Private Methods - - // Default factory for sample objects - private static object DefaultSampleObjectFactory(HelpPageSampleGenerator sampleGenerator, Type type) + /// The . + /// The samples keyed by media type. + public IDictionary GetSampleRequests(ApiDescription api) { - // Try to create a default sample object - ObjectGenerator objectGenerator = new ObjectGenerator(); - return objectGenerator.GenerateObject(type); + return GetSample(api, SampleDirection.Request); } - private static bool IsFormatSupported(SampleDirection sampleDirection, MediaTypeFormatter formatter, Type type) - { - switch (sampleDirection) - { - case SampleDirection.Request: - return formatter.CanReadType(type); - - case SampleDirection.Response: - return formatter.CanWriteType(type); - } - return false; - } - - [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Handling the failure by returning the original string.")] - private static string TryFormatJson(string str) - { - try - { - object parsedJson = JsonConvert.DeserializeObject(str); - return JsonConvert.SerializeObject(parsedJson, Formatting.Indented); - } - catch - { - // can't parse JSON, return the original string - return str; - } - } - - [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Handling the failure by returning the original string.")] - private static string TryFormatXml(string str) - { - try - { - XDocument xml = XDocument.Parse(str); - return xml.ToString(); - } - catch - { - // can't parse XML, return the original string - return str; - } - } - - private static object WrapSampleIfString(object sample) - { - string stringSample = sample as string; - if (stringSample != null) - { - return new TextSample(stringSample); - } - - return sample; - } - - private IEnumerable> GetAllActionSamples(string controllerName, string actionName, IEnumerable parameterNames, SampleDirection sampleDirection) - { - HashSet parameterNamesSet = new HashSet(parameterNames, StringComparer.OrdinalIgnoreCase); - foreach (var sample in ActionSamples) - { - HelpPageSampleKey sampleKey = sample.Key; - if (String.Equals(controllerName, sampleKey.ControllerName, StringComparison.OrdinalIgnoreCase) && - String.Equals(actionName, sampleKey.ActionName, StringComparison.OrdinalIgnoreCase) && - (sampleKey.ParameterNames.SetEquals(new[] { "*" }) || parameterNamesSet.SetEquals(sampleKey.ParameterNames)) && - sampleDirection == sampleKey.SampleDirection) - { - yield return sample; - } - } - } - - #endregion Private Methods - - #region Internal Methods - - internal static Exception UnwrapException(Exception exception) - { - AggregateException aggregateException = exception as AggregateException; - if (aggregateException != null) - { - return aggregateException.Flatten().InnerException; - } - return exception; - } - - #endregion Internal Methods - - #region Public Methods - /// - /// Search for samples that are provided directly through . + /// Gets the response body samples for a given . /// - /// Name of the controller. - /// Name of the action. - /// The parameter names. - /// The CLR type. - /// The formatter. - /// The media type. - /// The value indicating whether the sample is for a request or for a response. - /// The sample that matches the parameters. - public virtual object GetActionSample(string controllerName, string actionName, IEnumerable parameterNames, Type type, MediaTypeFormatter formatter, MediaTypeHeaderValue mediaType, SampleDirection sampleDirection) + /// The . + /// The samples keyed by media type. + public IDictionary GetSampleResponses(ApiDescription api) { - object sample; - - // First, try to get the sample provided for the specified mediaType, sampleDirection, controllerName, actionName and parameterNames. - // If not found, try to get the sample provided for the specified mediaType, sampleDirection, controllerName and actionName regardless of the parameterNames. - // If still not found, try to get the sample provided for the specified mediaType and type. - // Finally, try to get the sample provided for the specified mediaType. - if (ActionSamples.TryGetValue(new HelpPageSampleKey(mediaType, sampleDirection, controllerName, actionName, parameterNames), out sample) || - ActionSamples.TryGetValue(new HelpPageSampleKey(mediaType, sampleDirection, controllerName, actionName, new[] { "*" }), out sample) || - ActionSamples.TryGetValue(new HelpPageSampleKey(mediaType, type), out sample) || - ActionSamples.TryGetValue(new HelpPageSampleKey(mediaType), out sample)) - { - return sample; - } - - return null; + return GetSample(api, SampleDirection.Response); } /// @@ -252,7 +136,37 @@ namespace MP_MAG.Areas.HelpPage } /// - /// Gets the sample object that will be serialized by the formatters. + /// Search for samples that are provided directly through . + /// + /// Name of the controller. + /// Name of the action. + /// The parameter names. + /// The CLR type. + /// The formatter. + /// The media type. + /// The value indicating whether the sample is for a request or for a response. + /// The sample that matches the parameters. + public virtual object GetActionSample(string controllerName, string actionName, IEnumerable parameterNames, Type type, MediaTypeFormatter formatter, MediaTypeHeaderValue mediaType, SampleDirection sampleDirection) + { + object sample; + + // First, try to get the sample provided for the specified mediaType, sampleDirection, controllerName, actionName and parameterNames. + // If not found, try to get the sample provided for the specified mediaType, sampleDirection, controllerName and actionName regardless of the parameterNames. + // If still not found, try to get the sample provided for the specified mediaType and type. + // Finally, try to get the sample provided for the specified mediaType. + if (ActionSamples.TryGetValue(new HelpPageSampleKey(mediaType, sampleDirection, controllerName, actionName, parameterNames), out sample) || + ActionSamples.TryGetValue(new HelpPageSampleKey(mediaType, sampleDirection, controllerName, actionName, new[] { "*" }), out sample) || + ActionSamples.TryGetValue(new HelpPageSampleKey(mediaType, type), out sample) || + ActionSamples.TryGetValue(new HelpPageSampleKey(mediaType), out sample)) + { + return sample; + } + + return null; + } + + /// + /// Gets the sample object that will be serialized by the formatters. /// First, it will look at the . If no sample object is found, it will try to create /// one using (which wraps an ) and other /// factories in . @@ -293,26 +207,6 @@ namespace MP_MAG.Areas.HelpPage return sampleObject; } - /// - /// Gets the request body samples for a given . - /// - /// The . - /// The samples keyed by media type. - public IDictionary GetSampleRequests(ApiDescription api) - { - return GetSample(api, SampleDirection.Request); - } - - /// - /// Gets the response body samples for a given . - /// - /// The . - /// The samples keyed by media type. - public IDictionary GetSampleResponses(ApiDescription api) - { - return GetSample(api, SampleDirection.Response); - } - /// /// Resolves the actual type of passed to the in an action. /// @@ -371,7 +265,6 @@ namespace MP_MAG.Areas.HelpPage type = requestBodyParameter == null ? null : requestBodyParameter.ParameterDescriptor.ParameterType; formatters = api.SupportedRequestBodyFormatters; break; - case SampleDirection.Response: default: type = api.ResponseDescription.ResponseType ?? api.ResponseDescription.DeclaredType; @@ -426,7 +319,6 @@ namespace MP_MAG.Areas.HelpPage } sample = new TextSample(serializedSampleString); - reader.Dispose(); } else { @@ -462,6 +354,91 @@ namespace MP_MAG.Areas.HelpPage return sample; } - #endregion Public Methods + internal static Exception UnwrapException(Exception exception) + { + AggregateException aggregateException = exception as AggregateException; + if (aggregateException != null) + { + return aggregateException.Flatten().InnerException; + } + return exception; + } + + // Default factory for sample objects + private static object DefaultSampleObjectFactory(HelpPageSampleGenerator sampleGenerator, Type type) + { + // Try to create a default sample object + ObjectGenerator objectGenerator = new ObjectGenerator(); + return objectGenerator.GenerateObject(type); + } + + [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Handling the failure by returning the original string.")] + private static string TryFormatJson(string str) + { + try + { + object parsedJson = JsonConvert.DeserializeObject(str); + return JsonConvert.SerializeObject(parsedJson, Formatting.Indented); + } + catch + { + // can't parse JSON, return the original string + return str; + } + } + + [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Handling the failure by returning the original string.")] + private static string TryFormatXml(string str) + { + try + { + XDocument xml = XDocument.Parse(str); + return xml.ToString(); + } + catch + { + // can't parse XML, return the original string + return str; + } + } + + private static bool IsFormatSupported(SampleDirection sampleDirection, MediaTypeFormatter formatter, Type type) + { + switch (sampleDirection) + { + case SampleDirection.Request: + return formatter.CanReadType(type); + case SampleDirection.Response: + return formatter.CanWriteType(type); + } + return false; + } + + private IEnumerable> GetAllActionSamples(string controllerName, string actionName, IEnumerable parameterNames, SampleDirection sampleDirection) + { + HashSet parameterNamesSet = new HashSet(parameterNames, StringComparer.OrdinalIgnoreCase); + foreach (var sample in ActionSamples) + { + HelpPageSampleKey sampleKey = sample.Key; + if (String.Equals(controllerName, sampleKey.ControllerName, StringComparison.OrdinalIgnoreCase) && + String.Equals(actionName, sampleKey.ActionName, StringComparison.OrdinalIgnoreCase) && + (sampleKey.ParameterNames.SetEquals(new[] { "*" }) || parameterNamesSet.SetEquals(sampleKey.ParameterNames)) && + sampleDirection == sampleKey.SampleDirection) + { + yield return sample; + } + } + } + + private static object WrapSampleIfString(object sample) + { + string stringSample = sample as string; + if (stringSample != null) + { + return new TextSample(stringSample); + } + + return sample; + } } } \ No newline at end of file diff --git a/MP-MAG/Areas/HelpPage/Views/Help/Index.cshtml b/MP-MAG/Areas/HelpPage/Views/Help/Index.cshtml index 583f0f3e..ba100d04 100644 --- a/MP-MAG/Areas/HelpPage/Views/Help/Index.cshtml +++ b/MP-MAG/Areas/HelpPage/Views/Help/Index.cshtml @@ -6,41 +6,33 @@ @model Collection @{ - ViewBag.Title = "ASP.NET Web API Help Page"; + ViewBag.Title = "ASP.NET Web API Help Page"; - // Group APIs by controller - ILookup apiGroups = Model.ToLookup(api => api.ActionDescriptor.ControllerDescriptor); + // Group APIs by controller + ILookup apiGroups = Model.ToLookup(api => api.ActionDescriptor.ControllerDescriptor); } -
-
-
-
+
+
-

@ViewBag.Title

+

@ViewBag.Title

-
-
-
-
-
-
-
-
+
+ +
+
-

MP-MAG

-

- Qui di seguito sono riprotate le classi REST definite nel progetto -

+

Introduction

+

+ Provide a general description of your APIs here. +

-
-
+
+
@foreach (var group in apiGroups) { - @Html.DisplayFor(m => group, "ApiGroup") + @Html.DisplayFor(m => group, "ApiGroup") } -
-
-
-
\ No newline at end of file + +
diff --git a/MP-MAG/Areas/HelpPage/Views/Web.config b/MP-MAG/Areas/HelpPage/Views/Web.config index e94f4d66..6d4ddaf1 100644 --- a/MP-MAG/Areas/HelpPage/Views/Web.config +++ b/MP-MAG/Areas/HelpPage/Views/Web.config @@ -1,41 +1,41 @@  - - -
-
- - + + +
+
+ + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - - - - - + + + + + + + - - - - - - - \ No newline at end of file + + + + + + + diff --git a/MP-MAG/Areas/HelpPage/Views/_ViewStart.cshtml b/MP-MAG/Areas/HelpPage/Views/_ViewStart.cshtml index d735b1cb..a9259508 100644 --- a/MP-MAG/Areas/HelpPage/Views/_ViewStart.cshtml +++ b/MP-MAG/Areas/HelpPage/Views/_ViewStart.cshtml @@ -1,4 +1,4 @@ -@{ - // Change the Layout path below to blend the look and feel of the help page with your existing web pages - Layout = "~/Views/Shared/_Layout.cshtml"; +@{ + // Change the Layout path below to blend the look and feel of the help page with your existing web pages. + Layout = "~/Areas/HelpPage/Views/Shared/_Layout.cshtml"; } \ No newline at end of file diff --git a/MP-MAG/MP-MAG.csproj b/MP-MAG/MP-MAG.csproj index 16ccabea..c9f7f691 100644 --- a/MP-MAG/MP-MAG.csproj +++ b/MP-MAG/MP-MAG.csproj @@ -159,6 +159,9 @@ ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll + + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.8\lib\net45\System.Net.Http.Formatting.dll + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll @@ -207,6 +210,12 @@ ..\packages\Microsoft.AspNet.WebPages.3.2.8\lib\net45\System.Web.Helpers.dll + + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.8\lib\net45\System.Web.Http.dll + + + ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.8\lib\net45\System.Web.Http.WebHost.dll + ..\packages\Microsoft.AspNet.Mvc.5.2.8\lib\net45\System.Web.Mvc.dll @@ -234,17 +243,8 @@ True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll - - - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll - - - ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll - ..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll @@ -795,24 +795,7 @@ - - - - - - - - - - - - - - - - - Always @@ -882,6 +865,23 @@ + + + + + + + + + + + + + + + + + diff --git a/MP-MAG/Web.config b/MP-MAG/Web.config index fcc410bd..e3522293 100644 --- a/MP-MAG/Web.config +++ b/MP-MAG/Web.config @@ -92,12 +92,7 @@ - - - - - - + @@ -106,7 +101,12 @@ - + + + + + + diff --git a/MP-MAG/packages.config b/MP-MAG/packages.config index 8de07630..6d2a5cc4 100644 --- a/MP-MAG/packages.config +++ b/MP-MAG/packages.config @@ -24,14 +24,14 @@ - - - - - - - - + + + + + + + + From 53905f8b814d87d9d4665cc2541bc8e3054ac181 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 29 Apr 2022 10:00:11 +0200 Subject: [PATCH 26/31] Nuget update MongoDB --- MP-ADM/MP-ADM.csproj | 20 ++++++++++---------- MP-ADM/packages.config | 6 +++--- MP-IO/MP-IO.csproj | 24 ++++++++++++------------ MP-IO/packages.config | 6 +++--- MP-MAG/MP-MAG.csproj | 24 ++++++++++++------------ MP-MAG/packages.config | 6 +++--- MP-Site/MP-Site.csproj | 20 ++++++++++---------- MP-Site/packages.config | 6 +++--- MP-TAB/MP-TAB.csproj | 22 +++++++++++----------- MP-TAB/packages.config | 6 +++--- MagData/MagData.csproj | 16 ++++++++-------- MagData/packages.config | 6 +++--- MapoDb/MapoDb.csproj | 16 ++++++++-------- MapoDb/packages.config | 6 +++--- 14 files changed, 92 insertions(+), 92 deletions(-) diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index b51bf213..62f037ae 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -84,14 +84,14 @@ ..\packages\Microsoft.Web.RedisSessionStateProvider.4.0.1\lib\net462\Microsoft.Web.RedisSessionStateProvider.dll - - ..\packages\MongoDB.Bson.2.14.1\lib\netstandard2.0\MongoDB.Bson.dll + + ..\packages\MongoDB.Bson.2.15.0\lib\netstandard2.0\MongoDB.Bson.dll - - ..\packages\MongoDB.Driver.2.14.1\lib\netstandard2.0\MongoDB.Driver.dll + + ..\packages\MongoDB.Driver.2.15.0\lib\netstandard2.0\MongoDB.Driver.dll - - ..\packages\MongoDB.Driver.Core.2.14.1\lib\netstandard2.0\MongoDB.Driver.Core.dll + + ..\packages\MongoDB.Driver.Core.2.15.0\lib\netstandard2.0\MongoDB.Driver.Core.dll ..\packages\MongoDB.Libmongocrypt.1.3.0\lib\netstandard2.0\MongoDB.Libmongocrypt.dll @@ -511,12 +511,12 @@ + + - - @@ -1393,13 +1393,13 @@ - + - +