diff --git a/MP-MON/MP-MON.Client/Components/CmpFooter.razor.cs b/MP-MON/MP-MON.Client/Components/CmpFooter.razor.cs index 3fee16cc..265ecce3 100644 --- a/MP-MON/MP-MON.Client/Components/CmpFooter.razor.cs +++ b/MP-MON/MP-MON.Client/Components/CmpFooter.razor.cs @@ -6,6 +6,13 @@ namespace MP.MON.Client.Components { public partial class CmpFooter : ComponentBase, IDisposable { + #region Public Properties + + [Parameter] + public Version version { get; set; } = null!; + + #endregion Public Properties + #region Public Methods public void Dispose() @@ -80,8 +87,6 @@ namespace MP.MON.Client.Components protected override void OnInitialized() { - var currAssembly = typeof(Program).Assembly.GetName(); - version = currAssembly.Version != null ? currAssembly.Version : new Version(); StartTimer(); Console.WriteLine($"OnInitialized completato"); } @@ -91,7 +96,6 @@ namespace MP.MON.Client.Components #region Private Fields private static System.Timers.Timer aTimer = null!; - private Version version = null!; #endregion Private Fields diff --git a/MP-MON/MP-MON.Client/MP-MON.Client.csproj b/MP-MON/MP-MON.Client/MP-MON.Client.csproj index 0d6b0559..9b68b90a 100644 --- a/MP-MON/MP-MON.Client/MP-MON.Client.csproj +++ b/MP-MON/MP-MON.Client/MP-MON.Client.csproj @@ -8,6 +8,7 @@ Default MP.MON.Client $(AssemblyName.Replace(' ', '_')) + 6.16.2503.1418 @@ -28,4 +29,11 @@ + + + + + + + diff --git a/MP-MON/MP-MON.Client/Pages/Counter.razor b/MP-MON/MP-MON.Client/Pages/Counter.razor deleted file mode 100644 index ca75070e..00000000 --- a/MP-MON/MP-MON.Client/Pages/Counter.razor +++ /dev/null @@ -1,16 +0,0 @@ -@page "/counter" -@rendermode InteractiveAuto - -Counter - -

Counter

- -

Current count: @currentCount

- - - -
- - - - diff --git a/MP-MON/MP-MON.Client/Pages/Counter.razor.cs b/MP-MON/MP-MON.Client/Pages/Counter.razor.cs deleted file mode 100644 index ce86b325..00000000 --- a/MP-MON/MP-MON.Client/Pages/Counter.razor.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Microsoft.AspNetCore.Components; -using System; - -namespace MP.MON.Client.Pages -{ - public partial class Counter : ComponentBase - { - #region Private Fields - - private int currentCount = 0; - - #endregion Private Fields - - #region Private Methods - - private void IncrementCount() - { - currentCount++; - } - - #endregion Private Methods - } -} \ No newline at end of file diff --git a/MP-MON/MP-MON.Client/Resources/ChangeLog-original.html b/MP-MON/MP-MON.Client/Resources/ChangeLog-original.html new file mode 100644 index 00000000..a2420fb9 --- /dev/null +++ b/MP-MON/MP-MON.Client/Resources/ChangeLog-original.html @@ -0,0 +1,25 @@ + + Modulo MAPOSPEC +

Versione: {{CURRENT-REL}}

+
Note di rilascio: + +
+
+ +
+
+ © Steamware 2006-2023 +
+
+ \ No newline at end of file diff --git a/MP-MON/MP-MON.Client/Resources/ChangeLog.html b/MP-MON/MP-MON.Client/Resources/ChangeLog.html new file mode 100644 index 00000000..1664133a --- /dev/null +++ b/MP-MON/MP-MON.Client/Resources/ChangeLog.html @@ -0,0 +1,25 @@ + + Modulo MAPOSPEC +

Versione: 6.16.2503.1418

+
Note di rilascio: + +
+
+ +
+
+ © Steamware 2006-2023 +
+
+ diff --git a/MP-MON/MP-MON.Client/Resources/VersNum.txt b/MP-MON/MP-MON.Client/Resources/VersNum.txt new file mode 100644 index 00000000..7d5437b1 --- /dev/null +++ b/MP-MON/MP-MON.Client/Resources/VersNum.txt @@ -0,0 +1 @@ +6.16.2503.1418 diff --git a/MP-MON/MP-MON.Client/Resources/logoSteamware.png b/MP-MON/MP-MON.Client/Resources/logoSteamware.png new file mode 100644 index 00000000..0958b50a Binary files /dev/null and b/MP-MON/MP-MON.Client/Resources/logoSteamware.png differ diff --git a/MP-MON/MP-MON.Client/Resources/manifest-original.xml b/MP-MON/MP-MON.Client/Resources/manifest-original.xml new file mode 100644 index 00000000..f95e0763 --- /dev/null +++ b/MP-MON/MP-MON.Client/Resources/manifest-original.xml @@ -0,0 +1,7 @@ + + + 1.0.0.0 + https://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip + https://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/ChangeLog.html + false + diff --git a/MP-MON/MP-MON.Client/Resources/manifest.xml b/MP-MON/MP-MON.Client/Resources/manifest.xml new file mode 100644 index 00000000..b59b180d --- /dev/null +++ b/MP-MON/MP-MON.Client/Resources/manifest.xml @@ -0,0 +1,7 @@ + + + 6.16.2503.1418 + https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip + https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html + false + diff --git a/MP-MON/MP-MON.Client/post-build.ps1 b/MP-MON/MP-MON.Client/post-build.ps1 new file mode 100644 index 00000000..547caf3c --- /dev/null +++ b/MP-MON/MP-MON.Client/post-build.ps1 @@ -0,0 +1,32 @@ +param([string]$ProjectDir, [string]$ProjectPath); + +$FileMajMin = "..\..\MajMin.vers" +$FileVers = "Resources\VersNum.txt" +$FileManIn = "Resources\manifest-original.xml" +$FileManOut = "Resources\manifest.xml" +$FileCLogIn = "Resources\ChangeLog-original.html" +$FileCLogOut = "Resources\ChangeLog.html" +$MajMin = Get-Content $FileMajMin +$currentDate = get-date -format yyMM; +$currentTime = get-date -format dHH; +$find = "(.|\n)*?"; +$currRelNum = $MajMin + $currentDate +"." + $currentTime +$replace = "" + $MajMin + $currentDate +"." + $currentTime + ""; +$csproj = Get-Content $ProjectPath +$csprojUpdated = $csproj -replace $find, $replace + +Set-Content -Path $ProjectPath -Value $csprojUpdated +Set-Content -Path $FileVers -Value $currRelNum + +# replace x manifest +$manData = Get-Content $FileManIn +$manData = $manData -replace "1.0.0.0", $currRelNum +$manData = $manData -replace "{{DIRNAME}}", "MP-TAB3" +$manData = $manData -replace "{{BRANCHNAME}}", "stable/LAST" +$manData = $manData -replace "{{PACKNAME}}", "MP-TAB3" +Set-Content -Path $FileManOut -Value $manData + +# replace x ChangeLog +$clogData = Get-Content $FileCLogIn +$clogData = $clogData -replace "{{CURRENT-REL}}", $currRelNum +Set-Content -Path $FileCLogOut -Value $clogData diff --git a/MP-MON/MP-MON/Components/Layout/MainLayout.razor b/MP-MON/MP-MON/Components/Layout/MainLayout.razor index 9486d116..fd43cc55 100644 --- a/MP-MON/MP-MON/Components/Layout/MainLayout.razor +++ b/MP-MON/MP-MON/Components/Layout/MainLayout.razor @@ -12,7 +12,7 @@ @Body
- +
@@ -22,3 +22,17 @@ Reload 🗙 +@code{ + + protected override void OnInitialized() + { + // base.OnInitialized(); + var currAssembly = typeof(Program).Assembly.GetName(); + version = currAssembly.Version != null ? currAssembly.Version : new Version(); + } + + /// + /// Versione applicativo ada passare al controllo footer + /// + private Version version = null!; +} \ No newline at end of file diff --git a/MP-MON/MP-MON/Components/Pages/Index.razor.cs b/MP-MON/MP-MON/Components/Pages/Index.razor.cs index 38edbe6b..d48774c4 100644 --- a/MP-MON/MP-MON/Components/Pages/Index.razor.cs +++ b/MP-MON/MP-MON/Components/Pages/Index.razor.cs @@ -232,7 +232,7 @@ namespace MP.MON.Components.Pages Random rnd = new Random(); cssOverlayOff = config.GetValue("ServerConf:cssOverlayOff") ?? ""; maxChar4Scroll = config.GetValue("ServerConf:maxChar4Scroll"); - await Task.Delay(rnd.Next(400, 600)); + await Task.Delay(rnd.Next(50, 150)); StartTimer(); } @@ -248,6 +248,7 @@ namespace MP.MON.Components.Pages private string CodGruppo = ""; private string cssOverlayOff = "bg-dark text-light opacity-100"; + private List? CurrConfig = null; private bool doBlink = false; @@ -265,6 +266,10 @@ namespace MP.MON.Components.Pages #endregion Private Fields + #region Private Properties + + #endregion Private Properties + #region Private Methods /// diff --git a/MP-MON/MP-MON/MP-MON.csproj b/MP-MON/MP-MON/MP-MON.csproj index be746acb..279b7f55 100644 --- a/MP-MON/MP-MON/MP-MON.csproj +++ b/MP-MON/MP-MON/MP-MON.csproj @@ -6,6 +6,7 @@ enable MP.MON $(AssemblyName.Replace(' ', '_')) + 6.16.2503.1409 @@ -13,7 +14,6 @@ - Always diff --git a/MP-MON/MP-MON/Resources/ChangeLog-original.html b/MP-MON/MP-MON/Resources/ChangeLog-original.html new file mode 100644 index 00000000..a2420fb9 --- /dev/null +++ b/MP-MON/MP-MON/Resources/ChangeLog-original.html @@ -0,0 +1,25 @@ + + Modulo MAPOSPEC +

Versione: {{CURRENT-REL}}

+
Note di rilascio: +
    +
  • + Ultime modifiche: +
      {{LAST-CHANGES}}
    +
    • +
  • + v.6.15.* → +
      +
    • Prima release dotnet6
      • +
    +
    • +
+
+
+ +
+ +
+ \ No newline at end of file diff --git a/MP-MON/MP-MON/Resources/ChangeLog.html b/MP-MON/MP-MON/Resources/ChangeLog.html new file mode 100644 index 00000000..407fcaf8 --- /dev/null +++ b/MP-MON/MP-MON/Resources/ChangeLog.html @@ -0,0 +1,25 @@ + + Modulo MAPOSPEC +

Versione: 6.16.2503.1410

+
Note di rilascio: +
    +
  • + Ultime modifiche: +
      {{LAST-CHANGES}}
    +
    • +
  • + v.6.15.* → +
      +
    • Prima release dotnet6
      • +
    +
    • +
+
+
+ +
+ +
+ diff --git a/MP-MON/MP-MON/Resources/VersNum.txt b/MP-MON/MP-MON/Resources/VersNum.txt new file mode 100644 index 00000000..8ede05b5 --- /dev/null +++ b/MP-MON/MP-MON/Resources/VersNum.txt @@ -0,0 +1 @@ +6.16.2503.1410 diff --git a/MP-MON/MP-MON/Resources/logoSteamware.png b/MP-MON/MP-MON/Resources/logoSteamware.png new file mode 100644 index 00000000..0958b50a Binary files /dev/null and b/MP-MON/MP-MON/Resources/logoSteamware.png differ diff --git a/MP-MON/MP-MON/Resources/manifest-original.xml b/MP-MON/MP-MON/Resources/manifest-original.xml new file mode 100644 index 00000000..f95e0763 --- /dev/null +++ b/MP-MON/MP-MON/Resources/manifest-original.xml @@ -0,0 +1,7 @@ + + + 1.0.0.0 + https://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip + https://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/ChangeLog.html + false + diff --git a/MP-MON/MP-MON/Resources/manifest.xml b/MP-MON/MP-MON/Resources/manifest.xml new file mode 100644 index 00000000..470888b7 --- /dev/null +++ b/MP-MON/MP-MON/Resources/manifest.xml @@ -0,0 +1,7 @@ + + + 6.16.2503.1410 + https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip + https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html + false + diff --git a/MP-MON/MP-MON/post-build.ps1 b/MP-MON/MP-MON/post-build.ps1 new file mode 100644 index 00000000..547caf3c --- /dev/null +++ b/MP-MON/MP-MON/post-build.ps1 @@ -0,0 +1,32 @@ +param([string]$ProjectDir, [string]$ProjectPath); + +$FileMajMin = "..\..\MajMin.vers" +$FileVers = "Resources\VersNum.txt" +$FileManIn = "Resources\manifest-original.xml" +$FileManOut = "Resources\manifest.xml" +$FileCLogIn = "Resources\ChangeLog-original.html" +$FileCLogOut = "Resources\ChangeLog.html" +$MajMin = Get-Content $FileMajMin +$currentDate = get-date -format yyMM; +$currentTime = get-date -format dHH; +$find = "(.|\n)*?"; +$currRelNum = $MajMin + $currentDate +"." + $currentTime +$replace = "" + $MajMin + $currentDate +"." + $currentTime + ""; +$csproj = Get-Content $ProjectPath +$csprojUpdated = $csproj -replace $find, $replace + +Set-Content -Path $ProjectPath -Value $csprojUpdated +Set-Content -Path $FileVers -Value $currRelNum + +# replace x manifest +$manData = Get-Content $FileManIn +$manData = $manData -replace "1.0.0.0", $currRelNum +$manData = $manData -replace "{{DIRNAME}}", "MP-TAB3" +$manData = $manData -replace "{{BRANCHNAME}}", "stable/LAST" +$manData = $manData -replace "{{PACKNAME}}", "MP-TAB3" +Set-Content -Path $FileManOut -Value $manData + +# replace x ChangeLog +$clogData = Get-Content $FileCLogIn +$clogData = $clogData -replace "{{CURRENT-REL}}", $currRelNum +Set-Content -Path $FileCLogOut -Value $clogData