Skip to content

Upgrade OC 1.8.3 #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 26, 2024
Merged

Upgrade OC 1.8.3 #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33fae02
Fix obsolete methods
hishamco Apr 25, 2024
93c898a
Update OC 1.8.3
hishamco Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/OrchardCoreContrib.Apis.Swagger/OrchardCoreContrib.Apis.Swagger.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.Abstractions" Version="1.3.0" />
<PackageReference Include="OrchardCoreContrib.OpenApi.Abstractions" Version="1.2.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
Expand Down
6 changes: 3 additions & 3 deletions src/OrchardCoreContrib.ContentLocalization/OrchardCoreContrib.ContentLocalization.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Contents.TagHelpers" Version="1.8.2" />
<PackageReference Include="OrchardCore.ContentLocalization" Version="1.8.2" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.Contents.TagHelpers" Version="1.8.3" />
<PackageReference Include="OrchardCore.ContentLocalization" Version="1.8.3" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.Abstractions" Version="1.3.0" />
<PackageReference Include="OrchardCoreContrib.ContentLocalization.Core" Version="1.0.0" />
<PackageReference Include="OrchardCoreContrib.Navigation.Core" Version="1.3.0" />
Expand Down
10 changes: 5 additions & 5 deletions src/OrchardCoreContrib.ContentPreview/OrchardCoreContrib.ContentPreview.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="1.8.2" />
<PackageReference Include="OrchardCore.Users.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.8.3" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.3" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.3" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="1.8.3" />
<PackageReference Include="OrchardCore.Users.Abstractions" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.Abstractions" Version="1.3.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCoreContrib.DataLocalization/Controllers/AdminController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public async Task<ActionResult> ManageContentFieldResources([FromQuery] string s

var viewModel = new ContentFieldResourcesViewModel
{
ContentTypes = _contentDefinitionService.GetTypes().Select(t => t.Name),
ContentTypes = (await _contentDefinitionService.GetTypesAsync()).Select(t => t.Name),
ResourcesNames = resourcesNames,
Translations = Enumerable.Empty<Translation>(),
SelectedContentType = contentType,
Expand Down
6 changes: 3 additions & 3 deletions src/OrchardCoreContrib.DataLocalization/OrchardCoreContrib.DataLocalization.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.3" />
<PackageReference Include="OrchardCore" Version="1.8.2" />
<PackageReference Include="OrchardCore.ContentTypes" Version="1.8.2" />
<PackageReference Include="OrchardCore.Data.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.ContentTypes" Version="1.8.3" />
<PackageReference Include="OrchardCore.Data.Abstractions" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.Abstractions" Version="1.3.0" />
<PackageReference Include="OrchardCoreContrib.Localization.Abstractions" Version="1.3.0" />
<PackageReference Include="OrchardCoreContrib.Localization" Version="1.3.0" />
Expand Down
11 changes: 7 additions & 4 deletions src/OrchardCoreContrib.DataLocalization/Services/ContentFieldResourceStringProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@ public ContentFieldResourceStringProvider(IContentDefinitionService contentDefin

/// <inheritdoc/>
public IEnumerable<CultureDictionaryRecordKey> GetAllResourceStrings()
=> _contentDefinitionService.GetTypes()
.SelectMany(t => t.TypeDefinition.Parts
.SelectMany(p => p.PartDefinition.Fields
.Select(f => new { ContentType = t.Name, ContentField = f.GetSettings<ContentPartFieldSettings>().DisplayName })))
{
// Change once https://github.com/OrchardCoreContrib/OrchardCoreContrib/issues/12 fixed
var contentTypes = _contentDefinitionService.GetTypesAsync().GetAwaiter().GetResult();

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}"));
}
}
}
8 changes: 6 additions & 2 deletions src/OrchardCoreContrib.DataLocalization/Services/ContentTypeResourceStringProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ public ContentTypeResourceStringProvider(IContentDefinitionService contentDefini

/// <inheritdoc/>
public IEnumerable<CultureDictionaryRecordKey> GetAllResourceStrings()
=> _contentDefinitionService.GetTypes()
.Select(t => new CultureDictionaryRecordKey(t.DisplayName, Context));
{
// Change once https://github.com/OrchardCoreContrib/OrchardCoreContrib/issues/12 fixed
var contentTypes = _contentDefinitionService.GetTypesAsync().GetAwaiter().GetResult();

return contentTypes.Select(t => new CultureDictionaryRecordKey(t.DisplayName, Context));
}
}
}
2 changes: 1 addition & 1 deletion src/OrchardCoreContrib.Diagnostics.Elm/OrchardCoreContrib.Diagnostics.Elm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.Elm" Version="0.2.2" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.Abstractions" Version="1.3.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCoreContrib.Email.Gmail/Controllers/AdminController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public async Task<IActionResult> IndexPost(GmailSettingsViewModel model)
}
else
{
_notifier.Success(H["Message sent successfully"]);
await _notifier.SuccessAsync(H["Message sent successfully"]);

return Redirect(Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = GmailSettingsDisplayDriver.GroupId }));
}
Expand Down
8 changes: 4 additions & 4 deletions src/OrchardCoreContrib.Email.Gmail/OrchardCoreContrib.Email.Gmail.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
<PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.8.3" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.3" />
<PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.8.3" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.Abstractions" Version="1.3.0" />
<PackageReference Include="OrchardCoreContrib.Email" Version="1.5.0" />
<PackageReference Include="OrchardCoreContrib.Navigation.Core" Version="1.3.0" />
Expand Down
8 changes: 4 additions & 4 deletions src/OrchardCoreContrib.Email.Hotmail/OrchardCoreContrib.Email.Hotmail.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
<PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.8.3" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.3" />
<PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.8.3" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.Abstractions" Version="1.3.0" />
<PackageReference Include="OrchardCoreContrib.Email" Version="1.5.0" />
<PackageReference Include="OrchardCoreContrib.Navigation.Core" Version="1.3.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCoreContrib.Email.SendGrid/Controllers/AdminController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public async Task<IActionResult> IndexPost(SendGridSettingsViewModel model)
}
else
{
_notifier.Success(H["Message sent successfully"]);
await _notifier.SuccessAsync(H["Message sent successfully"]);

return Redirect(Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = SendGridSettingsDisplayDriver.GroupId }));
}
Expand Down
10 changes: 5 additions & 5 deletions src/OrchardCoreContrib.Email.SendGrid/OrchardCoreContrib.Email.SendGrid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@

<ItemGroup>
<PackageReference Include="SendGrid" Version="9.29.3" />
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
<PackageReference Include="OrchardCore.Email.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.8.3" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.3" />
<PackageReference Include="OrchardCore.Email.Abstractions" Version="1.8.3" />
<PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.8.3" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.Abstractions" Version="1.3.0" />
<PackageReference Include="OrchardCoreContrib.HealthChecks.Abstractions" Version="1.2.0" />
<PackageReference Include="OrchardCoreContrib.Navigation.Core" Version="1.3.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCoreContrib.Email.SendGrid/Services/SendGridService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ private SendGridMessage FromMailMessage(MailMessage message)

sendGridMessage.Subject = message.Subject;

if (message.IsBodyHtml)
if (message.IsHtmlBody)
{
sendGridMessage.PlainTextContent = HtmlTagRegex.Replace(message.Body, String.Empty);
sendGridMessage.HtmlContent = message.Body;
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCoreContrib.Email.Yahoo/Controllers/AdminController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public async Task<IActionResult> IndexPost(YahooSettingsViewModel model)
}
else
{
_notifier.Success(H["Message sent successfully"]);
await _notifier.SuccessAsync(H["Message sent successfully"]);

return Redirect(Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = YahooSettingsDisplayDriver.GroupId }));
}
Expand Down
10 changes: 5 additions & 5 deletions src/OrchardCoreContrib.Email.Yahoo/OrchardCoreContrib.Email.Yahoo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
<PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.8.3" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.3" />
<PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.8.3" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.Abstractions" Version="1.3.0" />
<PackageReference Include="OrchardCoreContrib.Email" Version="1.5.0" />
<PackageReference Include="OrchardCore.Navigation.Core" Version="1.8.2" />
<PackageReference Include="OrchardCore.Navigation.Core" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.Navigation.Core" Version="1.3.0" />
</ItemGroup>

Expand Down
10 changes: 5 additions & 5 deletions src/OrchardCoreContrib.Gdpr/OrchardCoreContrib.Gdpr.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
<PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.Navigation.Core" Version="1.8.2" />
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.8.3" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.3" />
<PackageReference Include="OrchardCore.Infrastructure.Abstractions" Version="1.8.3" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.3" />
<PackageReference Include="OrchardCore.Navigation.Core" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.Abstractions" Version="1.3.0" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/OrchardCoreContrib.GoogleMaps/Migrations/0001_CreateGoogleMapPart.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ public CreateGoogleMapPart(IContentDefinitionManager contentDefinitionManager)

public override void Up()
{
_contentDefinitionManager.AlterPartDefinition("GoogleMapPart", builder => builder
_contentDefinitionManager.AlterPartDefinitionAsync("GoogleMapPart", builder => builder
.Attachable()
.WithDescription("Provides a Google Map that you can use for your content item."));
}

public override void Down()
{
_contentDefinitionManager.DeletePartDefinition("GoogleMapPart");
_contentDefinitionManager.DeletePartDefinitionAsync("GoogleMapPart").GetAwaiter().GetResult();
}
}
10 changes: 5 additions & 5 deletions src/OrchardCoreContrib.GoogleMaps/OrchardCoreContrib.GoogleMaps.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.ContentManagement" Version="1.8.2" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.8.3" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.Data" Version="1.1.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="1.8.2" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.3" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.3" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.Abstractions" Version="1.3.0" />
<PackageReference Include="OrchardCoreContrib.Navigation.Core" Version="1.3.0" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/OrchardCoreContrib.Gravatar/OrchardCoreContrib.Gravatar.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.Users" Version="1.8.2" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.3" />
<PackageReference Include="OrchardCore.Users" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.Abstractions" Version="1.3.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCoreContrib.HealthChecks/OrchardCoreContrib.HealthChecks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.Abstractions" Version="1.3.0" />
<PackageReference Include="OrchardCoreContrib.HealthChecks.Abstractions" Version="1.2.0" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/OrchardCoreContrib.Html/OrchardCoreContrib.Html.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.8.2" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
<PackageReference Include="OrchardCore.Html" Version="1.8.2" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.3" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.8.3" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.3" />
<PackageReference Include="OrchardCore.Html" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.Abstractions" Version="1.3.0" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/OrchardCoreContrib.Liquid/OrchardCoreContrib.Liquid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Liquid.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.Liquid.Abstractions" Version="1.8.3" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.Abstractions" Version="1.3.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCoreContrib.Modules.Web/OrchardCoreContrib.Modules.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<ItemGroup>
<PackageReference Include="OrchardCoreContrib.Data.YesSql" Version="1.1.1" />
<PackageReference Include="OrchardCore.Application.Cms.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.Application.Cms.Targets" Version="1.8.3" />
</ItemGroup>


Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCoreContrib.ReverseProxy.Yarp/OrchardCoreContrib.ReverseProxy.Yarp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.Abstractions" Version="1.3.0" />
<PackageReference Include="Yarp.ReverseProxy" Version="2.1.0" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/OrchardCoreContrib.Sms.Azure/OrchardCoreContrib.Sms.Azure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@

<ItemGroup>
<PackageReference Include="Azure.Communication.Sms" Version="1.0.1" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.3" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.Infrastructure" Version="1.0.1" />
<PackageReference Include="OrchardCoreContrib.Navigation.Core" Version="1.3.0" />
<PackageReference Include="OrchardCoreContrib.Sms.Abstractions" Version="1.3.0" />
Expand Down
10 changes: 5 additions & 5 deletions src/OrchardCoreContrib.System/OrchardCoreContrib.System.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@

<ItemGroup>
<PackageReference Include="NuGet.Protocol" Version="6.9.1" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.ContentManagement.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.3" />
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.8.3" />
<PackageReference Include="OrchardCore.ContentManagement.Abstractions" Version="1.8.3" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.HealthChecks.Abstractions" Version="1.2.0" />
<PackageReference Include="OrchardCore.Users.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.Users.Abstractions" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.Abstractions" Version="1.3.0" />
<PackageReference Include="OrchardCoreContrib.Navigation.Core" Version="1.3.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCoreContrib.System/Services/SystemInformation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class SystemInformation
public SystemInformation(IShellHost shellHost)
{
_executedAssembly = Assembly.GetEntryAssembly();
_defaultShellSettings = shellHost.GetSettings(ShellHelper.DefaultShellName);
_defaultShellSettings = shellHost.GetSettings(ShellSettings.DefaultShellName);
}

public string ApplicationName => _executedAssembly.GetName().Name;
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCoreContrib.System/Views/Admin/About.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<h4>@T["Tenants"]</h4>
<table class="table table-striped table-hover mt-4">
<tr>
<th>@ShellHelper.DefaultShellName</th>
<th>@ShellSettings.DefaultShellName</th>
<td class="w-75">@BaseUrl</td>
</tr>
@foreach (var tenant in Model.Tenants.Where(t => !t.IsDefaultShell()))
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCoreContrib.Tenants/OrchardCoreContrib.Tenants.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.3" />
<PackageReference Include="OrchardCoreContrib.Abstractions" Version="1.3.0" />
<PackageReference Include="OrchardCoreContrib.HealthChecks.Abstractions" Version="1.2.0" />
</ItemGroup>
Expand Down
Loading