From c8a78d18814c5ad39fefd5ad31afd44e2606ef7f Mon Sep 17 00:00:00 2001 From: Mark Otway Date: Fri, 13 Oct 2023 07:15:45 +0100 Subject: [PATCH] Revert ".Net 8 rc2" This reverts commit d0c5b8889d92fc111ce4086f0fadabcbea1051ca. --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/damselfly-actions.yml | 2 +- .../Damselfly.Core.DbModels.csproj | 16 +++++++-------- .../Damselfly.Core.Interfaces.csproj | 2 +- .../Damselfly.Core.ScopedServices.csproj | 8 ++++---- .../NotificationsService.cs | 2 +- .../Damselfly.Core.Utils.csproj | 4 ++-- Damselfly.Core/Damselfly.Core.csproj | 20 +++++++++---------- .../Damselfly.ML.ObjectDetection.csproj | 6 +++--- .../Damselfly.Migrations.Sqlite.csproj | 2 +- .../Damselfly.Web.Client.csproj | 18 ++++++++--------- .../Damselfly.Web.Server.csproj | 12 +++++------ Damselfly.Web.Server/Program.cs | 5 +---- 13 files changed, 48 insertions(+), 51 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index fe5826ab..30c27a80 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -43,7 +43,7 @@ jobs: - name: Setup Dotnet Environment uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.100-rc.2.23502.2' + dotnet-version: '8.0.100-preview.7.23376.3' - name: Install WASM-Tools run: dotnet workload install wasm-tools diff --git a/.github/workflows/damselfly-actions.yml b/.github/workflows/damselfly-actions.yml index 08875169..6cd30199 100644 --- a/.github/workflows/damselfly-actions.yml +++ b/.github/workflows/damselfly-actions.yml @@ -75,7 +75,7 @@ jobs: - name: Setup Dotnet Environment uses: actions/setup-dotnet@v3 with: - dotnet-version: '8.0.100-rc.2.23502.2' + dotnet-version: '8.0.100-preview.7.23376.3' - name: Install WASM-Tools run: dotnet workload install wasm-tools diff --git a/Damselfly.Core.DbModels/Damselfly.Core.DbModels.csproj b/Damselfly.Core.DbModels/Damselfly.Core.DbModels.csproj index b8458e62..e4370638 100644 --- a/Damselfly.Core.DbModels/Damselfly.Core.DbModels.csproj +++ b/Damselfly.Core.DbModels/Damselfly.Core.DbModels.csproj @@ -5,21 +5,21 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + - + diff --git a/Damselfly.Core.Interfaces/Damselfly.Core.Interfaces.csproj b/Damselfly.Core.Interfaces/Damselfly.Core.Interfaces.csproj index b0065860..b1417ffa 100644 --- a/Damselfly.Core.Interfaces/Damselfly.Core.Interfaces.csproj +++ b/Damselfly.Core.Interfaces/Damselfly.Core.Interfaces.csproj @@ -5,7 +5,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Damselfly.Core.ScopedServices/Damselfly.Core.ScopedServices.csproj b/Damselfly.Core.ScopedServices/Damselfly.Core.ScopedServices.csproj index 12268bf3..7823d4bf 100644 --- a/Damselfly.Core.ScopedServices/Damselfly.Core.ScopedServices.csproj +++ b/Damselfly.Core.ScopedServices/Damselfly.Core.ScopedServices.csproj @@ -21,10 +21,10 @@ - - - + + + - + diff --git a/Damselfly.Core.ScopedServices/NotificationsService.cs b/Damselfly.Core.ScopedServices/NotificationsService.cs index b40ca801..b717e1b9 100644 --- a/Damselfly.Core.ScopedServices/NotificationsService.cs +++ b/Damselfly.Core.ScopedServices/NotificationsService.cs @@ -27,7 +27,7 @@ public NotificationsService(NavigationManager navManager, ApplicationStateServic hubConnection = new HubConnectionBuilder() .WithUrl(hubUrl, options => { - options.UseStatefulReconnect = true; + options.UseAcks = true; } ) .WithAutomaticReconnect(new RetryPolicy()) .Build(); diff --git a/Damselfly.Core.Utils/Damselfly.Core.Utils.csproj b/Damselfly.Core.Utils/Damselfly.Core.Utils.csproj index fd0dbe4d..ec3219df 100644 --- a/Damselfly.Core.Utils/Damselfly.Core.Utils.csproj +++ b/Damselfly.Core.Utils/Damselfly.Core.Utils.csproj @@ -9,11 +9,11 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/Damselfly.Core/Damselfly.Core.csproj b/Damselfly.Core/Damselfly.Core.csproj index d844c89b..83a1b5eb 100644 --- a/Damselfly.Core/Damselfly.Core.csproj +++ b/Damselfly.Core/Damselfly.Core.csproj @@ -12,14 +12,14 @@ default - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -31,12 +31,12 @@ - - - + + + - - + + diff --git a/Damselfly.ML.ObjectDetection.ML/Damselfly.ML.ObjectDetection.csproj b/Damselfly.ML.ObjectDetection.ML/Damselfly.ML.ObjectDetection.csproj index c5750044..183affe5 100644 --- a/Damselfly.ML.ObjectDetection.ML/Damselfly.ML.ObjectDetection.csproj +++ b/Damselfly.ML.ObjectDetection.ML/Damselfly.ML.ObjectDetection.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/Damselfly.Migrations.Sqlite/Damselfly.Migrations.Sqlite.csproj b/Damselfly.Migrations.Sqlite/Damselfly.Migrations.Sqlite.csproj index 2b9b4be5..c3f01e86 100644 --- a/Damselfly.Migrations.Sqlite/Damselfly.Migrations.Sqlite.csproj +++ b/Damselfly.Migrations.Sqlite/Damselfly.Migrations.Sqlite.csproj @@ -13,7 +13,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Damselfly.Web.Client/Damselfly.Web.Client.csproj b/Damselfly.Web.Client/Damselfly.Web.Client.csproj index fdea6e55..e493708f 100644 --- a/Damselfly.Web.Client/Damselfly.Web.Client.csproj +++ b/Damselfly.Web.Client/Damselfly.Web.Client.csproj @@ -15,20 +15,20 @@ - - - - - - - + + + + + + + - + - + diff --git a/Damselfly.Web.Server/Damselfly.Web.Server.csproj b/Damselfly.Web.Server/Damselfly.Web.Server.csproj index 9c7e82f7..790ee7a9 100644 --- a/Damselfly.Web.Server/Damselfly.Web.Server.csproj +++ b/Damselfly.Web.Server/Damselfly.Web.Server.csproj @@ -12,7 +12,7 @@ 4 - + @@ -29,12 +29,12 @@ - - - + + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Damselfly.Web.Server/Program.cs b/Damselfly.Web.Server/Program.cs index 1b8a4106..48957c01 100644 --- a/Damselfly.Web.Server/Program.cs +++ b/Damselfly.Web.Server/Program.cs @@ -24,7 +24,6 @@ using ILogger = Serilog.ILogger; using Host = Damselfly.Web.Client.Host; using Damselfly.Core.ScopedServices.Interfaces; -using XmpCore.Options; namespace Damselfly.Web; @@ -231,9 +230,7 @@ private static void StartWebServer(DamselflyOptions cmdLineOptions, string[] arg } // Map the signalR notifications endpoints - app.MapHub($"/{NotificationHub.NotificationRoot}", options => - options.AllowStatefulReconnects = true - ); + app.MapHub($"/{NotificationHub.NotificationRoot}", options => options.AllowAcks = true ); app.UseAuthentication(); app.UseAuthorization();