diff --git a/GWMS.UI/GWMS - Backup.UI.csproj b/GWMS.UI/GWMS - Backup.UI.csproj new file mode 100644 index 0000000..eb2098f --- /dev/null +++ b/GWMS.UI/GWMS - Backup.UI.csproj @@ -0,0 +1,97 @@ + + + + net6.0 + 1.0.2406.0417 + 95c9f021-52d1-4390-a670-5810b7b777b0 + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + <_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" /> + + + + + Never + + + Never + + + + + + + + + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + ParamEditor.razor.cs + + + Transporters - Copy.razor.cs + + + Transporters.razor.cs + + + + + + + + + diff --git a/GWMS.UI/GWMS.UI.csproj b/GWMS.UI/GWMS.UI.csproj index 9f7f766..792cb86 100644 --- a/GWMS.UI/GWMS.UI.csproj +++ b/GWMS.UI/GWMS.UI.csproj @@ -2,7 +2,7 @@ net6.0 - 1.0.2406.0417 + 1.0.2406.0509 95c9f021-52d1-4390-a670-5810b7b777b0 true true @@ -69,6 +69,7 @@ + @@ -89,6 +90,14 @@ + + + Always + + + + + diff --git a/GWMS.UI/NLog.config b/GWMS.UI/NLog.config index fbea809..5101299 100644 --- a/GWMS.UI/NLog.config +++ b/GWMS.UI/NLog.config @@ -39,6 +39,14 @@ Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace) to "f" --> + + + + + + + diff --git a/GWMS.UI/NLog.config.dev b/GWMS.UI/NLog.config.dev index fbea809..5101299 100644 --- a/GWMS.UI/NLog.config.dev +++ b/GWMS.UI/NLog.config.dev @@ -39,6 +39,14 @@ Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace) to "f" --> + + + + + + + diff --git a/GWMS.UI/NLog.config.rel b/GWMS.UI/NLog.config.rel index c82b88a..66e2312 100644 --- a/GWMS.UI/NLog.config.rel +++ b/GWMS.UI/NLog.config.rel @@ -39,6 +39,13 @@ Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace) to "f" --> + + + + + + + diff --git a/GWMS.UI/Program.cs b/GWMS.UI/Program.cs index 1a42dc3..2a86505 100644 --- a/GWMS.UI/Program.cs +++ b/GWMS.UI/Program.cs @@ -24,8 +24,12 @@ namespace GWMS.UI .ConfigureLogging(logging => { logging.ClearProviders(); +#if DEBUG + //logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Debug); logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Information); - //logging.AddConsole(); +#else + logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Warning); +#endif }) .UseNLog(); diff --git a/GWMS.UI/appsettings.Staging.json b/GWMS.UI/appsettings.Staging.json index fb99726..98ae7c9 100644 --- a/GWMS.UI/appsettings.Staging.json +++ b/GWMS.UI/appsettings.Staging.json @@ -1,7 +1,7 @@ { "Logging": { "LogLevel": { - "Default": "Trace", + "Default": "Information", "Microsoft": "Warning", "Microsoft.Hosting.Lifetime": "Information" } diff --git a/GWMS.UI/appsettings.json b/GWMS.UI/appsettings.json index d16a2a9..d18514e 100644 --- a/GWMS.UI/appsettings.json +++ b/GWMS.UI/appsettings.json @@ -5,13 +5,6 @@ "Microsoft": "Warning", "Microsoft.Hosting.Lifetime": "Information" } - //"LogLevel": { - // "Default": "Debug", - // "System": "Information", - // "Microsoft": "Information", - // "Microsoft.AspNetCore.SignalR": "Debug", - // "Microsoft.AspNetCore.Http.Connections": "Debug" - //} }, "AllowedHosts": "*", "ConnectionStrings": { diff --git a/GWMS.UI/post-build.ps1 b/GWMS.UI/post-build.ps1 index f63c8b6..ac3ee02 100644 --- a/GWMS.UI/post-build.ps1 +++ b/GWMS.UI/post-build.ps1 @@ -33,13 +33,3 @@ $clogData = Get-Content $FileCLogIn $clogData = $clogData -replace "{{CURRENT-REL}}", $currRelNum Set-Content -Path $FileCLogOut -Value $clogData -# selezione corretto NLof.config secondo config corrente -cd $ProjectDir -if ( $Config -eq "Debug" ) -{ - Copy-Item "NLog.config.dev" -Destination "NLog.config" -Force -} -else -{ - Copy-Item "NLog.config.rel" -Destination "NLog.config" -Force -} diff --git a/GWMS.UI/pre-build.ps1 b/GWMS.UI/pre-build.ps1 new file mode 100644 index 0000000..dab26d1 --- /dev/null +++ b/GWMS.UI/pre-build.ps1 @@ -0,0 +1,14 @@ +param([string]$ProjectDir, [string]$ProjectPath, [string]$Config); + +# rif esempi parametri: https://learn.microsoft.com/en-us/visualstudio/ide/how-to-specify-build-events-csharp?view=vs-2022 + +# selezione corretto NLof.config secondo config corrente +cd $ProjectDir +if ( $Config -eq "Debug" ) +{ + Copy-Item "NLog.config.dev" -Destination "NLog.config" -Force +} +else +{ + Copy-Item "NLog.config.rel" -Destination "NLog.config" -Force +} diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 6bb283c..b8aa3be 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GWMS - Gas Warehouse Management System -

Versione: 1.0.2406.0417

+

Versione: 1.0.2406.0509


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 34a6dd6..3a8d22d 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.0.2406.0417 +1.0.2406.0509 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 9fa21e8..08d2d29 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.0.2406.0417 + 1.0.2406.0509 http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html false