From 1c6c4c8c7f6b9abbd95cbca506385118e8dde050 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 15 Aug 2024 23:04:25 +0200 Subject: [PATCH 1/9] Dependency cleanup; upgraded vulnerable/deprecated packages --- Directory.Packages.props | 67 +++++-------------- .../Volo.Abp.Cli.Core.csproj | 4 +- 2 files changed, 17 insertions(+), 54 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index b43886f7cf6..7191cd8428b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,13 +6,13 @@ + + - - @@ -23,33 +23,28 @@ - + + - + + - - - - - - - + - @@ -57,10 +52,7 @@ - - - @@ -70,15 +62,10 @@ - - - - - @@ -86,7 +73,6 @@ - @@ -94,22 +80,18 @@ - + - - - - - + - + + - @@ -117,15 +99,8 @@ - - - - - - - - + @@ -137,41 +112,29 @@ - - - + - - - - - + - - - - - - - + \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj index 4a9c3f418b2..36501d6aa68 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj +++ b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj @@ -14,13 +14,13 @@ + - @@ -34,4 +34,4 @@ - + \ No newline at end of file From a1335ee94c68bc154d17bd85b48efabb26bec2e2 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 15 Aug 2024 23:13:31 +0200 Subject: [PATCH 2/9] Fixed SkiaSharp --- Directory.Packages.props | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 7191cd8428b..fbd54edd02d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -120,6 +120,8 @@ + + @@ -137,4 +139,4 @@ - \ No newline at end of file + From 758ba6375e1526419c010c3ce116bac6d3f7c984 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 15 Aug 2024 23:18:44 +0200 Subject: [PATCH 3/9] Fix CodeGeneration --- Directory.Packages.props | 1 + 1 file changed, 1 insertion(+) diff --git a/Directory.Packages.props b/Directory.Packages.props index fbd54edd02d..1b110413df7 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -90,6 +90,7 @@ + From 8f444c96705e8257e9262a3da4a7d6b8208ae1a8 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 15 Aug 2024 23:23:50 +0200 Subject: [PATCH 4/9] Fix EFCore.InMemory --- Directory.Packages.props | 1 + 1 file changed, 1 insertion(+) diff --git a/Directory.Packages.props b/Directory.Packages.props index 1b110413df7..343b0f043f1 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -63,6 +63,7 @@ + From 57e0a0c187b6af2b80cfeacc5801c14d4430fefe Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 15 Aug 2024 23:27:20 +0200 Subject: [PATCH 5/9] Fix CommonMark --- Directory.Packages.props | 1 + 1 file changed, 1 insertion(+) diff --git a/Directory.Packages.props b/Directory.Packages.props index 343b0f043f1..4499033a7c1 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -23,6 +23,7 @@ + From 0f62deebd76c1b21c43ecc3ce14f812b6c89750e Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 15 Aug 2024 23:28:34 +0200 Subject: [PATCH 6/9] Fix distributedlock.redis --- Directory.Packages.props | 1 + 1 file changed, 1 insertion(+) diff --git a/Directory.Packages.props b/Directory.Packages.props index 4499033a7c1..89ae968136a 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -34,6 +34,7 @@ + From 2438d1e5a2a1ace053afe9fb971ec4c48d1747bc Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 15 Aug 2024 23:29:44 +0200 Subject: [PATCH 7/9] Fix hangfire --- Directory.Packages.props | 1 + 1 file changed, 1 insertion(+) diff --git a/Directory.Packages.props b/Directory.Packages.props index 89ae968136a..5d16d5fcd67 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -41,6 +41,7 @@ + From 50c39f623e3a45d4c960053d5a43269608c6300c Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 15 Aug 2024 23:37:25 +0200 Subject: [PATCH 8/9] Fixes --- Directory.Packages.props | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/Directory.Packages.props b/Directory.Packages.props index 5d16d5fcd67..2f1727c1c08 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -42,12 +42,16 @@ + + + + @@ -56,6 +60,9 @@ + + + @@ -65,11 +72,15 @@ + + + + @@ -77,6 +88,7 @@ + @@ -85,8 +97,11 @@ + + + @@ -97,6 +112,7 @@ + @@ -104,6 +120,12 @@ + + + + + + @@ -117,6 +139,7 @@ + @@ -124,22 +147,28 @@ + + + + + + From dc8463ee2cff17d4136e2c58d2c07feef25fda25 Mon Sep 17 00:00:00 2001 From: Mark Cilia Vincenti Date: Thu, 15 Aug 2024 23:38:47 +0200 Subject: [PATCH 9/9] Fix fody --- Directory.Packages.props | 1 + 1 file changed, 1 insertion(+) diff --git a/Directory.Packages.props b/Directory.Packages.props index 2f1727c1c08..f85ca6d1ba7 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -40,6 +40,7 @@ +