From 9089dfea44b6c2f1da3f2ceab34ff7eee783b49c Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 23 Aug 2024 13:10:21 +0200 Subject: [PATCH] Cleanup warning + calcolo versione framework NET --- .../Components/Compo/RegRichieste.razor.cs | 14 ++++---------- .../Components/Compo/UserQrCode.razor.cs | 4 ++-- GPW.CORE.SMART/Components/Pages/About.razor | 3 ++- GPW.CORE.SMART/Components/Pages/About.razor.cs | 16 +++++++++++++++- GPW.CORE.SMART/GPW.CORE.SMART.csproj | 2 +- GPW.CORE.SMART/post-build.ps1 | 1 - GPW.CORE6.Smart/Pages/About.razor.cs | 4 ++-- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 10 files changed, 29 insertions(+), 21 deletions(-) diff --git a/GPW.CORE.SMART/Components/Compo/RegRichieste.razor.cs b/GPW.CORE.SMART/Components/Compo/RegRichieste.razor.cs index 57fe78a..b828b96 100644 --- a/GPW.CORE.SMART/Components/Compo/RegRichieste.razor.cs +++ b/GPW.CORE.SMART/Components/Compo/RegRichieste.razor.cs @@ -35,15 +35,6 @@ namespace GPW.CORE.Smart.Components.Compo #endregion Public Properties - #region Protected Fields - - private bool isSendingData = false; - private int sendDataVal = 0; - private int sendDataNextVal = 0; - private int sendDataMaxVal = 100; - - #endregion Protected Fields - #region Protected Properties [Inject] @@ -79,8 +70,8 @@ namespace GPW.CORE.Smart.Components.Compo #region Private Fields + private bool isSendingData = false; private List? ListGiust = null; - private List? ListRecords = null; /// @@ -93,6 +84,9 @@ namespace GPW.CORE.Smart.Components.Compo /// private int NumDayPermMax = 21; + private int sendDataMaxVal = 100; + private int sendDataNextVal = 0; + private int sendDataVal = 0; private bool showAdd = false; #endregion Private Fields diff --git a/GPW.CORE.SMART/Components/Compo/UserQrCode.razor.cs b/GPW.CORE.SMART/Components/Compo/UserQrCode.razor.cs index ce35759..a2b2407 100644 --- a/GPW.CORE.SMART/Components/Compo/UserQrCode.razor.cs +++ b/GPW.CORE.SMART/Components/Compo/UserQrCode.razor.cs @@ -104,8 +104,8 @@ namespace GPW.CORE.Smart.Components.Compo /// private async Task initConf() { - UrlLinkInt = Configuration.GetValue("OptPar:UrlLinkInt"); - UrlLinkExt = Configuration.GetValue("OptPar:UrlLinkExt"); + UrlLinkInt = Configuration.GetValue("OptPar:UrlLinkInt") ?? ""; + UrlLinkExt = Configuration.GetValue("OptPar:UrlLinkExt") ?? ""; await Task.Delay(1); } diff --git a/GPW.CORE.SMART/Components/Pages/About.razor b/GPW.CORE.SMART/Components/Pages/About.razor index 5d9463c..da12d83 100644 --- a/GPW.CORE.SMART/Components/Pages/About.razor +++ b/GPW.CORE.SMART/Components/Pages/About.razor @@ -29,7 +29,8 @@
GPW
- v.@version +
v.@version
+
@framework
License:
diff --git a/GPW.CORE.SMART/Components/Pages/About.razor.cs b/GPW.CORE.SMART/Components/Pages/About.razor.cs index f1bd65a..f268301 100644 --- a/GPW.CORE.SMART/Components/Pages/About.razor.cs +++ b/GPW.CORE.SMART/Components/Pages/About.razor.cs @@ -1,5 +1,8 @@ using GPW.CORE.Smart.Data; +using MailKit.Net.Imap; using Microsoft.AspNetCore.Components; +using System.Reflection; +using System.Runtime.Versioning; namespace GPW.CORE.Smart.Components.Pages { @@ -22,12 +25,23 @@ namespace GPW.CORE.Smart.Components.Pages #endregion Protected Fields #region Protected Methods - + protected string framework = "???"; protected override async Task OnInitializedAsync() { await LicServ.RefreshApplic(); Titolo = Configuration.GetValue("Application:Name")!; Messaggio = Configuration.GetValue("Application:ContactText")!; + var tgtFrmwrkAtt = Assembly.GetExecutingAssembly() + .GetCustomAttributes(typeof(TargetFrameworkAttribute), false) + .FirstOrDefault(); + if (tgtFrmwrkAtt != null) + { + try + { + framework = ((TargetFrameworkAttribute)tgtFrmwrkAtt).FrameworkName; + } + catch { } + } } #endregion Protected Methods diff --git a/GPW.CORE.SMART/GPW.CORE.SMART.csproj b/GPW.CORE.SMART/GPW.CORE.SMART.csproj index d13490b..1a359f4 100644 --- a/GPW.CORE.SMART/GPW.CORE.SMART.csproj +++ b/GPW.CORE.SMART/GPW.CORE.SMART.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 4.1.2408.2312 + 4.1.2408.2313 diff --git a/GPW.CORE.SMART/post-build.ps1 b/GPW.CORE.SMART/post-build.ps1 index 45d5868..04598eb 100644 --- a/GPW.CORE.SMART/post-build.ps1 +++ b/GPW.CORE.SMART/post-build.ps1 @@ -16,7 +16,6 @@ $replace = "" + $currRelNum + ""; $csproj = Get-Content $ProjectPath $csprojUpdated = $csproj -replace $find, $replace - Write-Output "Update csproj | $currRelNum" Set-Content -Path $ProjectPath -Value $csprojUpdated diff --git a/GPW.CORE6.Smart/Pages/About.razor.cs b/GPW.CORE6.Smart/Pages/About.razor.cs index aca0247..94d9641 100644 --- a/GPW.CORE6.Smart/Pages/About.razor.cs +++ b/GPW.CORE6.Smart/Pages/About.razor.cs @@ -24,8 +24,8 @@ namespace GPW.CORE6.Smart.Pages protected override void OnInitialized() { - Titolo = Configuration.GetValue("Application:Name"); - Messaggio = Configuration.GetValue("Application:ContactText"); + Titolo = Configuration.GetValue("Application:Name") ?? "GPW"; + Messaggio = Configuration.GetValue("Application:ContactText") ?? "EgalWare"; } #endregion Protected Methods diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 5e1a270..4e4c432 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GPW - Gestione Presenze Web -

Versione: 4.1.2408.2312

+

Versione: 4.1.2408.2313


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index e8d3841..d1236c7 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -4.1.2408.2312 +4.1.2408.2313 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index ed004e0..9eab487 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 4.1.2408.2312 + 4.1.2408.2313 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.Smart.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false