diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml
index fac826d..8e61048 100644
--- a/.github/workflows/publish-nuget.yml
+++ b/.github/workflows/publish-nuget.yml
@@ -8,6 +8,6 @@ on:
jobs:
publish-nuget:
name: Publish to NuGet
- uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@dev
+ uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@issue/OSOE-925
secrets:
API_KEY: ${{ secrets.DEFAULT_NUGET_PUBLISH_API_KEY }}
diff --git a/.github/workflows/validate-nuget-publish.yml b/.github/workflows/validate-nuget-publish.yml
index 9f8979c..f0fd6be 100644
--- a/.github/workflows/validate-nuget-publish.yml
+++ b/.github/workflows/validate-nuget-publish.yml
@@ -9,4 +9,4 @@ on:
jobs:
validate-nuget-publish:
name: Validate NuGet Publish
- uses: Lombiq/GitHub-Actions/.github/workflows/validate-nuget-publish.yml@dev
+ uses: Lombiq/GitHub-Actions/.github/workflows/validate-nuget-publish.yml@issue/OSOE-925
diff --git a/Lombiq.JsonEditor.Test.UI/CompatibilitySuppressions.xml b/Lombiq.JsonEditor.Test.UI/CompatibilitySuppressions.xml
new file mode 100644
index 0000000..8af156c
--- /dev/null
+++ b/Lombiq.JsonEditor.Test.UI/CompatibilitySuppressions.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ PKV006
+ net8.0
+
+
\ No newline at end of file
diff --git a/Lombiq.JsonEditor.Test.UI/Lombiq.JsonEditor.Tests.UI.csproj b/Lombiq.JsonEditor.Test.UI/Lombiq.JsonEditor.Tests.UI.csproj
index 4ab7ea9..6922e00 100644
--- a/Lombiq.JsonEditor.Test.UI/Lombiq.JsonEditor.Tests.UI.csproj
+++ b/Lombiq.JsonEditor.Test.UI/Lombiq.JsonEditor.Tests.UI.csproj
@@ -1,32 +1,20 @@
-
-
+
- net8.0
+ net10.0
+
+
+
Lombiq JSON Editor for Orchard Core - UI Test Extensions
- Lombiq Technologies
- Copyright © 2021, Lombiq Technologies Ltd.
- Lombiq JSON Editor for Orchard Core - UI Test Extensions: Extensions to aid in UI testing Lombiq JSON Editor for Orchard Core.
- NuGetIcon.png
+ 2021
+ Extensions to aid in UI testing Lombiq JSON Editor for Orchard Core.
OrchardCore;Lombiq;AspNetCore;JSONEditor
https://github.com/Lombiq/Orchard-JSON-Editor
https://github.com/Lombiq/Orchard-JSON-Editor/tree/dev/Lombiq.JSONEditor.Tests.UI
- BSD-3-Clause
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/Lombiq.JsonEditor.sln b/Lombiq.JsonEditor.sln
deleted file mode 100644
index 4e458c4..0000000
--- a/Lombiq.JsonEditor.sln
+++ /dev/null
@@ -1,31 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.6.33815.320
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lombiq.JsonEditor", "Lombiq.JsonEditor\Lombiq.JsonEditor.csproj", "{3EA5BC81-97A5-4513-9CAC-4DB01B439682}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lombiq.JsonEditor.Tests.UI", "Lombiq.JsonEditor.Test.UI\Lombiq.JsonEditor.Tests.UI.csproj", "{19F9AEDF-9D1A-44EC-BAEA-FF050CF7A684}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {3EA5BC81-97A5-4513-9CAC-4DB01B439682}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3EA5BC81-97A5-4513-9CAC-4DB01B439682}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3EA5BC81-97A5-4513-9CAC-4DB01B439682}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3EA5BC81-97A5-4513-9CAC-4DB01B439682}.Release|Any CPU.Build.0 = Release|Any CPU
- {19F9AEDF-9D1A-44EC-BAEA-FF050CF7A684}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {19F9AEDF-9D1A-44EC-BAEA-FF050CF7A684}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {19F9AEDF-9D1A-44EC-BAEA-FF050CF7A684}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {19F9AEDF-9D1A-44EC-BAEA-FF050CF7A684}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {67F3FCAA-D525-42C7-9743-B8D896F485BA}
- EndGlobalSection
-EndGlobal
diff --git a/Lombiq.JsonEditor.slnx b/Lombiq.JsonEditor.slnx
new file mode 100644
index 0000000..e4f2893
--- /dev/null
+++ b/Lombiq.JsonEditor.slnx
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/Lombiq.JsonEditor/CompatibilitySuppressions.xml b/Lombiq.JsonEditor/CompatibilitySuppressions.xml
new file mode 100644
index 0000000..8af156c
--- /dev/null
+++ b/Lombiq.JsonEditor/CompatibilitySuppressions.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ PKV006
+ net8.0
+
+
\ No newline at end of file
diff --git a/Lombiq.JsonEditor/Controllers/AdminController.cs b/Lombiq.JsonEditor/Controllers/AdminController.cs
index 0451d0f..02531f2 100644
--- a/Lombiq.JsonEditor/Controllers/AdminController.cs
+++ b/Lombiq.JsonEditor/Controllers/AdminController.cs
@@ -190,7 +190,7 @@ private async Task PostContentAsync(ContentItem model, bool draft
contentItem.Merge(model);
- var result = await _contentManager.UpdateValidateAndCreateAsync(contentItem, VersionOptions.Draft);
+ var result = await UpdateValidateAndCreateAsync(_contentManager, contentItem, VersionOptions.Draft);
if (CheckContentValidationResult(result) is { } problem) return problem;
}
@@ -206,6 +206,18 @@ private async Task PostContentAsync(ContentItem model, bool draft
return Ok(contentItem);
}
+ private static async Task UpdateValidateAndCreateAsync(
+ IContentManager contentManager,
+ ContentItem contentItem,
+ VersionOptions options)
+ {
+ await contentManager.UpdateAsync(contentItem);
+ var result = await contentManager.ValidateAsync(contentItem);
+ if (result.Succeeded) await contentManager.CreateAsync(contentItem, options);
+
+ return result;
+ }
+
private ActionResult CheckContentValidationResult(ContentValidateResult result)
{
if (!result.Succeeded)
diff --git a/Lombiq.JsonEditor/Lombiq.JsonEditor.csproj b/Lombiq.JsonEditor/Lombiq.JsonEditor.csproj
index 04a8ec1..3f4ed0f 100644
--- a/Lombiq.JsonEditor/Lombiq.JsonEditor.csproj
+++ b/Lombiq.JsonEditor/Lombiq.JsonEditor.csproj
@@ -1,57 +1,19 @@
-
-
-
-
+
- net8.0
- true
- $(DefaultItemExcludes);.git*
+ net10.0
+
+
+
Lombiq JSON Editor for Orchard Core
- Lombiq Technologies
- Copyright © 2021, Lombiq Technologies Ltd.
- Lombiq JSON Editor for Orchard Core: Orchard Core module for displaying a JSON Editor like on (https://jsoneditoronline.org/. See the project website for detailed documentation.
- NuGetIcon.png
+ 2021
+ Orchard Core module for displaying a JSON Editor like on (https://jsoneditoronline.org/.
OrchardCore;Lombiq;AspNetCore;JSONEditor
https://github.com/Lombiq/Orchard-JSON-Editor
- https://github.com/Lombiq/Orchard-JSON-Editor
- BSD-3-Clause
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+