Skip to content
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

OSOE-751: Upgrade to Orchard Core 1.8 #57

Merged
merged 13 commits into from
Feb 21, 2024
Merged

OSOE-751: Upgrade to Orchard Core 1.8 #57

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
10857d0
Upgrading to .NET 8 and OC 1.8.2
Psichorex Jan 18, 2024
73f96cc
Addressing warnings.
Psichorex Jan 19, 2024
523249b
Addressing warnings.
Psichorex Jan 20, 2024
2576a4e
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Jan 30, 2024
929466f
Revert "Addressing warnings."
Psichorex Jan 30, 2024
00fb9f5
Adding form-label.
Psichorex Feb 1, 2024
54b9865
Merge remote-tracking branch 'origin/dev' into issue/OSOE-751
Psichorex Feb 5, 2024
4791317
Using issue branch reference.
Psichorex Feb 16, 2024
9756396
Using alpha.
Psichorex Feb 17, 2024
1d32858
Using alphas.
Psichorex Feb 18, 2024
8e187aa
Updating UITT alpha.
Psichorex Feb 20, 2024
717ae2a
Using new UITT alpha.
Psichorex Feb 21, 2024
18e19f6
Reverting to dev reference.
Psichorex Feb 21, 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 .github/workflows/publish-nuget.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ on:

jobs:
publish-nuget:
uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@dev
uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@issue/OSOE-751
secrets:
API_KEY: ${{ secrets.DEFAULT_NUGET_PUBLISH_API_KEY }}
4 changes: 2 additions & 2 deletions Lombiq.JsonEditor.Test.UI/Lombiq.JsonEditor.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="8.1.0-alpha.1.osoe-638" />
<PackageReference Include="Lombiq.Tests.UI" Version="8.2.1-alpha.20.osoe-751" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Lombiq.JsonEditor/Controllers/AdminController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using AngleSharp.Common;
using AngleSharp.Common;
using Lombiq.HelpfulLibraries.OrchardCore.Contents;
using Lombiq.HelpfulLibraries.OrchardCore.DependencyInjection;
using Lombiq.HelpfulLibraries.OrchardCore.Mvc;
Expand Down Expand Up @@ -77,7 +77,7 @@ await _contentManager.GetAsync(contentItemId, VersionOptions.Latest) is not { }
});
await _layoutAccessor.AddShapeToZoneAsync("Title", titleShape);

var definition = _contentDefinitionManager.GetTypeDefinition(contentItem.ContentType);
var definition = await _contentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType);
return View(new EditContentItemViewModel(contentItem, definition, JsonConvert.SerializeObject(contentItem)));
}

Expand Down
18 changes: 9 additions & 9 deletions Lombiq.JsonEditor/Lombiq.JsonEditor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Condition="'$(NuGetBuild)' != 'true'" Project="..\..\..\Utilities\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions.props" />

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<DefaultItemExcludes>$(DefaultItemExcludes);.git*;node_modules\**;Tests\**</DefaultItemExcludes>
</PropertyGroup>
Expand Down Expand Up @@ -36,12 +36,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="1.7.0" />
<PackageReference Include="OrchardCore.Contents" Version="1.7.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.7.0" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.7.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.7.0" />
<PackageReference Include="OrchardCore.ContentFields" Version="1.7.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.Contents" Version="1.8.2" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.8.2" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
<PackageReference Include="OrchardCore.ContentFields" Version="1.8.2" />
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' != 'true'">
Expand All @@ -50,8 +50,8 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="8.0.3-alpha.0.lmbq-249" />
<PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.3.2" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="8.1.1-alpha.7.osoe-751" />
<PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.3.3-alpha.0.osoe-751" />
</ItemGroup>

<Import Condition="'$(NuGetBuild)' != 'true'" Project="..\..\..\Utilities\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions.targets" />
Expand Down
12 changes: 6 additions & 6 deletions Lombiq.JsonEditor/Manifest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@
Name = "Lombiq JSON Editor",
Category = "Content",
Description = "Module for displaying a JSON Editor like on jsoneditoronline.org.",
Dependencies = new[]
{
Dependencies =
[
"OrchardCore.Contents",
"OrchardCore.ResourceManagement",
}
]
)]

[assembly: Feature(
Id = ContentEditor,
Name = "Lombiq JSON Content Editor",
Category = "Content",
Description = "Adds an actions menu item to the content item list for editing them as JSON.",
Dependencies = new[]
{
Dependencies =
[
Default,
}
]
)]
2 changes: 1 addition & 1 deletion Lombiq.JsonEditor/Views/JsonField.Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}

<div class="form-group">
<label>@Model.PartFieldDefinition.DisplayName()</label>
<label class="form-label">@Model.PartFieldDefinition.DisplayName()</label>
<json-editor
json="@Model.Value"
options="@options"
Expand Down
Loading