Merge branch 'release/RC3'

Fix display main x spazio orizzontale (HOPE!)

.gitlab-ci.yml

@@ -118,7 +118,9 @@ installer:
     # - *nuget-fix
     # - dotnet restore
   script: 
-    - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release GWMS.UI/GWMS.UI.csproj -o:publish
+    # - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release GWMS.UI/GWMS.UI.csproj -o:publish
+    # pubblico solo installer Linux x64: https://docs.microsoft.com/en-us/dotnet/core/deploying/
+    - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release GWMS.UI/GWMS.UI.csproj -o:publish  -r linux-x64 --self-contained false
     # qui il deploy su nexus...
     - *hashBuild
     - *nexusUpload

GWMS.UI/GWMS.UI.csproj

@@ -2,10 +2,17 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>1.0.2108.2619</Version>
+    <Version>1.0.2108.2711</Version>
     <UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
+    <ServerGarbageCollection>false</ServerGarbageCollection>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="QuartzHostedService.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <Content Remove="bundleconfig.json" />
   </ItemGroup>
@@ -13,6 +20,8 @@
   <ItemGroup>
     <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS02.pubxml" />
     <_WebToolingArtifacts Remove="Properties\PublishProfiles\IISProfile.pubxml" />
+    <_WebToolingArtifacts Remove="Properties\PublishProfiles\IISProfileLinux.pubxml" />
+    <_WebToolingArtifacts Remove="Properties\PublishProfiles\IISProfileWin.pubxml" />
     <_WebToolingArtifacts Remove="Properties\PublishProfiles\W2019-IIS-DEV.pubxml" />
   </ItemGroup>
 
@@ -34,20 +43,16 @@
     <PackageReference Include="Blazorise.Charts" Version="0.9.3.7" />
     <PackageReference Include="Blazorise.Components" Version="0.9.3.7" />
     <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3.7" />
-    <PackageReference Include="ElmahCore" Version="2.0.6" />
-    <PackageReference Include="ElmahCore.Common" Version="2.0.6" />
-    <PackageReference Include="ElmahCore.Sql" Version="2.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="5.0.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="5.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.7">
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="5.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="5.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="5.0.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.12.0" />
-    <PackageReference Include="Quartz" Version="3.3.2" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" ExcludeAssets="All" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" />
   </ItemGroup>
 
   <ItemGroup>

GWMS.UI/Properties/PublishProfiles/IIS01.pubxml.user

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TimeStampOfAssociatedLegacyPublishXmlFile />
+    <EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAxNUOeyL5oUSNi/ISzvJtLgAAAAACAAAAAAADZgAAwAAAABAAAAD+ZfytfJJzf+XzD0ShcSagAAAAAASAAACgAAAAEAAAAAhSlOT4SIk7WdUrN1YS1qMYAAAAGI+89iBgQqaMJeEi4KxlVpTh9PMYTidkFAAAAO7so25722o8lxnn313D6J0eV2MV</EncryptedPassword>
+    <History>False|2021-06-23T12:54:39.3412623Z;</History>
+  </PropertyGroup>
+</Project>

GWMS.UI/Properties/PublishProfiles/IIS02.pubxml.user

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TimeStampOfAssociatedLegacyPublishXmlFile />
+    <EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAxNUOeyL5oUSNi/ISzvJtLgAAAAACAAAAAAADZgAAwAAAABAAAAAwZbVLPZ+eVCZgVc7GoE8CAAAAAASAAACgAAAAEAAAAEmDwlS8G30J/kR5K+eX8B4YAAAAZ14uy/TVGN4ui4QHWpgdmwaMob7VeTSiFAAAAC/61bXCe/Mgyo7S2QBvJRJ2GUiZ</EncryptedPassword>
+  </PropertyGroup>
+</Project>

GWMS.UI/Properties/PublishProfiles/IISProfile.pubxml.user

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <History>True|2021-06-23T13:11:40.1591388Z;</History>
+  </PropertyGroup>
+</Project>

GWMS.UI/Properties/PublishProfiles/IISProfileLinux.pubxml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>Package</WebPublishMethod>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <ProjectGuid>5f0dbab0-122f-4a81-be73-161bbefeef59</ProjectGuid>
+    <DesktopBuildPackageLocation>bin\publish\GWMS.UI.zip</DesktopBuildPackageLocation>
+    <PackageAsSingleFile>true</PackageAsSingleFile>
+    <DeployIisAppPath>Default Web Site/GWMS</DeployIisAppPath>
+    <TargetFramework>net5.0</TargetFramework>
+    <SelfContained>false</SelfContained>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+  </PropertyGroup>
+</Project>

GWMS.UI/Properties/PublishProfiles/IISProfileLinux.pubxml.user

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>

GWMS.UI/Properties/PublishProfiles/IISProfileWin.pubxml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>Package</WebPublishMethod>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <ProjectGuid>5f0dbab0-122f-4a81-be73-161bbefeef59</ProjectGuid>
+    <DesktopBuildPackageLocation>bin\publish\GWMS.UI.zip</DesktopBuildPackageLocation>
+    <PackageAsSingleFile>true</PackageAsSingleFile>
+    <DeployIisAppPath>Default Web Site/GWMS</DeployIisAppPath>
+    <TargetFramework>net5.0</TargetFramework>
+    <SelfContained>false</SelfContained>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+  </PropertyGroup>
+</Project>

GWMS.UI/Properties/PublishProfiles/IISProfileWin.pubxml.user

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>

GWMS.UI/Properties/PublishProfiles/W2019-IIS-DEV.pubxml.user

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TimeStampOfAssociatedLegacyPublishXmlFile />
+    <EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAxNUOeyL5oUSNi/ISzvJtLgAAAAACAAAAAAADZgAAwAAAABAAAADTQmYF8PrkLa4Xb9E/zxuXAAAAAASAAACgAAAAEAAAADLKIlcnZuaCFkaVmfe382YYAAAADxGWDujdGKLnZ+ycw0Vb2K2g5K0dRHB8FAAAAHB9B2k06W3L+M48vPfUvedJRpJX</EncryptedPassword>
+  </PropertyGroup>
+</Project>

GWMS.UI/QuartzHostedService.cs

@@ -1,42 +0,0 @@
-using Microsoft.Extensions.Hosting;
-using Quartz;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace GWMS.UI
-{
-    public class QuartzHostedService : IHostedService
-    {
-        #region Private Fields
-
-        private readonly IScheduler _scheduler;
-
-        #endregion Private Fields
-
-        #region Public Constructors
-
-        public QuartzHostedService(IScheduler scheduler)
-        {
-            _scheduler = scheduler;
-        }
-
-        #endregion Public Constructors
-
-        #region Public Methods
-
-        public async Task StartAsync(CancellationToken cancellationToken)
-        {
-            await _scheduler?.Start(cancellationToken);
-        }
-
-        public async Task StopAsync(CancellationToken cancellationToken)
-        {
-            await _scheduler?.Shutdown(cancellationToken);
-        }
-
-        #endregion Public Methods
-    }
-}

GWMS.UI/Startup.cs

@@ -1,7 +1,6 @@
 using Blazorise;
 using Blazorise.Bootstrap;
 using Blazorise.Icons.FontAwesome;
-using ElmahCore.Mvc;
 using GWMS.Data;
 using GWMS.UI.Areas.Identity;
 using GWMS.UI.Data;
@@ -23,8 +22,6 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Microsoft.Extensions.Hosting;
-using Quartz;
-using Quartz.Impl;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -79,9 +76,9 @@ namespace GWMS.UI
             });
             CultureInfo.DefaultThreadCurrentCulture = CultureInfo.CreateSpecificCulture("it-IT");
 
-            // Registrazione Elmah:
-            // https://github.com/ElmahCore/ElmahCore
-            app.UseElmah();
+            //// Registrazione Elmah:
+            //// https://github.com/ElmahCore/ElmahCore
+            //app.UseElmah();
 
             // fix forwarders
             app.UseForwardedHeaders(new ForwardedHeadersOptions
@@ -218,8 +215,8 @@ namespace GWMS.UI
            .AddBootstrapProviders()
            .AddFontAwesomeIcons();
 
-            // Elmah
-            services.AddElmah();
+            //// Elmah
+            //services.AddElmah();
             //string elmaConn = "Data Source=SQL2016DEV;Initial Catalog=Elmah;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=SHERPA.BBM;";
             //services.AddElmah<SqlErrorLog>(options =>
             //{

GWMS.UI/wwwroot/lib/qrcode.js

@@ -362,6 +362,7 @@ var QRCode;
             this._elImage.src = this._elCanvas.toDataURL("image/png");
             this._elImage.style.display = "block";
             this._elCanvas.style.display = "none";
+            this._elImage.className = "img-fluid";
         }
 
         // Android 2.1 bug workaround
@@ -471,6 +472,7 @@ var QRCode;
             var nRoundedHeight = Math.round(nHeight);
 
             _elImage.style.display = "none";
+            _elImage.className = "img-fluid";
             this.clear();
 
             for (var row = 0; row < nCount; row++) {

README.md

@@ -98,4 +98,19 @@ link da approfondire
 - https://github.com/parallelbgls/Modbus.Net
 - http://easymodbustcp.net/en/
 - https://sourceforge.net/p/easymodbustcp/wiki/Home/
-- https://techitmore.com/dotnet/modbus-tcp-communication-in-net-c/ 
+- https://techitmore.com/dotnet/modbus-tcp-communication-in-net-c/ 
+
+
+## Appunti
+
+### Linux debug
+
+Questa applicazione viene distribuita (localmente in ufficio ed in ovh x cliente finale) su macchina Linux, tramite dotnetcore.
+
+In particolare su linux x debug dei messaggi di log usare il comando
+
+
+    journalctl -fu  kestrel-app-gwms.service
+
+
+## Versioni

Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>GWMS - Gas Warehouse Management System</i>
-    <h4>Versione: 1.0.2108.2619</h4>
+    <h4>Versione: 1.0.2108.2711</h4>
     <br /> Note di rilascio:
     <ul>
         <li>

Resources/VersNum.txt

@@ -1 +1 @@
-1.0.2108.2619
+1.0.2108.2711

Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.0.2108.2619</version>
+  <version>1.0.2108.2711</version>
   <url>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html</changelog>
   <mandatory>false</mandatory>