From f08a78926791e0cc9ae78d8c65a77d3086da90ef Mon Sep 17 00:00:00 2001 From: Paul Bunn Date: Sun, 17 Mar 2024 09:45:21 -0700 Subject: [PATCH 1/8] Ignore JSDisconnectedExceptions during dispose Also update vulnerable ASspNetCore.Components to 6.0.28 --- samples/BlazorWebAssembly/BlazorWebAssembly.csproj | 4 ++-- samples/SharedRCL/SharedRCL.csproj | 6 +++--- src/Blazored.Video/Blazored.Video.csproj | 7 ++++--- src/Blazored.Video/BlazoredVideo.razor.cs | 9 ++++++++- tests/Blazored.Video.Tests/Blazored.Video.Tests.csproj | 1 + 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/samples/BlazorWebAssembly/BlazorWebAssembly.csproj b/samples/BlazorWebAssembly/BlazorWebAssembly.csproj index 8a2b7f3..38535fc 100644 --- a/samples/BlazorWebAssembly/BlazorWebAssembly.csproj +++ b/samples/BlazorWebAssembly/BlazorWebAssembly.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/samples/SharedRCL/SharedRCL.csproj b/samples/SharedRCL/SharedRCL.csproj index 9868048..d9a60fe 100644 --- a/samples/SharedRCL/SharedRCL.csproj +++ b/samples/SharedRCL/SharedRCL.csproj @@ -6,13 +6,13 @@ - - + - + + diff --git a/src/Blazored.Video/Blazored.Video.csproj b/src/Blazored.Video/Blazored.Video.csproj index 30ec91b..43e3a09 100644 --- a/src/Blazored.Video/Blazored.Video.csproj +++ b/src/Blazored.Video/Blazored.Video.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -32,8 +32,9 @@ - - + + + diff --git a/src/Blazored.Video/BlazoredVideo.razor.cs b/src/Blazored.Video/BlazoredVideo.razor.cs index d136f74..af4dfe4 100644 --- a/src/Blazored.Video/BlazoredVideo.razor.cs +++ b/src/Blazored.Video/BlazoredVideo.razor.cs @@ -341,7 +341,14 @@ protected virtual async ValueTask DisposeAsyncCore() { if (jsModule is not null) { - await jsModule.DisposeAsync().ConfigureAwait(false); + try + { + await jsModule.DisposeAsync().ConfigureAwait(false); + } + catch (JSDisconnectedException) + { + // ignore JSDisconnectedException exceptions + } } } } diff --git a/tests/Blazored.Video.Tests/Blazored.Video.Tests.csproj b/tests/Blazored.Video.Tests/Blazored.Video.Tests.csproj index cea014a..d5755a1 100644 --- a/tests/Blazored.Video.Tests/Blazored.Video.Tests.csproj +++ b/tests/Blazored.Video.Tests/Blazored.Video.Tests.csproj @@ -6,6 +6,7 @@ + From 006c4e688c8da507c3c6ad236223f9157345c18c Mon Sep 17 00:00:00 2001 From: Paul Bunn Date: Thu, 21 Mar 2024 12:09:43 -0700 Subject: [PATCH 2/8] Update version to 1.0.2 --- src/Blazored.Video/Blazored.Video.csproj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Blazored.Video/Blazored.Video.csproj b/src/Blazored.Video/Blazored.Video.csproj index 43e3a09..da9816a 100644 --- a/src/Blazored.Video/Blazored.Video.csproj +++ b/src/Blazored.Video/Blazored.Video.csproj @@ -37,4 +37,9 @@ + + 1.0.2 + + + From 17826dca4e90370e07e43de70945eddf5e562224 Mon Sep 17 00:00:00 2001 From: Paul Bunn Date: Thu, 21 Mar 2024 14:50:17 -0700 Subject: [PATCH 3/8] Try to fix issue causing build error on appveyor --- src/Blazored.Video/Blazored.Video.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Blazored.Video/Blazored.Video.csproj b/src/Blazored.Video/Blazored.Video.csproj index da9816a..e2dd7a0 100644 --- a/src/Blazored.Video/Blazored.Video.csproj +++ b/src/Blazored.Video/Blazored.Video.csproj @@ -2,6 +2,7 @@ net6.0 + false Mister Magoo Chris Sainty Copyright 2020-2022 (c) Mister Magoo,Chris Sainty. All rights reserved. From 9a031d642d6382a380b7176eb47534731e6de363 Mon Sep 17 00:00:00 2001 From: Paul Bunn Date: Thu, 21 Mar 2024 17:56:02 -0700 Subject: [PATCH 4/8] Remove explicit version --- src/Blazored.Video/Blazored.Video.csproj | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Blazored.Video/Blazored.Video.csproj b/src/Blazored.Video/Blazored.Video.csproj index e2dd7a0..158d88b 100644 --- a/src/Blazored.Video/Blazored.Video.csproj +++ b/src/Blazored.Video/Blazored.Video.csproj @@ -38,9 +38,4 @@ - - 1.0.2 - - - From 4b5f9c416dbc88825db8d13d014a29ca954d2788 Mon Sep 17 00:00:00 2001 From: Paul Bunn Date: Thu, 21 Mar 2024 18:58:23 -0700 Subject: [PATCH 5/8] Update version to 1.0.4 --- src/Blazored.Video/Blazored.Video.csproj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Blazored.Video/Blazored.Video.csproj b/src/Blazored.Video/Blazored.Video.csproj index 158d88b..2dd7e12 100644 --- a/src/Blazored.Video/Blazored.Video.csproj +++ b/src/Blazored.Video/Blazored.Video.csproj @@ -38,4 +38,9 @@ + + 1.0.4 + + + From 227d7499fb77bf64c4e2d8db12a896794770a1df Mon Sep 17 00:00:00 2001 From: Paul Bunn Date: Thu, 21 Mar 2024 19:10:08 -0700 Subject: [PATCH 6/8] Update Blazored.Video.csproj --- src/Blazored.Video/Blazored.Video.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Blazored.Video/Blazored.Video.csproj b/src/Blazored.Video/Blazored.Video.csproj index 2dd7e12..b5ff8a8 100644 --- a/src/Blazored.Video/Blazored.Video.csproj +++ b/src/Blazored.Video/Blazored.Video.csproj @@ -2,7 +2,6 @@ net6.0 - false Mister Magoo Chris Sainty Copyright 2020-2022 (c) Mister Magoo,Chris Sainty. All rights reserved. From 80dabd1a9ad1671cf5156cf246b9be2a72a5f6ca Mon Sep 17 00:00:00 2001 From: Paul Bunn Date: Thu, 21 Mar 2024 19:16:48 -0700 Subject: [PATCH 7/8] Update Blazored.Video.csproj --- src/Blazored.Video/Blazored.Video.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Blazored.Video/Blazored.Video.csproj b/src/Blazored.Video/Blazored.Video.csproj index b5ff8a8..79b0127 100644 --- a/src/Blazored.Video/Blazored.Video.csproj +++ b/src/Blazored.Video/Blazored.Video.csproj @@ -38,7 +38,7 @@ - 1.0.4 + 1.0.5 From 305a001b8b9f4e250e9285ce80011cff44e23a0c Mon Sep 17 00:00:00 2001 From: Paul Bunn Date: Wed, 27 Mar 2024 15:47:19 -0700 Subject: [PATCH 8/8] Ignore TaskCanceledExceptions --- src/Blazored.Video/Blazored.Video.csproj | 2 +- src/Blazored.Video/BlazoredVideo.razor.cs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Blazored.Video/Blazored.Video.csproj b/src/Blazored.Video/Blazored.Video.csproj index 79b0127..ac7c417 100644 --- a/src/Blazored.Video/Blazored.Video.csproj +++ b/src/Blazored.Video/Blazored.Video.csproj @@ -38,7 +38,7 @@ - 1.0.5 + 1.0.6 diff --git a/src/Blazored.Video/BlazoredVideo.razor.cs b/src/Blazored.Video/BlazoredVideo.razor.cs index af4dfe4..7409ff5 100644 --- a/src/Blazored.Video/BlazoredVideo.razor.cs +++ b/src/Blazored.Video/BlazoredVideo.razor.cs @@ -345,6 +345,10 @@ protected virtual async ValueTask DisposeAsyncCore() { await jsModule.DisposeAsync().ConfigureAwait(false); } + catch (TaskCanceledException) + { + // ignore TaskCanceledException + } catch (JSDisconnectedException) { // ignore JSDisconnectedException exceptions