From da8d2b83689451ef217914a6262594ca1ead0606 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20M=C3=A1rkus?= Date: Tue, 25 Apr 2023 19:29:08 +0200 Subject: [PATCH 01/11] Upgrading to OC 1.6 --- .../Lombiq.Privacy.Samples.csproj | 14 ++++++------ .../Lombiq.Privacy.Tests.UI.csproj | 4 ++-- Lombiq.Privacy/Lombiq.Privacy.csproj | 22 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj b/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj index 3bea154..7dc3d15 100644 --- a/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj +++ b/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj @@ -22,23 +22,23 @@ - - - + + + - + - + - + - + diff --git a/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj b/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj index fdf4144..f3c907c 100644 --- a/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj +++ b/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj @@ -23,9 +23,9 @@ - + - + diff --git a/Lombiq.Privacy/Lombiq.Privacy.csproj b/Lombiq.Privacy/Lombiq.Privacy.csproj index 97ddfa8..68e998b 100644 --- a/Lombiq.Privacy/Lombiq.Privacy.csproj +++ b/Lombiq.Privacy/Lombiq.Privacy.csproj @@ -33,15 +33,15 @@ - - - - - - - - - + + + + + + + + + @@ -50,8 +50,8 @@ - - + + From d7a744e93f384949936b7de7e6cb797782fc6f2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20M=C3=A1rkus?= Date: Fri, 12 May 2023 09:57:22 +0200 Subject: [PATCH 02/11] Removing AddDataMigration workaround. --- .../MigrationServiceCollectionExtensions.cs | 17 ----------------- Lombiq.Privacy/Startup.cs | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 Lombiq.Privacy/Extensions/MigrationServiceCollectionExtensions.cs diff --git a/Lombiq.Privacy/Extensions/MigrationServiceCollectionExtensions.cs b/Lombiq.Privacy/Extensions/MigrationServiceCollectionExtensions.cs deleted file mode 100644 index 95eea48..0000000 --- a/Lombiq.Privacy/Extensions/MigrationServiceCollectionExtensions.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using OrchardCore.Data.Migration; - -namespace Lombiq.Privacy.Extensions; - -// We need to use this until the Orchard Core upgrade so we don't have to upgrade submodules to nightly versions. This -// is the same method as what is in the 1.6 nightly version of Orchard Core. During the upgrade, this can be removed and -// use the Orchard Core method for data migrations. - -/// -/// Provides extension methods for to add YesSql migration . -/// -public static class MigrationServiceCollectionExtensions -{ - public static IServiceCollection AddDataMigration(this IServiceCollection services) - where TDataMigration : class, IDataMigration => services.AddScoped(); -} diff --git a/Lombiq.Privacy/Startup.cs b/Lombiq.Privacy/Startup.cs index 48a524d..7ee440b 100644 --- a/Lombiq.Privacy/Startup.cs +++ b/Lombiq.Privacy/Startup.cs @@ -1,7 +1,6 @@ using Lombiq.Privacy.Activities; using Lombiq.Privacy.Constants; using Lombiq.Privacy.Drivers; -using Lombiq.Privacy.Extensions; using Lombiq.Privacy.Filters; using Lombiq.Privacy.Handlers; using Lombiq.Privacy.Migrations; @@ -16,6 +15,7 @@ using Microsoft.Extensions.Options; using OrchardCore.ContentManagement; using OrchardCore.ContentManagement.Display.ContentDisplay; +using OrchardCore.Data.Migration; using OrchardCore.Modules; using OrchardCore.Navigation; using OrchardCore.ResourceManagement; From a09c9b595bb8397e3c61c2c29e47ef829523735c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20M=C3=A1rkus?= Date: Sat, 20 May 2023 12:59:39 +0200 Subject: [PATCH 03/11] Upgrading Lombiq.ChartJs.Tests.UI package. --- Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj b/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj index f3c907c..af435d2 100644 --- a/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj +++ b/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj @@ -25,7 +25,7 @@ - + From e88a86f77c5854ec0e32090f64a09bd154b9b011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20M=C3=A1rkus?= Date: Mon, 22 May 2023 17:27:30 +0200 Subject: [PATCH 04/11] Updating to latest Lombiq alpha releases. --- Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj | 2 +- Lombiq.Privacy/Lombiq.Privacy.csproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj b/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj index 7dc3d15..363d1e7 100644 --- a/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj +++ b/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj @@ -28,7 +28,7 @@ - + diff --git a/Lombiq.Privacy/Lombiq.Privacy.csproj b/Lombiq.Privacy/Lombiq.Privacy.csproj index db84c79..f449e95 100644 --- a/Lombiq.Privacy/Lombiq.Privacy.csproj +++ b/Lombiq.Privacy/Lombiq.Privacy.csproj @@ -50,8 +50,8 @@ - - + + From c4ca58dc39b46a7ec5fd5fc06ce760b618bc93e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20M=C3=A1rkus?= Date: Mon, 22 May 2023 18:03:19 +0200 Subject: [PATCH 05/11] Removing mistakenly included "v" from versions. --- Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj | 2 +- Lombiq.Privacy/Lombiq.Privacy.csproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj b/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj index 363d1e7..c04a580 100644 --- a/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj +++ b/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj @@ -28,7 +28,7 @@ - + diff --git a/Lombiq.Privacy/Lombiq.Privacy.csproj b/Lombiq.Privacy/Lombiq.Privacy.csproj index f449e95..619461f 100644 --- a/Lombiq.Privacy/Lombiq.Privacy.csproj +++ b/Lombiq.Privacy/Lombiq.Privacy.csproj @@ -50,8 +50,8 @@ - - + + From 2d7a337f36890f03fad8f29bab35e73421db8a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20M=C3=A1rkus?= Date: Mon, 22 May 2023 19:07:00 +0200 Subject: [PATCH 06/11] Updating to latest Lombiq.Tests.UI alpha release. --- Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj b/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj index af435d2..c2579c6 100644 --- a/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj +++ b/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj @@ -25,7 +25,7 @@ - + From 521d493407655d8d566d454deb91e9379403265c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zsef=20Horv=C3=A1th?= Date: Fri, 9 Jun 2023 17:17:14 +0200 Subject: [PATCH 07/11] Upgrading Lombiq.HelpfulLibraries.* package reference version Upgrading Lombiq.Tests.UI.* package reference version Upgrading Lombiq.HelpfulExtensions.* package reference version --- Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj | 2 +- Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj | 2 +- Lombiq.Privacy/Lombiq.Privacy.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj b/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj index c04a580..a03430b 100644 --- a/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj +++ b/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj @@ -28,7 +28,7 @@ - + diff --git a/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj b/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj index c2579c6..2498e42 100644 --- a/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj +++ b/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj @@ -25,7 +25,7 @@ - + diff --git a/Lombiq.Privacy/Lombiq.Privacy.csproj b/Lombiq.Privacy/Lombiq.Privacy.csproj index 619461f..e654684 100644 --- a/Lombiq.Privacy/Lombiq.Privacy.csproj +++ b/Lombiq.Privacy/Lombiq.Privacy.csproj @@ -50,7 +50,7 @@ - + From 28b434ce4f8561cbc44d33ac0354376999064518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Sun, 11 Jun 2023 20:18:36 +0200 Subject: [PATCH 08/11] Updating Lombiq.NodeJs.Extensions NuGet to latest alpha --- Lombiq.Privacy/Lombiq.Privacy.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.Privacy/Lombiq.Privacy.csproj b/Lombiq.Privacy/Lombiq.Privacy.csproj index e654684..1dc97ec 100644 --- a/Lombiq.Privacy/Lombiq.Privacy.csproj +++ b/Lombiq.Privacy/Lombiq.Privacy.csproj @@ -51,7 +51,7 @@ - + From 504187f24cec51c95107e3ce460821ba45bdf354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Fri, 16 Jun 2023 13:53:51 +0200 Subject: [PATCH 09/11] Updating Lombiq.HelpfulLibraries NuGet reference to latest alpha --- Lombiq.Privacy/Lombiq.Privacy.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.Privacy/Lombiq.Privacy.csproj b/Lombiq.Privacy/Lombiq.Privacy.csproj index 1dc97ec..698735d 100644 --- a/Lombiq.Privacy/Lombiq.Privacy.csproj +++ b/Lombiq.Privacy/Lombiq.Privacy.csproj @@ -50,7 +50,7 @@ - + From 8caabb454b4eb6e20a40775e1cd636fc5bb70621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Sun, 18 Jun 2023 22:26:36 +0200 Subject: [PATCH 10/11] Updating Lombiq NuGet references --- Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj | 2 +- Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj b/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj index a03430b..3ed297e 100644 --- a/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj +++ b/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj @@ -28,7 +28,7 @@ - + diff --git a/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj b/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj index 2498e42..a05588f 100644 --- a/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj +++ b/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj @@ -25,7 +25,7 @@ - + From b2553b24cda4403571944d20daf203a6bc97e54c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Mon, 19 Jun 2023 00:51:25 +0200 Subject: [PATCH 11/11] Updating Lombiq NuGet references to release versions --- Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj | 2 +- Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj | 2 +- Lombiq.Privacy/Lombiq.Privacy.csproj | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj b/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj index 3ed297e..45498e3 100644 --- a/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj +++ b/Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj @@ -28,7 +28,7 @@ - + diff --git a/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj b/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj index a05588f..166dc99 100644 --- a/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj +++ b/Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj @@ -25,7 +25,7 @@ - + diff --git a/Lombiq.Privacy/Lombiq.Privacy.csproj b/Lombiq.Privacy/Lombiq.Privacy.csproj index 698735d..b38caab 100644 --- a/Lombiq.Privacy/Lombiq.Privacy.csproj +++ b/Lombiq.Privacy/Lombiq.Privacy.csproj @@ -50,8 +50,8 @@ - - + +