Merge branch 'release/UpgradeMapoCoreAll'

- page reload
- Nuget upgrade

MP.AppAuth/MP.AppAuth.csproj

@@ -9,18 +9,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.10">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.10">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NLog" Version="4.7.11" />
+    <PackageReference Include="NLog" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

MP.Land/MP.Land.csproj

@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>MP.Land</RootNamespace>
-        <Version>6.15.2207.0613</Version>
+        <Version>6.15.2207.0718</Version>
     </PropertyGroup>
 
     <ItemGroup>
@@ -45,14 +45,14 @@
     <ItemGroup>
         <PackageReference Include="DiffMatchPatch" Version="1.0.3" />
         <PackageReference Include="Majorsoft.Blazor.Components.Debounce" Version="1.5.0" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.10">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.6">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="5.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.6" />
-        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
+        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.6" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
+        <PackageReference Include="NLog.Web.AspNetCore" Version="5.0.0" />
         <PackageReference Include="RestSharp" Version="107.1.2" />
     </ItemGroup>
 

MP.Land/Pages/_Host.cshtml

@@ -36,11 +36,30 @@
         <a class="dismiss">🗙</a>
     </div>
     
-    @* Riconnessione server app: https://www.syncfusion.com/faq/how-do-i-reconnect-blazor-server-side-automatically *@
+    @*Gestione autoriconnessione: https://github.com/dotnet/aspnetcore/issues/38305 (vedere anche https://docs.microsoft.com/it-it/aspnet/core/blazor/fundamentals/signalr?view=aspnetcore-6.0#modify-the-reconnection-handler-blazor-server)*@
     <script>
-        Blazor.defaultReconnectionHandler._reconnectCallback = function (d) {
+        //Blazor.start().then(() => {
-            document.location.reload();
+        //    Blazor.defaultReconnectionHandler._reconnectionDisplay = {
-        }
+        //        show: () => { },
+        //        update: (d) => { },
+        //        rejected: (d) => document.location.reload()
+        //    };
+        //});
+
+        Blazor.start().then(() => {
+            Object.defineProperty(Blazor.defaultReconnectionHandler, '_reconnectionDisplay', {
+                get() {
+                    return this.__reconnectionDisplay;
+                },
+                set(value) {
+                    this.__reconnectionDisplay = {
+                        show: () => value.show(),
+                        update: (d) => value.update(d),
+                        rejected: (d) => document.location.reload()
+                    }
+                }
+            });
+        });
     </script>
 
     <!-- inside of body section and after the div/app tag  -->

MP.Land/Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>Modulo gestione Programmi MAPO</i>
-    <h4>Versione: 6.15.2207.0613</h4>
+    <h4>Versione: 6.15.2207.0718</h4>
     <br />
     Note di rilascio:
     <ul>

MP.Land/Resources/VersNum.txt

@@ -1 +1 @@
-6.15.2207.0613
+6.15.2207.0718

MP.Land/Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.15.2207.0613</version>
+  <version>6.15.2207.0718</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

MP.Stats/MP.Stats.csproj

@@ -4,7 +4,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>MP.Stats</RootNamespace>
         <UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
-        <Version>6.15.2207.0510</Version>
+        <Version>6.15.2207.0718</Version>
     </PropertyGroup>
 
     <ItemGroup>
@@ -185,12 +185,12 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="ElmahCore" Version="2.1.1" />
+      <PackageReference Include="ElmahCore" Version="2.1.2" />
-      <PackageReference Include="ElmahCore.Common" Version="2.1.1" />
+      <PackageReference Include="ElmahCore.Common" Version="2.1.2" />
-      <PackageReference Include="ElmahCore.Sql" Version="2.1.1" />
+      <PackageReference Include="ElmahCore.Sql" Version="2.1.2" />
-      <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.4" />
+      <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.6" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-      <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
+      <PackageReference Include="NLog.Web.AspNetCore" Version="5.0.0" />
     </ItemGroup>
 
     <ItemGroup>

MP.Stats/Pages/_Host.cshtml

@@ -33,11 +33,30 @@
         <a class="dismiss">🗙</a>
     </div>
     
-    @* Riconnessione server app: https://www.syncfusion.com/faq/how-do-i-reconnect-blazor-server-side-automatically *@
+    @*Gestione autoriconnessione: https://github.com/dotnet/aspnetcore/issues/38305 (vedere anche https://docs.microsoft.com/it-it/aspnet/core/blazor/fundamentals/signalr?view=aspnetcore-6.0#modify-the-reconnection-handler-blazor-server)*@
     <script>
-        Blazor.defaultReconnectionHandler._reconnectCallback = function (d) {
+        //Blazor.start().then(() => {
-            document.location.reload();
+        //    Blazor.defaultReconnectionHandler._reconnectionDisplay = {
-        }
+        //        show: () => { },
+        //        update: (d) => { },
+        //        rejected: (d) => document.location.reload()
+        //    };
+        //});
+
+        Blazor.start().then(() => {
+            Object.defineProperty(Blazor.defaultReconnectionHandler, '_reconnectionDisplay', {
+                get() {
+                    return this.__reconnectionDisplay;
+                },
+                set(value) {
+                    this.__reconnectionDisplay = {
+                        show: () => value.show(),
+                        update: (d) => value.update(d),
+                        rejected: (d) => document.location.reload()
+                    }
+                }
+            });
+        });
     </script>
 
     <script src="_framework/blazor.server.js"></script>

MP.Stats/Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>Modulo statistiche MAPO</i>
-    <h4>Versione: 6.15.2207.0510</h4>
+    <h4>Versione: 6.15.2207.0718</h4>
     <br />
     Note di rilascio:
     <ul>

MP.Stats/Resources/VersNum.txt

@@ -1 +1 @@
-6.15.2207.0510
+6.15.2207.0718

MP.Stats/Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.15.2207.0510</version>
+  <version>6.15.2207.0718</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>