diff --git a/.gitmodules b/.gitmodules index e69de29b..bb2f35aa 100644 --- 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 index e0f546b6..d6737781 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -36,20 +36,6 @@ - - - - - - - - - - - - - - diff --git a/OrchardCoreContrib b/OrchardCoreContrib new file mode 160000 index 00000000..ce8cb015 --- /dev/null +++ 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 index 7aa20e2f..b8ec89d9 100644 --- a/src/OrchardCoreContrib.Apis.Swagger/OrchardCoreContrib.Apis.Swagger.csproj +++ b/src/OrchardCoreContrib.Apis.Swagger/OrchardCoreContrib.Apis.Swagger.csproj @@ -29,10 +29,13 @@ - - + + + + + diff --git a/src/OrchardCoreContrib.ContentLocalization/OrchardCoreContrib.ContentLocalization.csproj b/src/OrchardCoreContrib.ContentLocalization/OrchardCoreContrib.ContentLocalization.csproj index 5ce352bc..06bae6d7 100644 --- a/src/OrchardCoreContrib.ContentLocalization/OrchardCoreContrib.ContentLocalization.csproj +++ b/src/OrchardCoreContrib.ContentLocalization/OrchardCoreContrib.ContentLocalization.csproj @@ -32,9 +32,12 @@ - - - + + + + + + diff --git a/src/OrchardCoreContrib.ContentPermissions/OrchardCoreContrib.ContentPermissions.csproj b/src/OrchardCoreContrib.ContentPermissions/OrchardCoreContrib.ContentPermissions.csproj index e211128f..c99d57f6 100644 --- a/src/OrchardCoreContrib.ContentPermissions/OrchardCoreContrib.ContentPermissions.csproj +++ b/src/OrchardCoreContrib.ContentPermissions/OrchardCoreContrib.ContentPermissions.csproj @@ -33,9 +33,12 @@ - - - + + + + + + diff --git a/src/OrchardCoreContrib.ContentPreview/OrchardCoreContrib.ContentPreview.csproj b/src/OrchardCoreContrib.ContentPreview/OrchardCoreContrib.ContentPreview.csproj index b0291f3c..61e52de5 100644 --- a/src/OrchardCoreContrib.ContentPreview/OrchardCoreContrib.ContentPreview.csproj +++ b/src/OrchardCoreContrib.ContentPreview/OrchardCoreContrib.ContentPreview.csproj @@ -34,7 +34,10 @@ - + + + + diff --git a/src/OrchardCoreContrib.DataLocalization/OrchardCoreContrib.DataLocalization.csproj b/src/OrchardCoreContrib.DataLocalization/OrchardCoreContrib.DataLocalization.csproj index d1ce4439..7df49b48 100644 --- a/src/OrchardCoreContrib.DataLocalization/OrchardCoreContrib.DataLocalization.csproj +++ b/src/OrchardCoreContrib.DataLocalization/OrchardCoreContrib.DataLocalization.csproj @@ -33,10 +33,13 @@ - - - - + + + + + + + diff --git a/src/OrchardCoreContrib.Diagnostics.Elm/OrchardCoreContrib.Diagnostics.Elm.csproj b/src/OrchardCoreContrib.Diagnostics.Elm/OrchardCoreContrib.Diagnostics.Elm.csproj index 23151ae8..1bd96204 100644 --- a/src/OrchardCoreContrib.Diagnostics.Elm/OrchardCoreContrib.Diagnostics.Elm.csproj +++ b/src/OrchardCoreContrib.Diagnostics.Elm/OrchardCoreContrib.Diagnostics.Elm.csproj @@ -26,7 +26,10 @@ - + + + + diff --git a/src/OrchardCoreContrib.Email.Gmail/OrchardCoreContrib.Email.Gmail.csproj b/src/OrchardCoreContrib.Email.Gmail/OrchardCoreContrib.Email.Gmail.csproj index b7c2c27f..2f597aa5 100644 --- a/src/OrchardCoreContrib.Email.Gmail/OrchardCoreContrib.Email.Gmail.csproj +++ b/src/OrchardCoreContrib.Email.Gmail/OrchardCoreContrib.Email.Gmail.csproj @@ -33,9 +33,12 @@ - - - + + + + + + diff --git a/src/OrchardCoreContrib.Email.Hotmail/OrchardCoreContrib.Email.Hotmail.csproj b/src/OrchardCoreContrib.Email.Hotmail/OrchardCoreContrib.Email.Hotmail.csproj index b53cb32c..1832ab23 100644 --- a/src/OrchardCoreContrib.Email.Hotmail/OrchardCoreContrib.Email.Hotmail.csproj +++ b/src/OrchardCoreContrib.Email.Hotmail/OrchardCoreContrib.Email.Hotmail.csproj @@ -33,9 +33,12 @@ - - - + + + + + + diff --git a/src/OrchardCoreContrib.Email.SendGrid/OrchardCoreContrib.Email.SendGrid.csproj b/src/OrchardCoreContrib.Email.SendGrid/OrchardCoreContrib.Email.SendGrid.csproj index 9172ca76..c818832b 100644 --- a/src/OrchardCoreContrib.Email.SendGrid/OrchardCoreContrib.Email.SendGrid.csproj +++ b/src/OrchardCoreContrib.Email.SendGrid/OrchardCoreContrib.Email.SendGrid.csproj @@ -35,9 +35,12 @@ - - - + + + + + + diff --git a/src/OrchardCoreContrib.Email.Yahoo/OrchardCoreContrib.Email.Yahoo.csproj b/src/OrchardCoreContrib.Email.Yahoo/OrchardCoreContrib.Email.Yahoo.csproj index 3b122b8a..7bd084a5 100644 --- a/src/OrchardCoreContrib.Email.Yahoo/OrchardCoreContrib.Email.Yahoo.csproj +++ b/src/OrchardCoreContrib.Email.Yahoo/OrchardCoreContrib.Email.Yahoo.csproj @@ -33,10 +33,13 @@ - - - + + + + + + diff --git a/src/OrchardCoreContrib.Garnet/GarnetClientFactory.cs b/src/OrchardCoreContrib.Garnet/GarnetClientFactory.cs index d7e5b556..8682f9d6 100644 --- 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 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 index 24fd824a..da8e12a0 100644 --- a/src/OrchardCoreContrib.Garnet/OrchardCoreContrib.Garnet.csproj +++ b/src/OrchardCoreContrib.Garnet/OrchardCoreContrib.Garnet.csproj @@ -22,13 +22,16 @@ - - - - + + + + + + + diff --git a/src/OrchardCoreContrib.Gdpr/OrchardCoreContrib.Gdpr.csproj b/src/OrchardCoreContrib.Gdpr/OrchardCoreContrib.Gdpr.csproj index a759f801..45aeedf2 100644 --- a/src/OrchardCoreContrib.Gdpr/OrchardCoreContrib.Gdpr.csproj +++ b/src/OrchardCoreContrib.Gdpr/OrchardCoreContrib.Gdpr.csproj @@ -31,10 +31,13 @@ - - - + + + + + + diff --git a/src/OrchardCoreContrib.GoogleMaps/OrchardCoreContrib.GoogleMaps.csproj b/src/OrchardCoreContrib.GoogleMaps/OrchardCoreContrib.GoogleMaps.csproj index bebfa2ef..018b61a3 100644 --- a/src/OrchardCoreContrib.GoogleMaps/OrchardCoreContrib.GoogleMaps.csproj +++ b/src/OrchardCoreContrib.GoogleMaps/OrchardCoreContrib.GoogleMaps.csproj @@ -32,12 +32,15 @@ - - - + + + + + + diff --git a/src/OrchardCoreContrib.Gravatar/OrchardCoreContrib.Gravatar.csproj b/src/OrchardCoreContrib.Gravatar/OrchardCoreContrib.Gravatar.csproj index a68dbea7..5a52efec 100644 --- a/src/OrchardCoreContrib.Gravatar/OrchardCoreContrib.Gravatar.csproj +++ b/src/OrchardCoreContrib.Gravatar/OrchardCoreContrib.Gravatar.csproj @@ -33,7 +33,10 @@ - + + + + diff --git a/src/OrchardCoreContrib.HealthChecks/OrchardCoreContrib.HealthChecks.csproj b/src/OrchardCoreContrib.HealthChecks/OrchardCoreContrib.HealthChecks.csproj index dd3abbf4..78e7d345 100644 --- a/src/OrchardCoreContrib.HealthChecks/OrchardCoreContrib.HealthChecks.csproj +++ b/src/OrchardCoreContrib.HealthChecks/OrchardCoreContrib.HealthChecks.csproj @@ -32,8 +32,11 @@ - - + + + + + diff --git a/src/OrchardCoreContrib.Html/OrchardCoreContrib.Html.csproj b/src/OrchardCoreContrib.Html/OrchardCoreContrib.Html.csproj index 6f803a17..f3ca86bd 100644 --- a/src/OrchardCoreContrib.Html/OrchardCoreContrib.Html.csproj +++ b/src/OrchardCoreContrib.Html/OrchardCoreContrib.Html.csproj @@ -33,7 +33,10 @@ - + + + + diff --git a/src/OrchardCoreContrib.Liquid/OrchardCoreContrib.Liquid.csproj b/src/OrchardCoreContrib.Liquid/OrchardCoreContrib.Liquid.csproj index b0e6b4f0..db496c89 100644 --- a/src/OrchardCoreContrib.Liquid/OrchardCoreContrib.Liquid.csproj +++ b/src/OrchardCoreContrib.Liquid/OrchardCoreContrib.Liquid.csproj @@ -1,4 +1,4 @@ - + 1.3.0 @@ -30,7 +30,10 @@ - + + + + diff --git a/src/OrchardCoreContrib.Modules.Web/OrchardCoreContrib.Modules.Web.csproj b/src/OrchardCoreContrib.Modules.Web/OrchardCoreContrib.Modules.Web.csproj index 1e5928a4..3f4206f4 100644 --- a/src/OrchardCoreContrib.Modules.Web/OrchardCoreContrib.Modules.Web.csproj +++ b/src/OrchardCoreContrib.Modules.Web/OrchardCoreContrib.Modules.Web.csproj @@ -1,7 +1,6 @@  - @@ -33,4 +32,8 @@ + + + + diff --git a/src/OrchardCoreContrib.ReverseProxy.Yarp/OrchardCoreContrib.ReverseProxy.Yarp.csproj b/src/OrchardCoreContrib.ReverseProxy.Yarp/OrchardCoreContrib.ReverseProxy.Yarp.csproj index 3c2559b4..e62856b0 100644 --- a/src/OrchardCoreContrib.ReverseProxy.Yarp/OrchardCoreContrib.ReverseProxy.Yarp.csproj +++ b/src/OrchardCoreContrib.ReverseProxy.Yarp/OrchardCoreContrib.ReverseProxy.Yarp.csproj @@ -30,8 +30,11 @@ - + + + + diff --git a/src/OrchardCoreContrib.Sms.Azure/OrchardCoreContrib.Sms.Azure.csproj b/src/OrchardCoreContrib.Sms.Azure/OrchardCoreContrib.Sms.Azure.csproj index 64ceb14c..fb18942a 100644 --- a/src/OrchardCoreContrib.Sms.Azure/OrchardCoreContrib.Sms.Azure.csproj +++ b/src/OrchardCoreContrib.Sms.Azure/OrchardCoreContrib.Sms.Azure.csproj @@ -32,9 +32,12 @@ - - - + + + + + + diff --git a/src/OrchardCoreContrib.System/OrchardCoreContrib.System.csproj b/src/OrchardCoreContrib.System/OrchardCoreContrib.System.csproj index 093185bc..d71ecd17 100644 --- a/src/OrchardCoreContrib.System/OrchardCoreContrib.System.csproj +++ b/src/OrchardCoreContrib.System/OrchardCoreContrib.System.csproj @@ -34,10 +34,13 @@ - - - + + + + + + diff --git a/src/OrchardCoreContrib.Tenants/OrchardCoreContrib.Tenants.csproj b/src/OrchardCoreContrib.Tenants/OrchardCoreContrib.Tenants.csproj index b3accf3d..5f71f0fa 100644 --- a/src/OrchardCoreContrib.Tenants/OrchardCoreContrib.Tenants.csproj +++ b/src/OrchardCoreContrib.Tenants/OrchardCoreContrib.Tenants.csproj @@ -29,8 +29,11 @@ - - + + + + + diff --git a/src/OrchardCoreContrib.Users/OrchardCoreContrib.Users.csproj b/src/OrchardCoreContrib.Users/OrchardCoreContrib.Users.csproj index 50e230a1..f21bc280 100644 --- a/src/OrchardCoreContrib.Users/OrchardCoreContrib.Users.csproj +++ b/src/OrchardCoreContrib.Users/OrchardCoreContrib.Users.csproj @@ -32,8 +32,11 @@ - - + + + + + diff --git a/src/OrchardCoreContrib.ViewCount/OrchardCoreContrib.ViewCount.csproj b/src/OrchardCoreContrib.ViewCount/OrchardCoreContrib.ViewCount.csproj index f0967cb3..b84367a9 100644 --- a/src/OrchardCoreContrib.ViewCount/OrchardCoreContrib.ViewCount.csproj +++ b/src/OrchardCoreContrib.ViewCount/OrchardCoreContrib.ViewCount.csproj @@ -33,8 +33,11 @@ - - + + + + +