Add OCC as submodule

hishamco · hishamco · commit 71370374b717 · 2025-04-05T15:46:02.000+03:00
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "OrchardCoreContrib"]
+	path = OrchardCoreContrib
+	url = https://github.com/OrchardCoreContrib/OrchardCoreContrib.git
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -36,20 +36,6 @@
 		<PackageVersion Include="OrchardCore.Users" Version="2.1.6" />
 		<PackageVersion Include="OrchardCore.Users.Abstractions" Version="2.1.6" />
 		<PackageVersion Include="OrchardCore.Users.Core" Version="2.1.6" />
-		<PackageVersion Include="OrchardCoreContrib.Abstractions" Version="1.4.0" />
-		<PackageVersion Include="OrchardCoreContrib.ContentLocalization.Core" Version="1.2.0" />
-		<PackageVersion Include="OrchardCoreContrib.Data" Version="1.2.0" />
-		<PackageVersion Include="OrchardCoreContrib.Data.YesSql" Version="1.2.0" />
-		<PackageVersion Include="OrchardCoreContrib.Email" Version="1.6.0" />
-		<PackageVersion Include="OrchardCoreContrib.Garnet.Abstractions" Version="1.1.0" />
-		<PackageVersion Include="OrchardCoreContrib.HealthChecks.Abstractions" Version="1.3.0" />
-		<PackageVersion Include="OrchardCoreContrib.Infrastructure" Version="1.1.0" />
-		<PackageVersion Include="OrchardCoreContrib.Infrastructure.Abstractions" Version="2.4.0" />
-		<PackageVersion Include="OrchardCoreContrib.Localization" Version="1.4.0" />
-		<PackageVersion Include="OrchardCoreContrib.Localization.Abstractions" Version="1.4.0" />
-		<PackageVersion Include="OrchardCoreContrib.Navigation.Core" Version="1.4.0" />
-		<PackageVersion Include="OrchardCoreContrib.Sms.Abstractions" Version="1.4.0" />
-		<PackageVersion Include="OrchardCoreContrib.OpenApi.Abstractions" Version="1.4.0" />
 		<PackageVersion Include="SendGrid" Version="9.29.3" />
 		<PackageVersion Include="SixLabors.ImageSharp.Drawing" Version="2.1.5" />
 		<PackageVersion Include="StackExchange.Redis" Version="2.8.31" />
diff --git a/OrchardCoreContrib b/OrchardCoreContrib
@@ -0,0 +1 @@
+Subproject commit ce8cb01539917898fa0ea7b90075885518dab61b
diff --git a/src/OrchardCoreContrib.Apis.Swagger/OrchardCoreContrib.Apis.Swagger.csproj b/src/OrchardCoreContrib.Apis.Swagger/OrchardCoreContrib.Apis.Swagger.csproj
@@ -29,10 +29,13 @@
 
 	<ItemGroup>
 		<PackageReference Include="OrchardCore.Module.Targets" />
-		<PackageReference Include="OrchardCoreContrib.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.OpenApi.Abstractions" />
 		<PackageReference Include="Swashbuckle.AspNetCore" />
 		<PackageReference Include="Swashbuckle.AspNetCore.Swagger" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Abstractions\OrchardCoreContrib.Abstractions.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.OpenApi.Abstractions\OrchardCoreContrib.OpenApi.Abstractions.csproj" />
+	</ItemGroup>
+
 </Project>
diff --git a/src/OrchardCoreContrib.ContentLocalization/OrchardCoreContrib.ContentLocalization.csproj b/src/OrchardCoreContrib.ContentLocalization/OrchardCoreContrib.ContentLocalization.csproj
@@ -32,9 +32,12 @@
 		<PackageReference Include="OrchardCore.Contents.TagHelpers" />
 		<PackageReference Include="OrchardCore.ContentLocalization" />
 		<PackageReference Include="OrchardCore.Module.Targets" />
-		<PackageReference Include="OrchardCoreContrib.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.ContentLocalization.Core" />
-		<PackageReference Include="OrchardCoreContrib.Navigation.Core" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Abstractions\OrchardCoreContrib.Abstractions.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.ContentLocalization.Core\OrchardCoreContrib.ContentLocalization.Core.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Navigation.Core\OrchardCoreContrib.Navigation.Core.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/OrchardCoreContrib.ContentPermissions/OrchardCoreContrib.ContentPermissions.csproj b/src/OrchardCoreContrib.ContentPermissions/OrchardCoreContrib.ContentPermissions.csproj
@@ -33,9 +33,12 @@
 	<ItemGroup>
 		<PackageReference Include="OrchardCore.Module.Targets" />
 		<PackageReference Include="OrchardCore.Users.Core" />
-		<PackageReference Include="OrchardCoreContrib.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.Data" />
-		<PackageReference Include="OrchardCoreContrib.Infrastructure.Abstractions" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Abstractions\OrchardCoreContrib.Abstractions.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Data\OrchardCoreContrib.Data.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Infrastructure.Abstractions\OrchardCoreContrib.Infrastructure.Abstractions.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/OrchardCoreContrib.ContentPreview/OrchardCoreContrib.ContentPreview.csproj b/src/OrchardCoreContrib.ContentPreview/OrchardCoreContrib.ContentPreview.csproj
@@ -34,7 +34,10 @@
 		<PackageReference Include="OrchardCore.Module.Targets" />
 		<PackageReference Include="OrchardCore.ResourceManagement" />
 		<PackageReference Include="OrchardCore.Users.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.Abstractions" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Abstractions\OrchardCoreContrib.Abstractions.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/OrchardCoreContrib.DataLocalization/OrchardCoreContrib.DataLocalization.csproj b/src/OrchardCoreContrib.DataLocalization/OrchardCoreContrib.DataLocalization.csproj
@@ -33,10 +33,13 @@
 		<PackageReference Include="OrchardCore" />
 		<PackageReference Include="OrchardCore.ContentTypes" />
 		<PackageReference Include="OrchardCore.Data.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.Localization.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.Localization" />
-		<PackageReference Include="OrchardCoreContrib.Navigation.Core" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Abstractions\OrchardCoreContrib.Abstractions.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Localization.Abstractions\OrchardCoreContrib.Localization.Abstractions.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Localization\OrchardCoreContrib.Localization.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Navigation.Core\OrchardCoreContrib.Navigation.Core.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/OrchardCoreContrib.Diagnostics.Elm/OrchardCoreContrib.Diagnostics.Elm.csproj b/src/OrchardCoreContrib.Diagnostics.Elm/OrchardCoreContrib.Diagnostics.Elm.csproj
@@ -26,7 +26,10 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Diagnostics.Elm" />
 		<PackageReference Include="OrchardCore.Module.Targets" />
-		<PackageReference Include="OrchardCoreContrib.Abstractions" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Abstractions\OrchardCoreContrib.Abstractions.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/OrchardCoreContrib.Email.Gmail/OrchardCoreContrib.Email.Gmail.csproj b/src/OrchardCoreContrib.Email.Gmail/OrchardCoreContrib.Email.Gmail.csproj
@@ -33,9 +33,12 @@
 		<PackageReference Include="OrchardCore.DisplayManagement" />
 		<PackageReference Include="OrchardCore.Infrastructure.Abstractions" />
 		<PackageReference Include="OrchardCore.Module.Targets" />
-		<PackageReference Include="OrchardCoreContrib.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.Email" />
-		<PackageReference Include="OrchardCoreContrib.Navigation.Core" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Abstractions\OrchardCoreContrib.Abstractions.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Email\OrchardCoreContrib.Email.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Navigation.Core\OrchardCoreContrib.Navigation.Core.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/OrchardCoreContrib.Email.Hotmail/OrchardCoreContrib.Email.Hotmail.csproj b/src/OrchardCoreContrib.Email.Hotmail/OrchardCoreContrib.Email.Hotmail.csproj
@@ -33,9 +33,12 @@
 		<PackageReference Include="OrchardCore.DisplayManagement" />
 		<PackageReference Include="OrchardCore.Infrastructure.Abstractions" />
 		<PackageReference Include="OrchardCore.Module.Targets" />
-		<PackageReference Include="OrchardCoreContrib.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.Email" />
-		<PackageReference Include="OrchardCoreContrib.Navigation.Core" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Abstractions\OrchardCoreContrib.Abstractions.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Email\OrchardCoreContrib.Email.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Navigation.Core\OrchardCoreContrib.Navigation.Core.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/OrchardCoreContrib.Email.SendGrid/OrchardCoreContrib.Email.SendGrid.csproj b/src/OrchardCoreContrib.Email.SendGrid/OrchardCoreContrib.Email.SendGrid.csproj
@@ -35,9 +35,12 @@
 		<PackageReference Include="OrchardCore.Email.Abstractions" />
 		<PackageReference Include="OrchardCore.Infrastructure.Abstractions" />
 		<PackageReference Include="OrchardCore.Module.Targets" />
-		<PackageReference Include="OrchardCoreContrib.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.HealthChecks.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.Navigation.Core" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Abstractions\OrchardCoreContrib.Abstractions.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.HealthChecks.Abstractions\OrchardCoreContrib.HealthChecks.Abstractions.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Navigation.Core\OrchardCoreContrib.Navigation.Core.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/OrchardCoreContrib.Email.Yahoo/OrchardCoreContrib.Email.Yahoo.csproj b/src/OrchardCoreContrib.Email.Yahoo/OrchardCoreContrib.Email.Yahoo.csproj
@@ -33,10 +33,13 @@
 		<PackageReference Include="OrchardCore.DisplayManagement" />
 		<PackageReference Include="OrchardCore.Infrastructure.Abstractions" />
 		<PackageReference Include="OrchardCore.Module.Targets" />
-		<PackageReference Include="OrchardCoreContrib.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.Email" />
 		<PackageReference Include="OrchardCore.Navigation.Core" />
-		<PackageReference Include="OrchardCoreContrib.Navigation.Core" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Abstractions\OrchardCoreContrib.Abstractions.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Email\OrchardCoreContrib.Email.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Navigation.Core\OrchardCoreContrib.Navigation.Core.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/OrchardCoreContrib.Garnet/GarnetClientFactory.cs b/src/OrchardCoreContrib.Garnet/GarnetClientFactory.cs
@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using System.Collections.Concurrent;
+using System.Net;
 
 namespace OrchardCoreContrib.Garnet;
 
@@ -60,7 +61,8 @@ public async Task<GarnetClient> CreateAsync(GarnetOptions options)
                     _logger.LogDebug("Creating a new instance of '{name}'. A single instance per configuration should be created across tenants. Total instances prior creating is '{count}'.", nameof(GarnetClient), _factories.Count);
                 }
 
-                var client = new GarnetClient(options.Host, options.Port, authUsername: options.UserName, authPassword: options.Password);
+                var endpoint = new IPEndPoint(IPAddress.Parse(options.Host), options.Port);
+                var client = new GarnetClient(endpoint, authUsername: options.UserName, authPassword: options.Password);
 
                 await client.ConnectAsync();
 
diff --git a/src/OrchardCoreContrib.Garnet/OrchardCoreContrib.Garnet.csproj b/src/OrchardCoreContrib.Garnet/OrchardCoreContrib.Garnet.csproj
@@ -22,13 +22,16 @@
 	<ItemGroup>
 		<PackageReference Include="OrchardCore.Infrastructure.Abstractions" />
 		<PackageReference Include="OrchardCore.Module.Targets" />
-		<PackageReference Include="OrchardCoreContrib.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.Garnet.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.HealthChecks.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.Infrastructure.Abstractions" />
 		<PackageReference Include="StackExchange.Redis" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Abstractions\OrchardCoreContrib.Abstractions.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Garnet.Abstractions\OrchardCoreContrib.Garnet.Abstractions.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.HealthChecks.Abstractions\OrchardCoreContrib.HealthChecks.Abstractions.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Infrastructure.Abstractions\OrchardCoreContrib.Infrastructure.Abstractions.csproj" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<None Include="../../images/icon.png" Pack="true" PackagePath="icon.png" />
 	</ItemGroup>
diff --git a/src/OrchardCoreContrib.Gdpr/OrchardCoreContrib.Gdpr.csproj b/src/OrchardCoreContrib.Gdpr/OrchardCoreContrib.Gdpr.csproj
@@ -31,10 +31,13 @@
 	<ItemGroup>
 		<PackageReference Include="OrchardCore.Admin.Abstractions" />
 		<PackageReference Include="OrchardCore.DisplayManagement" />
-		<PackageReference Include="OrchardCore.Infrastructure.Abstractions" />
 		<PackageReference Include="OrchardCore.Module.Targets" />
-		<PackageReference Include="OrchardCoreContrib.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.Navigation.Core" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Abstractions\OrchardCoreContrib.Abstractions.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Infrastructure.Abstractions\OrchardCoreContrib.Infrastructure.Abstractions.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Navigation.Core\OrchardCoreContrib.Navigation.Core.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/OrchardCoreContrib.GoogleMaps/OrchardCoreContrib.GoogleMaps.csproj b/src/OrchardCoreContrib.GoogleMaps/OrchardCoreContrib.GoogleMaps.csproj
@@ -32,12 +32,15 @@
 	<ItemGroup>
 		<PackageReference Include="OrchardCore.ContentManagement" />
 		<PackageReference Include="OrchardCore.ContentTypes.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.Data" />
 		<PackageReference Include="OrchardCore.DisplayManagement" />
 		<PackageReference Include="OrchardCore.Module.Targets" />
 		<PackageReference Include="OrchardCore.ResourceManagement" />
-		<PackageReference Include="OrchardCoreContrib.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.Navigation.Core" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Abstractions\OrchardCoreContrib.Abstractions.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Data\OrchardCoreContrib.Data.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Navigation.Core\OrchardCoreContrib.Navigation.Core.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/OrchardCoreContrib.Gravatar/OrchardCoreContrib.Gravatar.csproj b/src/OrchardCoreContrib.Gravatar/OrchardCoreContrib.Gravatar.csproj
@@ -33,7 +33,10 @@
 	<ItemGroup>
 		<PackageReference Include="OrchardCore.Module.Targets" />
 		<PackageReference Include="OrchardCore.Users" />
-		<PackageReference Include="OrchardCoreContrib.Abstractions" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Abstractions\OrchardCoreContrib.Abstractions.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/OrchardCoreContrib.HealthChecks/OrchardCoreContrib.HealthChecks.csproj b/src/OrchardCoreContrib.HealthChecks/OrchardCoreContrib.HealthChecks.csproj
@@ -32,8 +32,11 @@
 
 	<ItemGroup>
 		<PackageReference Include="OrchardCore.Module.Targets" />
-		<PackageReference Include="OrchardCoreContrib.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.HealthChecks.Abstractions" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Abstractions\OrchardCoreContrib.Abstractions.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.HealthChecks.Abstractions\OrchardCoreContrib.HealthChecks.Abstractions.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/OrchardCoreContrib.Html/OrchardCoreContrib.Html.csproj b/src/OrchardCoreContrib.Html/OrchardCoreContrib.Html.csproj
@@ -33,7 +33,10 @@
 		<PackageReference Include="OrchardCore.ContentManagement" />
 		<PackageReference Include="OrchardCore.DisplayManagement" />
 		<PackageReference Include="OrchardCore.Html" />
-		<PackageReference Include="OrchardCoreContrib.Abstractions" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Abstractions\OrchardCoreContrib.Abstractions.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/OrchardCoreContrib.Liquid/OrchardCoreContrib.Liquid.csproj b/src/OrchardCoreContrib.Liquid/OrchardCoreContrib.Liquid.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<VersionPrefix>1.3.0</VersionPrefix>
@@ -30,7 +30,10 @@
 	<ItemGroup>
 		<PackageReference Include="OrchardCore.Liquid.Abstractions" />
 		<PackageReference Include="OrchardCore.Module.Targets" />
-		<PackageReference Include="OrchardCoreContrib.Abstractions" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Abstractions\OrchardCoreContrib.Abstractions.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/OrchardCoreContrib.Modules.Web/OrchardCoreContrib.Modules.Web.csproj b/src/OrchardCoreContrib.Modules.Web/OrchardCoreContrib.Modules.Web.csproj
@@ -1,7 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<ItemGroup>
-		<PackageReference Include="OrchardCoreContrib.Data.YesSql" />
 		<PackageReference Include="OrchardCore.Application.Cms.Targets" />
 	</ItemGroup>
 
@@ -33,4 +32,8 @@
 		<ProjectReference Include="..\OrchardCoreContrib.ViewCount\OrchardCoreContrib.ViewCount.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Data.YesSql\OrchardCoreContrib.Data.YesSql.csproj" />
+	</ItemGroup>
+
 </Project>
diff --git a/src/OrchardCoreContrib.ReverseProxy.Yarp/OrchardCoreContrib.ReverseProxy.Yarp.csproj b/src/OrchardCoreContrib.ReverseProxy.Yarp/OrchardCoreContrib.ReverseProxy.Yarp.csproj
@@ -30,8 +30,11 @@
 
 	<ItemGroup>
 		<PackageReference Include="OrchardCore.Module.Targets" />
-		<PackageReference Include="OrchardCoreContrib.Abstractions" />
 		<PackageReference Include="Yarp.ReverseProxy" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Abstractions\OrchardCoreContrib.Abstractions.csproj" />
+	</ItemGroup>
+
 </Project>
diff --git a/src/OrchardCoreContrib.Sms.Azure/OrchardCoreContrib.Sms.Azure.csproj b/src/OrchardCoreContrib.Sms.Azure/OrchardCoreContrib.Sms.Azure.csproj
@@ -32,9 +32,12 @@
 		<PackageReference Include="Azure.Communication.Sms" />
 		<PackageReference Include="OrchardCore.DisplayManagement" />
 		<PackageReference Include="OrchardCore.Module.Targets" />
-		<PackageReference Include="OrchardCoreContrib.Infrastructure" />
-		<PackageReference Include="OrchardCoreContrib.Navigation.Core" />
-		<PackageReference Include="OrchardCoreContrib.Sms.Abstractions" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Infrastructure\OrchardCoreContrib.Infrastructure.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Navigation.Core\OrchardCoreContrib.Navigation.Core.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Sms.Abstractions\OrchardCoreContrib.Sms.Abstractions.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/OrchardCoreContrib.System/OrchardCoreContrib.System.csproj b/src/OrchardCoreContrib.System/OrchardCoreContrib.System.csproj
@@ -34,10 +34,13 @@
 		<PackageReference Include="OrchardCore.Admin.Abstractions" />
 		<PackageReference Include="OrchardCore.ContentManagement.Abstractions" />
 		<PackageReference Include="OrchardCore.DisplayManagement" />
-		<PackageReference Include="OrchardCoreContrib.HealthChecks.Abstractions" />
 		<PackageReference Include="OrchardCore.Users.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.Navigation.Core" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Abstractions\OrchardCoreContrib.Abstractions.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.HealthChecks.Abstractions\OrchardCoreContrib.HealthChecks.Abstractions.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Navigation.Core\OrchardCoreContrib.Navigation.Core.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/OrchardCoreContrib.Tenants/OrchardCoreContrib.Tenants.csproj b/src/OrchardCoreContrib.Tenants/OrchardCoreContrib.Tenants.csproj
@@ -29,8 +29,11 @@
 
 	<ItemGroup>
 		<PackageReference Include="OrchardCore.Module.Targets" />
-		<PackageReference Include="OrchardCoreContrib.Abstractions" />
-		<PackageReference Include="OrchardCoreContrib.HealthChecks.Abstractions" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.Abstractions\OrchardCoreContrib.Abstractions.csproj" />
+		<ProjectReference Include="..\..\OrchardCoreContrib\src\OrchardCoreContrib.HealthChecks.Abstractions\OrchardCoreContrib.HealthChecks.Abstractions.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/OrchardCoreContrib.Users/OrchardCoreContrib.Users.csproj b/src/OrchardCoreContrib.Users/OrchardCoreContrib.Users.csproj
diff --git a/src/OrchardCoreContrib.ViewCount/OrchardCoreContrib.ViewCount.csproj b/src/OrchardCoreContrib.ViewCount/OrchardCoreContrib.ViewCount.csproj

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "OrchardCoreContrib"]`
	`2`	`+ path = OrchardCoreContrib`
	`3`	`+ url = https://github.com/OrchardCoreContrib/OrchardCoreContrib.git`