Skip to content

Commit

Permalink
Update OCC packages
Browse files Browse the repository at this point in the history
  • Loading branch information
@hishamco
hishamco committed Nov 22, 2024
1 parent 39e3a4a commit eb6cc9e
Show file tree
Hide file tree
Showing 34 changed files with 205 additions and 219 deletions.
120 changes: 60 additions & 60 deletions Directory.Packages.props
View file
Original file line number Diff line number Diff line change
@@ -1,62 +1,62 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Azure.Communication.Sms" Version="1.0.1" />
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.Elm" Version="0.2.2" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
<PackageVersion Include="Moq" Version="4.20.70" />
<PackageVersion Include="NuGet.Protocol" Version="6.9.1" />
<PackageVersion Include="OrchardCore" Version="1.8.2" />
<PackageVersion Include="OrchardCore.Admin" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Admin.Abstractions" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Application.Cms.Targets" Version="1.8.3" />
<PackageVersion Include="OrchardCore.ContentLocalization" Version="1.8.3" />
<PackageVersion Include="OrchardCore.ContentManagement" Version="1.8.3" />
<PackageVersion Include="OrchardCore.ContentManagement.Abstractions" Version="1.8.3" />
<PackageVersion Include="OrchardCore.ContentTypes" Version="1.8.3" />
<PackageVersion Include="OrchardCore.ContentTypes.Abstractions" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Contents.TagHelpers" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Data.Abstractions" Version="1.8.3" />
<PackageVersion Include="OrchardCore.DisplayManagement" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Email.Abstractions" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Email.Core" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Email.Smtp" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Html" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Infrastructure.Abstractions" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Liquid.Abstractions" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Module.Targets" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Navigation.Core" Version="1.8.3" />
<PackageVersion Include="OrchardCore.ResourceManagement" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Theme.Targets" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Themes" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Users" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Users.Abstractions" Version="1.8.3" />
<PackageVersion Include="OrchardCoreContrib.Abstractions" Version="1.3.1" />
<PackageVersion Include="OrchardCoreContrib.ContentLocalization.Core" Version="1.0.1" />
<PackageVersion Include="OrchardCoreContrib.Data" Version="1.1.1" />
<PackageVersion Include="OrchardCoreContrib.Data.YesSql" Version="1.1.2" />
<PackageVersion Include="OrchardCoreContrib.Email" Version="1.5.1" />
<PackageVersion Include="OrchardCoreContrib.Garnet.Abstractions" Version="1.0.0" />
<PackageVersion Include="OrchardCoreContrib.HealthChecks.Abstractions" Version="1.2.1" />
<PackageVersion Include="OrchardCoreContrib.Infrastructure" Version="1.0.2" />
<PackageVersion Include="OrchardCoreContrib.Infrastructure.Abstractions" Version="2.3.1" />
<PackageVersion Include="OrchardCoreContrib.Localization" Version="1.3.1" />
<PackageVersion Include="OrchardCoreContrib.Localization.Abstractions" Version="1.3.1" />
<PackageVersion Include="OrchardCoreContrib.Navigation.Core" Version="1.3.1" />
<PackageVersion Include="OrchardCoreContrib.Sms.Abstractions" Version="1.3.1" />
<PackageVersion Include="OrchardCoreContrib.OpenApi.Abstractions" Version="1.3.1" />
<PackageVersion Include="SendGrid" Version="9.29.3" />
<PackageVersion Include="SixLabors.ImageSharp.Drawing" Version="2.0.0" />
<PackageVersion Include="StackExchange.Redis" Version="2.7.33" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0" />
<PackageVersion Include="Swashbuckle.AspNetCore.Swagger" Version="6.9.0" />
<PackageVersion Include="Testcontainers.Redis" Version="3.8.0" />
<PackageVersion Include="xunit" Version="2.5.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" />
<PackageVersion Include="Yarp.ReverseProxy" Version="2.1.0" />
</ItemGroup>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Azure.Communication.Sms" Version="1.1.0-beta.1" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.Elm" Version="0.2.2" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="NuGet.Protocol" Version="6.12.1" />
<PackageVersion Include="OrchardCore" Version="1.8.2" />
<PackageVersion Include="OrchardCore.Admin" Version="2.0.0" />
<PackageVersion Include="OrchardCore.Admin.Abstractions" Version="2.0.0" />
<PackageVersion Include="OrchardCore.Application.Cms.Targets" Version="2.0.0" />
<PackageVersion Include="OrchardCore.ContentLocalization" Version="2.0.0" />
<PackageVersion Include="OrchardCore.ContentManagement" Version="2.0.0" />
<PackageVersion Include="OrchardCore.ContentManagement.Abstractions" Version="2.0.0" />
<PackageVersion Include="OrchardCore.ContentTypes" Version="2.0.0" />
<PackageVersion Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0" />
<PackageVersion Include="OrchardCore.Contents.TagHelpers" Version="2.0.0" />
<PackageVersion Include="OrchardCore.Data.Abstractions" Version="2.0.0" />
<PackageVersion Include="OrchardCore.DisplayManagement" Version="2.0.0" />
<PackageVersion Include="OrchardCore.Email.Abstractions" Version="2.0.0" />
<PackageVersion Include="OrchardCore.Email.Core" Version="2.0.0" />
<PackageVersion Include="OrchardCore.Email.Smtp" Version="2.0.0" />
<PackageVersion Include="OrchardCore.Html" Version="2.0.0" />
<PackageVersion Include="OrchardCore.Infrastructure.Abstractions" Version="2.0.0" />
<PackageVersion Include="OrchardCore.Liquid.Abstractions" Version="2.0.0" />
<PackageVersion Include="OrchardCore.Module.Targets" Version="2.0.0" />
<PackageVersion Include="OrchardCore.Navigation.Core" Version="2.0.0" />
<PackageVersion Include="OrchardCore.ResourceManagement" Version="2.0.0" />
<PackageVersion Include="OrchardCore.Theme.Targets" Version="2.0.0" />
<PackageVersion Include="OrchardCore.Themes" Version="2.0.0" />
<PackageVersion Include="OrchardCore.Users" Version="2.0.0" />
<PackageVersion Include="OrchardCore.Users.Abstractions" Version="2.0.0" />
<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.4" />
<PackageVersion Include="StackExchange.Redis" Version="2.8.16" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="7.0.0" />
<PackageVersion Include="Swashbuckle.AspNetCore.Swagger" Version="7.0.0" />
<PackageVersion Include="Testcontainers.Redis" Version="4.1.0-beta.11746011829" />
<PackageVersion Include="xunit" Version="2.9.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0-pre.49" />
<PackageVersion Include="Yarp.ReverseProxy" Version="2.2.0" />
</ItemGroup>
</Project>
3 changes: 2 additions & 1 deletion src/OrchardCoreContrib.ContentLocalization/AdminMenu.cs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
using Microsoft.Extensions.Localization;
using OrchardCore.Modules;
using OrchardCore.Navigation;
using OrchardCoreContrib.Navigation;

namespace OrchardCoreContrib.ContentLocalization
{
using OrchardCoreContrib.Navigation;

[Feature("OrchardCoreContrib.ContentLocalization.LocalizationMatrix")]
public class AdminMenu : AdminNavigationProvider
{
Expand Down
2 changes: 2 additions & 0 deletions src/OrchardCoreContrib.DataLocalization/AdminMenu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

namespace OrchardCore.DataLocalization
{
using OrchardCoreContrib.Navigation;

/// <summary>
/// Represents a localization menu in the admin site.
/// </summary>
Expand Down
6 changes: 5 additions & 1 deletion src/OrchardCoreContrib.DataLocalization/Services/ContentFieldResourceStringProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@ public async Task<IEnumerable<CultureDictionaryRecordKey>> GetAllResourceStrings

return contentTypes
.SelectMany(t => t.TypeDefinition.Parts.SelectMany(p => p.PartDefinition.Fields.Select(f => new { ContentType = t.Name, ContentField = f.GetSettings<ContentPartFieldSettings>().DisplayName })))
.Select(t => new CultureDictionaryRecordKey(t.ContentField, $"{t.ContentType}-{Context}"));
.Select(t => new CultureDictionaryRecordKey
{
MessageId = t.ContentField,
Context = $"{t.ContentType}-{Context}"
});
}
}
}
6 changes: 5 additions & 1 deletion src/OrchardCoreContrib.DataLocalization/Services/ContentTypeResourceStringProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ public async Task<IEnumerable<CultureDictionaryRecordKey>> GetAllResourceStrings
{
var contentTypes = await _contentDefinitionService.GetTypesAsync();

return contentTypes.Select(t => new CultureDictionaryRecordKey(t.DisplayName, Context));
return contentTypes.Select(t => new CultureDictionaryRecordKey
{
MessageId = t.DisplayName,
Context = Context
});
}
}
}
2 changes: 2 additions & 0 deletions src/OrchardCoreContrib.Email.Gmail/AdminMenu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

namespace OrchardCoreContrib.Email.Gmail
{
using OrchardCoreContrib.Navigation;

/// <summary>
/// Represents an admin menu for Gmaail mailing module.
/// </summary>
Expand Down
6 changes: 3 additions & 3 deletions src/OrchardCoreContrib.Email.Gmail/Drivers/GmailSettingsDisplayDriver.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public GmailSettingsDisplayDriver(
}

/// <inheritdoc/>
public override async Task<IDisplayResult> EditAsync(GmailSettings section, BuildEditorContext context)
public override async Task<IDisplayResult> EditAsync(ISite model, GmailSettings section, BuildEditorContext context)
{
var user = _httpContextAccessor.HttpContext?.User;

Expand Down Expand Up @@ -84,7 +84,7 @@ public override async Task<IDisplayResult> EditAsync(GmailSettings section, Buil
}

/// <inheritdoc/>
public override async Task<IDisplayResult> UpdateAsync(GmailSettings section, BuildEditorContext context)
public override async Task<IDisplayResult> UpdateAsync(ISite model, GmailSettings section, UpdateEditorContext context)
{
var user = _httpContextAccessor.HttpContext?.User;

Expand All @@ -111,7 +111,7 @@ public override async Task<IDisplayResult> UpdateAsync(GmailSettings section, Bu
await _shellHost.ReleaseShellContextAsync(_shellSettings);
}

return await EditAsync(section, context);
return await EditAsync(model, section, context);
}
}
}
2 changes: 2 additions & 0 deletions src/OrchardCoreContrib.Email.Hotmail/AdminMenu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

namespace OrchardCoreContrib.Email.Hotmail
{
using OrchardCoreContrib.Navigation;

/// <summary>
/// Represents an admin menu for Hotmail mailing module.
/// </summary>
Expand Down
6 changes: 3 additions & 3 deletions src/OrchardCoreContrib.Email.Hotmail/Drivers/HotmailSettingsDisplayDriver.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public HotmailSettingsDisplayDriver(
}

/// <inheritdoc/>
public override async Task<IDisplayResult> EditAsync(HotmailSettings section, BuildEditorContext context)
public override async Task<IDisplayResult> EditAsync(ISite model, HotmailSettings section, BuildEditorContext context)
{
var user = _httpContextAccessor.HttpContext?.User;

Expand Down Expand Up @@ -84,7 +84,7 @@ public override async Task<IDisplayResult> EditAsync(HotmailSettings section, Bu
}

/// <inheritdoc/>
public override async Task<IDisplayResult> UpdateAsync(HotmailSettings section, BuildEditorContext context)
public override async Task<IDisplayResult> UpdateAsync(ISite model, HotmailSettings section, UpdateEditorContext context)
{
var user = _httpContextAccessor.HttpContext?.User;

Expand All @@ -111,7 +111,7 @@ public override async Task<IDisplayResult> UpdateAsync(HotmailSettings section,
await _shellHost.ReleaseShellContextAsync(_shellSettings);
}

return await EditAsync(section, context);
return await EditAsync(model, section, context);
}
}
}
2 changes: 2 additions & 0 deletions src/OrchardCoreContrib.Email.SendGrid/AdminMenu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

namespace OrchardCoreContrib.Email.SendGrid
{
using OrchardCoreContrib.Navigation;

/// <summary>
/// Represents an admin menu for SendGrid mailing module.
/// </summary>
Expand Down
6 changes: 3 additions & 3 deletions src/OrchardCoreContrib.Email.SendGrid/Drivers/SendGridSettingsDisplayDriver.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public SendGridSettingsDisplayDriver(
}

/// <inheritdoc/>
public override async Task<IDisplayResult> EditAsync(SendGridSettings section, BuildEditorContext context)
public override async Task<IDisplayResult> EditAsync(ISite model, SendGridSettings section, BuildEditorContext context)
{
var user = _httpContextAccessor.HttpContext?.User;

Expand All @@ -75,7 +75,7 @@ public override async Task<IDisplayResult> EditAsync(SendGridSettings section, B
}

/// <inheritdoc/>
public override async Task<IDisplayResult> UpdateAsync(SendGridSettings section, BuildEditorContext context)
public override async Task<IDisplayResult> UpdateAsync(ISite model, SendGridSettings section, UpdateEditorContext context)
{
var user = _httpContextAccessor.HttpContext?.User;

Expand All @@ -102,7 +102,7 @@ public override async Task<IDisplayResult> UpdateAsync(SendGridSettings section,
await _shellHost.ReleaseShellContextAsync(_shellSettings);
}

return await EditAsync(section, context);
return await EditAsync(model, section, context);
}
}
}
2 changes: 2 additions & 0 deletions src/OrchardCoreContrib.Email.Yahoo/AdminMenu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

namespace OrchardCoreContrib.Email.Yahoo
{
using OrchardCoreContrib.Navigation;

/// <summary>
/// Represents an admin menu for Yahoo mailing module.
/// </summary>
Expand Down
6 changes: 3 additions & 3 deletions src/OrchardCoreContrib.Email.Yahoo/Drivers/YahooSettingsDisplayDriver.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public YahooSettingsDisplayDriver(
}

/// <inheritdoc/>
public override async Task<IDisplayResult> EditAsync(YahooSettings section, BuildEditorContext context)
public override async Task<IDisplayResult> EditAsync(ISite model, YahooSettings section, BuildEditorContext context)
{
var user = _httpContextAccessor.HttpContext?.User;

Expand Down Expand Up @@ -84,7 +84,7 @@ public override async Task<IDisplayResult> EditAsync(YahooSettings section, Buil
}

/// <inheritdoc/>
public override async Task<IDisplayResult> UpdateAsync(YahooSettings section, BuildEditorContext context)
public override async Task<IDisplayResult> UpdateAsync(ISite model, YahooSettings section, UpdateEditorContext context)
{
var user = _httpContextAccessor.HttpContext?.User;

Expand All @@ -111,7 +111,7 @@ public override async Task<IDisplayResult> UpdateAsync(YahooSettings section, Bu
await _shellHost.ReleaseShellContextAsync(_shellSettings);
}

return await EditAsync(section, context);
return await EditAsync(model, section, context);
}
}
}
13 changes: 4 additions & 9 deletions src/OrchardCoreContrib.Gdpr/AdminMenu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@

namespace OrchardCoreContrib.Gdpr
{
using OrchardCoreContrib.Navigation;

/// <summary>
/// Represents an admin menu for GDPR module.
/// </summary>
public class AdminMenu : INavigationProvider
public class AdminMenu : AdminNavigationProvider
{
private readonly IStringLocalizer S;

Expand All @@ -23,13 +25,8 @@ public AdminMenu(IStringLocalizer<AdminMenu> stringLocalizer)
}

/// <inheritdoc/>
public Task BuildNavigationAsync(string name, NavigationBuilder builder)
public override void BuildNavigation(NavigationBuilder builder)
{
if (!string.Equals(name, "admin", StringComparison.OrdinalIgnoreCase))
{
return Task.CompletedTask;
}

builder
.Add(S["Configuration"], configuration => configuration
.Add(S["Settings"], settings => settings
Expand All @@ -39,8 +36,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
.Permission(Permissions.ManageGdprSettings)
.LocalNav()
)));

return Task.CompletedTask;
}
}
}
7 changes: 4 additions & 3 deletions src/OrchardCoreContrib.Gdpr/Drivers/GdprSettingsDisplayDriver.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ public GdprSettingsDisplayDriver(
}

/// <inheritdoc/>
public override async Task<IDisplayResult> EditAsync(GdprSettings section, BuildEditorContext context)

public override async Task<IDisplayResult> EditAsync(ISite model, GdprSettings section, BuildEditorContext context)
{
var user = _httpContextAccessor.HttpContext?.User;

Expand All @@ -69,7 +70,7 @@ public override async Task<IDisplayResult> EditAsync(GdprSettings section, Build
}

/// <inheritdoc/>
public override async Task<IDisplayResult> UpdateAsync(GdprSettings section, BuildEditorContext context)
public override async Task<IDisplayResult> UpdateAsync(ISite model, GdprSettings section, UpdateEditorContext context)
{
var user = _httpContextAccessor.HttpContext?.User;

Expand All @@ -84,7 +85,7 @@ public override async Task<IDisplayResult> UpdateAsync(GdprSettings section, Bui
await _shellHost.ReleaseShellContextAsync(_shellSettings);
}

return await EditAsync(section, context);
return await EditAsync(model, section, context);
}
}
}
2 changes: 1 addition & 1 deletion src/OrchardCoreContrib.Gdpr/OrchardCoreContrib.Gdpr.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<PackageReference Include="OrchardCore.DisplayManagement" />
<PackageReference Include="OrchardCore.Infrastructure.Abstractions" />
<PackageReference Include="OrchardCore.Module.Targets" />
<PackageReference Include="OrchardCore.Navigation.Core" />
<PackageReference Include="OrchardCoreContrib.Abstractions" />
<PackageReference Include="OrchardCoreContrib.Navigation.Core" />
</ItemGroup>

</Project>
Loading

0 comments on commit eb6cc9e

Please sign in to comment.