From 3f354549db2bc5225c4be60429d8be3ddb63d062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= <zoltan.lehoczky@lombiq.com> Date: Sat, 26 Mar 2022 16:29:20 +0100 Subject: [PATCH 1/4] Adapting to Helpful Libraries refactoring --- .../Permissions/TenantAdminPermissions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.Hosting.Tenants.Admin.Login/Permissions/TenantAdminPermissions.cs b/Lombiq.Hosting.Tenants.Admin.Login/Permissions/TenantAdminPermissions.cs index 32f797a8..dde2abad 100644 --- a/Lombiq.Hosting.Tenants.Admin.Login/Permissions/TenantAdminPermissions.cs +++ b/Lombiq.Hosting.Tenants.Admin.Login/Permissions/TenantAdminPermissions.cs @@ -1,4 +1,4 @@ -using Lombiq.HelpfulLibraries.Libraries.Users; +using Lombiq.HelpfulLibraries.OrchardCore.Users; using OrchardCore.Security.Permissions; using System.Collections.Generic; From 2d720bceed4efdd7962c73d6e5099b44ded17e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= <zoltan.lehoczky@lombiq.com> Date: Sat, 26 Mar 2022 18:52:22 +0100 Subject: [PATCH 2/4] Reducing Helpful Libraries dependencies to minimum --- .../Lombiq.Hosting.Tenants.Admin.Login.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj b/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj index c4c9fb55..ee140c1c 100644 --- a/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj +++ b/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj @@ -41,11 +41,11 @@ </ItemGroup> <ItemGroup Condition="'$(NuGetBuild)' != 'true'"> - <ProjectReference Include="..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.csproj" /> + <ProjectReference Include="..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.OrchardCore\Lombiq.HelpfulLibraries.OrchardCore.csproj" /> </ItemGroup> <ItemGroup Condition="'$(NuGetBuild)' == 'true'"> - <PackageReference Include="Lombiq.HelpfulLibraries" Version="3.0.0" /> + <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="3.0.0" /> </ItemGroup> </Project> From 37e3ee73b661608c7d27a88eeac2925534c9f65a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= <zoltan.lehoczky@lombiq.com> Date: Sat, 26 Mar 2022 18:53:16 +0100 Subject: [PATCH 3/4] Reducing Helpful Libraries dependencies to minimum --- .../Lombiq.Hosting.Tenants.Management.csproj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj b/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj index 87020e7c..dc9c4299 100644 --- a/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj +++ b/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj @@ -34,17 +34,18 @@ </ItemGroup> <ItemGroup> + <PackageReference Include="OrchardCore" Version="1.3.0" /> <PackageReference Include="OrchardCore.Module.Targets" Version="1.3.0" /> <PackageReference Include="OrchardCore.Tenants" Version="1.3.0" /> <PackageReference Include="Scrutor" Version="4.1.0" /> </ItemGroup> <ItemGroup Condition="'$(NuGetBuild)' != 'true'"> - <ProjectReference Include="..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.csproj" /> + <ProjectReference Include="..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.Common\Lombiq.HelpfulLibraries.Common.csproj" /> </ItemGroup> <ItemGroup Condition="'$(NuGetBuild)' == 'true'"> - <PackageReference Include="Lombiq.HelpfulLibraries" Version="3.0.0" /> + <PackageReference Include="Lombiq.HelpfulLibraries.Common" Version="3.0.0" /> </ItemGroup> </Project> From 93fe2f90628e5c8c52fbdb20b6f849307955ee03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= <zoltan.lehoczky@lombiq.com> Date: Sat, 26 Mar 2022 23:25:21 +0100 Subject: [PATCH 4/4] Depending on Lombiq.HelpfulLibraries.OrchardCore instead since this is an Orchard module anyway --- .../Lombiq.Hosting.Tenants.Management.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj b/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj index dc9c4299..48271cc6 100644 --- a/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj +++ b/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj @@ -41,11 +41,11 @@ </ItemGroup> <ItemGroup Condition="'$(NuGetBuild)' != 'true'"> - <ProjectReference Include="..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.Common\Lombiq.HelpfulLibraries.Common.csproj" /> + <ProjectReference Include="..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.OrchardCore\Lombiq.HelpfulLibraries.OrchardCore.csproj" /> </ItemGroup> <ItemGroup Condition="'$(NuGetBuild)' == 'true'"> - <PackageReference Include="Lombiq.HelpfulLibraries.Common" Version="3.0.0" /> + <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="3.0.0" /> </ItemGroup> </Project>