From b9ee0c7ba2c121aa3eb4a2f0a62c60ae196a6b1c Mon Sep 17 00:00:00 2001 From: Aydin Erdas Date: Wed, 27 Mar 2024 20:10:39 +0100 Subject: [PATCH 1/3] Revert "Merge pull request #723 from Lombiq/issue/OSOE-819" This reverts commit 509442daa9bdc7dc060d8a0196b8e803881af293, reversing changes made to b838a6030c254c3d4eb15345056ba7138cae1289. --- Lombiq.OSOCE.sln | 15 --------------- Readme.md | 1 - src/Libraries/Lombiq.HelpfulLibraries | 2 +- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/Lombiq.OSOCE.sln b/Lombiq.OSOCE.sln index 925402126..51c72ac1f 100644 --- a/Lombiq.OSOCE.sln +++ b/Lombiq.OSOCE.sln @@ -240,8 +240,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lombiq.Walkthroughs", "src\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lombiq.Hosting.MediaTheme.Tests.Theme", "src\Themes\Lombiq.Hosting.MediaTheme\Lombiq.Hosting.MediaTheme.Tests.Theme\Lombiq.Hosting.MediaTheme.Tests.Theme.csproj", "{CA12F503-6CE8-466C-A390-89AEE982DA64}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lombiq.HelpfulLibraries.SourceGenerators", "src\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.SourceGenerators\Lombiq.HelpfulLibraries.SourceGenerators\Lombiq.HelpfulLibraries.SourceGenerators.csproj", "{497EF903-EE06-443B-9545-266694746A63}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -1344,18 +1342,6 @@ Global {CA12F503-6CE8-466C-A390-89AEE982DA64}.Release|x64.Build.0 = Release|Any CPU {CA12F503-6CE8-466C-A390-89AEE982DA64}.Release|x86.ActiveCfg = Release|Any CPU {CA12F503-6CE8-466C-A390-89AEE982DA64}.Release|x86.Build.0 = Release|Any CPU - {497EF903-EE06-443B-9545-266694746A63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {497EF903-EE06-443B-9545-266694746A63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {497EF903-EE06-443B-9545-266694746A63}.Debug|x64.ActiveCfg = Debug|Any CPU - {497EF903-EE06-443B-9545-266694746A63}.Debug|x64.Build.0 = Debug|Any CPU - {497EF903-EE06-443B-9545-266694746A63}.Debug|x86.ActiveCfg = Debug|Any CPU - {497EF903-EE06-443B-9545-266694746A63}.Debug|x86.Build.0 = Debug|Any CPU - {497EF903-EE06-443B-9545-266694746A63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {497EF903-EE06-443B-9545-266694746A63}.Release|Any CPU.Build.0 = Release|Any CPU - {497EF903-EE06-443B-9545-266694746A63}.Release|x64.ActiveCfg = Release|Any CPU - {497EF903-EE06-443B-9545-266694746A63}.Release|x64.Build.0 = Release|Any CPU - {497EF903-EE06-443B-9545-266694746A63}.Release|x86.ActiveCfg = Release|Any CPU - {497EF903-EE06-443B-9545-266694746A63}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1463,7 +1449,6 @@ Global {63D47CA9-2693-4648-9E1F-42BCDD7BB663} = {6ED7E28F-0556-471C-8AD1-5BB0941411DD} {AE7DF7DE-0287-44A9-A3B6-9DEFC997D69C} = {11E06A11-1733-408D-BB2F-BFA07075F812} {CA12F503-6CE8-466C-A390-89AEE982DA64} = {574156BC-2074-47C9-8EA8-70DED6658DD5} - {497EF903-EE06-443B-9545-266694746A63} = {53D45048-C7C6-4D04-A9DA-8B8271510F99} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C6926E60-1F5A-4B05-B835-B1021FBE07C5} diff --git a/Readme.md b/Readme.md index 95651e5b7..01bea06f6 100644 --- a/Readme.md +++ b/Readme.md @@ -26,7 +26,6 @@ Note that this solution also has an Orchard 1 counterpart, [Lombiq's Open-Source - [`Lombiq.HelpfulLibraries.LinqToDb`](https://github.com/Lombiq/Helpful-Libraries/tree/dev/Lombiq.HelpfulLibraries.LinqToDb): With the help of this project you can write LINQ expressions and run them with a [YesSql](https://github.com/sebastienros/yessql) `ISession` extension method to query from the DB instead of writing plain SQL queries. Uses the [LINQ to DB project](https://linq2db.github.io/). You can watch a demo video of the project [here](https://www.youtube.com/watch?v=ldJOdCSsWJo). - [`Lombiq.HelpfulLibraries.RestEase`](https://github.com/Lombiq/Helpful-Libraries/tree/dev/Lombiq.HelpfulLibraries.RestEase): Adds a typed HTTP client to the service collection using RestEase. - [`Lombiq.HelpfulLibraries.Refit`](https://github.com/Lombiq/Helpful-Libraries/tree/dev/Lombiq.HelpfulLibraries.Refit): Adds helpers for working with [Refit](https://github.com/reactiveui/refit). - - [`Lombiq.HelpfulLibraries.SourceGenerators`](https://github.com/Lombiq/Helpful-Libraries/tree/dev/Lombiq.HelpfulLibraries.SourceGenerators): Helpful source generators that aid in development. - [`Lombiq.HelpfulLibraries.Targets`](https://github.com/Lombiq/Helpful-Libraries/tree/dev/Lombiq.HelpfulLibraries.Targets): Targets project which references all Helpful Libraries. Only necessary for NuGet publishing, just as _Lombiq.HelpfulLibraries.sln_. - [`Lombiq.OrchardCoreApiClient`](https://github.com/Lombiq/Orchard-Core-API-Client): A client library for communicating with the [Orchard Core](https://www.orchardcore.net/) web APIs, it contains an implementation for the tenant management API and a console application for testing and demonstration. diff --git a/src/Libraries/Lombiq.HelpfulLibraries b/src/Libraries/Lombiq.HelpfulLibraries index eb12fcd1a..b7e465478 160000 --- a/src/Libraries/Lombiq.HelpfulLibraries +++ b/src/Libraries/Lombiq.HelpfulLibraries @@ -1 +1 @@ -Subproject commit eb12fcd1a16039bdddd3b39b6efd44c5b04dc099 +Subproject commit b7e465478759f46de09de58ec27ac903c4282348 From 07321f9ceb375bf504a6c8eaa7b62487e6f25d51 Mon Sep 17 00:00:00 2001 From: Aydin Erdas Date: Wed, 27 Mar 2024 20:19:41 +0100 Subject: [PATCH 2/3] Submodule reverts --- src/Modules/Lombiq.VueJs | 2 +- src/Themes/Lombiq.BaseTheme | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Modules/Lombiq.VueJs b/src/Modules/Lombiq.VueJs index e2998d9bc..d164e63de 160000 --- a/src/Modules/Lombiq.VueJs +++ b/src/Modules/Lombiq.VueJs @@ -1 +1 @@ -Subproject commit e2998d9bc3422e8675f68cebf1b6cf45f35dc91e +Subproject commit d164e63de0c3057505d8de88494bdc722ef6688f diff --git a/src/Themes/Lombiq.BaseTheme b/src/Themes/Lombiq.BaseTheme index 3ba32a3eb..d5a32dcf4 160000 --- a/src/Themes/Lombiq.BaseTheme +++ b/src/Themes/Lombiq.BaseTheme @@ -1 +1 @@ -Subproject commit 3ba32a3eb469137eee7a8ef7e0baf0b979b24e07 +Subproject commit d5a32dcf4c63480a925fa9a6b138a893d6c59cff From ffdad213a377f4ebd236d2393c9fdc145c2e63a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Thu, 28 Mar 2024 01:31:18 +0100 Subject: [PATCH 3/3] submodules --- src/Libraries/Lombiq.HelpfulLibraries | 2 +- src/Modules/Lombiq.VueJs | 2 +- src/Themes/Lombiq.BaseTheme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Libraries/Lombiq.HelpfulLibraries b/src/Libraries/Lombiq.HelpfulLibraries index b7e465478..7e5e159ca 160000 --- a/src/Libraries/Lombiq.HelpfulLibraries +++ b/src/Libraries/Lombiq.HelpfulLibraries @@ -1 +1 @@ -Subproject commit b7e465478759f46de09de58ec27ac903c4282348 +Subproject commit 7e5e159ca842a977fdd0560624295113f790b6d8 diff --git a/src/Modules/Lombiq.VueJs b/src/Modules/Lombiq.VueJs index d164e63de..df2033903 160000 --- a/src/Modules/Lombiq.VueJs +++ b/src/Modules/Lombiq.VueJs @@ -1 +1 @@ -Subproject commit d164e63de0c3057505d8de88494bdc722ef6688f +Subproject commit df2033903a85e1656b9f61b415708d01f726d4db diff --git a/src/Themes/Lombiq.BaseTheme b/src/Themes/Lombiq.BaseTheme index d5a32dcf4..ed4805f5e 160000 --- a/src/Themes/Lombiq.BaseTheme +++ b/src/Themes/Lombiq.BaseTheme @@ -1 +1 @@ -Subproject commit d5a32dcf4c63480a925fa9a6b138a893d6c59cff +Subproject commit ed4805f5e54242216cc33656fc9fb06393d5074a