diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c82ed7c..06386cf 100644 --- a/.gitlab-ci.yml +++ b/.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 diff --git a/GWMS.UI/GWMS.UI.csproj b/GWMS.UI/GWMS.UI.csproj index a4ae0f4..7197793 100644 --- a/GWMS.UI/GWMS.UI.csproj +++ b/GWMS.UI/GWMS.UI.csproj @@ -2,10 +2,17 @@ net5.0 - 1.0.2108.2619 + 1.0.2108.2711 95c9f021-52d1-4390-a670-5810b7b777b0 + true + true + false + + + + @@ -13,6 +20,8 @@ <_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" /> @@ -34,20 +43,16 @@ - - - - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + diff --git a/GWMS.UI/Properties/PublishProfiles/IIS01.pubxml.user b/GWMS.UI/Properties/PublishProfiles/IIS01.pubxml.user new file mode 100644 index 0000000..57b6103 --- /dev/null +++ b/GWMS.UI/Properties/PublishProfiles/IIS01.pubxml.user @@ -0,0 +1,12 @@ + + + + + + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAxNUOeyL5oUSNi/ISzvJtLgAAAAACAAAAAAADZgAAwAAAABAAAAD+ZfytfJJzf+XzD0ShcSagAAAAAASAAACgAAAAEAAAAAhSlOT4SIk7WdUrN1YS1qMYAAAAGI+89iBgQqaMJeEi4KxlVpTh9PMYTidkFAAAAO7so25722o8lxnn313D6J0eV2MV + False|2021-06-23T12:54:39.3412623Z; + + \ No newline at end of file diff --git a/GWMS.UI/Properties/PublishProfiles/IIS02.pubxml.user b/GWMS.UI/Properties/PublishProfiles/IIS02.pubxml.user new file mode 100644 index 0000000..35717f2 --- /dev/null +++ b/GWMS.UI/Properties/PublishProfiles/IIS02.pubxml.user @@ -0,0 +1,11 @@ + + + + + + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAxNUOeyL5oUSNi/ISzvJtLgAAAAACAAAAAAADZgAAwAAAABAAAAAwZbVLPZ+eVCZgVc7GoE8CAAAAAASAAACgAAAAEAAAAEmDwlS8G30J/kR5K+eX8B4YAAAAZ14uy/TVGN4ui4QHWpgdmwaMob7VeTSiFAAAAC/61bXCe/Mgyo7S2QBvJRJ2GUiZ + + \ No newline at end of file diff --git a/GWMS.UI/Properties/PublishProfiles/IISProfile.pubxml.user b/GWMS.UI/Properties/PublishProfiles/IISProfile.pubxml.user new file mode 100644 index 0000000..160d283 --- /dev/null +++ b/GWMS.UI/Properties/PublishProfiles/IISProfile.pubxml.user @@ -0,0 +1,10 @@ + + + + + True|2021-06-23T13:11:40.1591388Z; + + \ No newline at end of file diff --git a/GWMS.UI/Properties/PublishProfiles/IISProfileLinux.pubxml b/GWMS.UI/Properties/PublishProfiles/IISProfileLinux.pubxml new file mode 100644 index 0000000..f8bb9ea --- /dev/null +++ b/GWMS.UI/Properties/PublishProfiles/IISProfileLinux.pubxml @@ -0,0 +1,22 @@ + + + + + Package + Release + Any CPU + + True + False + 5f0dbab0-122f-4a81-be73-161bbefeef59 + bin\publish\GWMS.UI.zip + true + Default Web Site/GWMS + net5.0 + false + linux-x64 + + \ No newline at end of file diff --git a/GWMS.UI/Properties/PublishProfiles/IISProfileLinux.pubxml.user b/GWMS.UI/Properties/PublishProfiles/IISProfileLinux.pubxml.user new file mode 100644 index 0000000..33a92a7 --- /dev/null +++ b/GWMS.UI/Properties/PublishProfiles/IISProfileLinux.pubxml.user @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/GWMS.UI/Properties/PublishProfiles/IISProfileWin.pubxml b/GWMS.UI/Properties/PublishProfiles/IISProfileWin.pubxml new file mode 100644 index 0000000..712071e --- /dev/null +++ b/GWMS.UI/Properties/PublishProfiles/IISProfileWin.pubxml @@ -0,0 +1,22 @@ + + + + + Package + Release + Any CPU + + True + False + 5f0dbab0-122f-4a81-be73-161bbefeef59 + bin\publish\GWMS.UI.zip + true + Default Web Site/GWMS + net5.0 + false + win-x64 + + \ No newline at end of file diff --git a/GWMS.UI/Properties/PublishProfiles/IISProfileWin.pubxml.user b/GWMS.UI/Properties/PublishProfiles/IISProfileWin.pubxml.user new file mode 100644 index 0000000..33a92a7 --- /dev/null +++ b/GWMS.UI/Properties/PublishProfiles/IISProfileWin.pubxml.user @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/GWMS.UI/Properties/PublishProfiles/W2019-IIS-DEV.pubxml.user b/GWMS.UI/Properties/PublishProfiles/W2019-IIS-DEV.pubxml.user new file mode 100644 index 0000000..ed0b819 --- /dev/null +++ b/GWMS.UI/Properties/PublishProfiles/W2019-IIS-DEV.pubxml.user @@ -0,0 +1,11 @@ + + + + + + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAxNUOeyL5oUSNi/ISzvJtLgAAAAACAAAAAAADZgAAwAAAABAAAADTQmYF8PrkLa4Xb9E/zxuXAAAAAASAAACgAAAAEAAAADLKIlcnZuaCFkaVmfe382YYAAAADxGWDujdGKLnZ+ycw0Vb2K2g5K0dRHB8FAAAAHB9B2k06W3L+M48vPfUvedJRpJX + + \ No newline at end of file diff --git a/GWMS.UI/QuartzHostedService.cs b/GWMS.UI/QuartzHostedService.cs deleted file mode 100644 index 48ab510..0000000 --- a/GWMS.UI/QuartzHostedService.cs +++ /dev/null @@ -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 - } -} \ No newline at end of file diff --git a/GWMS.UI/Startup.cs b/GWMS.UI/Startup.cs index 2b758ea..ab5a9c4 100644 --- a/GWMS.UI/Startup.cs +++ b/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(options => //{ diff --git a/README.md b/README.md index 5748c9b..b278fc3 100644 --- a/README.md +++ b/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/ \ No newline at end of file +- 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 \ No newline at end of file diff --git a/README.pdf b/README.pdf index c684115..f98e6dc 100644 Binary files a/README.pdf and b/README.pdf differ diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index a06830a..55defe4 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GWMS - Gas Warehouse Management System -

Versione: 1.0.2108.2619

+

Versione: 1.0.2108.2711


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 1cbb39c..f9fce89 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.0.2108.2619 +1.0.2108.2711 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 0e20dc2..7eeb1d8 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.0.2108.2619 + 1.0.2108.2711 http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html false