Skip to content

Commit 79a9497

Browse files
authored
Merge pull request #7 from Lombiq/issue/NEST-487
NEST-487: Upgrade to Orchard Core 1.8
2 parents 91b6862 + b55756a commit 79a9497

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

ShowOrchard.Theme/Manifest.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
Version = "0.0.1",
99
Description = "ShowOrchard.Theme",
1010
BaseTheme = "Lombiq.BaseTheme",
11-
Dependencies = new[]
12-
{
11+
Dependencies =
12+
[
1313
FeatureNames.MediaThemeBridge,
14-
}
14+
]
1515
)]

ShowOrchard.Theme/Services/CategoryOrchardExportConverter.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public async Task UpdateContentItemsAsync(XDocument document, IList<ContentItem>
4747
}
4848

4949
importedTerms.RemoveAll(existingTerms.Contains);
50-
if (importedTerms.Any())
50+
if (importedTerms.Count != 0)
5151
{
5252
category.Alter<TaxonomyPart>(part => part.Terms.AddRange(importedTerms));
5353
contentItems.Add(category);

ShowOrchard.Theme/ShowOrchard.Theme.csproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
66
<DefaultItemExcludes>$(DefaultItemExcludes);.git*;node_modules\**</DefaultItemExcludes>
77
</PropertyGroup>
@@ -15,11 +15,11 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="OrchardCore.Theme.Targets" Version="1.7.0" />
19-
<PackageReference Include="OrchardCore.ContentManagement" Version="1.7.0" />
20-
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.7.0" />
21-
<PackageReference Include="OrchardCore.ResourceManagement" Version="1.7.0" />
22-
<PackageReference Include="OrchardCore.Taxonomies" Version="1.7.0" />
18+
<PackageReference Include="OrchardCore.Theme.Targets" Version="1.8.2" />
19+
<PackageReference Include="OrchardCore.ContentManagement" Version="1.8.2" />
20+
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
21+
<PackageReference Include="OrchardCore.ResourceManagement" Version="1.8.2" />
22+
<PackageReference Include="OrchardCore.Taxonomies" Version="1.8.2" />
2323
</ItemGroup>
2424

2525
<PropertyGroup>
@@ -41,11 +41,11 @@
4141
</ImportGroup>
4242

4343
<ItemGroup Condition="'$(NuGetBuild)' == 'true' or !Exists($(LombiqHelpfulExtensionsPath))">
44-
<PackageReference Include="Lombiq.HelpfulExtensions" Version="7.0.2" />
44+
<PackageReference Include="Lombiq.HelpfulExtensions" Version="8.0.0" />
4545
</ItemGroup>
4646

4747
<ItemGroup Condition="'$(NuGetBuild)' == 'true' or !Exists($(LombiqNodeJsExtensionsPath))">
48-
<PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.3.2" />
48+
<PackageReference Include="Lombiq.NodeJs.Extensions" Version="2.1.0" />
4949
</ItemGroup>
5050

5151
<PropertyGroup>
@@ -56,8 +56,8 @@
5656

5757
<ItemGroup>
5858
<ProjectReference Condition="Exists($(LombiqHostingMediaThemePath))" Include="$(LombiqHostingMediaThemePath)" />
59-
<PackageReference Condition="!Exists($(LombiqHostingMediaThemePath))" Include="Lombiq.Hosting.MediaTheme" Version="5.0.0" />
60-
<PackageReference Condition="!Exists($(LombiqHostingMediaThemeTargetsProps))" Include="Lombiq.Hosting.MediaTheme.Targets" Version="5.0.0" />
59+
<PackageReference Condition="!Exists($(LombiqHostingMediaThemePath))" Include="Lombiq.Hosting.MediaTheme" Version="6.0.0" />
60+
<PackageReference Condition="!Exists($(LombiqHostingMediaThemeTargetsProps))" Include="Lombiq.Hosting.MediaTheme.Targets" Version="6.0.0" />
6161
</ItemGroup>
6262

6363
<ItemGroup>

0 commit comments

Comments
 (0)