From 33338add76270d59c52e9b73f801460c5201bda7 Mon Sep 17 00:00:00 2001 From: Ronald Barendse Date: Thu, 4 Jul 2024 07:36:09 +0200 Subject: [PATCH 1/7] Support parsing object to DateTimeOffset and preserve timezone offset (#16732) (cherry picked from commit 4643b7dba37f187f1b3594eac4a41298db25ebe4) --- .../Serialization/JsonObjectConverter.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Infrastructure/Serialization/JsonObjectConverter.cs b/src/Umbraco.Infrastructure/Serialization/JsonObjectConverter.cs index e1c0f5950d..d8c9778461 100644 --- a/src/Umbraco.Infrastructure/Serialization/JsonObjectConverter.cs +++ b/src/Umbraco.Infrastructure/Serialization/JsonObjectConverter.cs @@ -101,8 +101,9 @@ public sealed class JsonObjectConverter : JsonConverter JsonTokenType.Number when reader.TryGetInt32(out int i) => i, JsonTokenType.Number when reader.TryGetInt64(out long l) => l, JsonTokenType.Number => reader.GetDouble(), + JsonTokenType.String when reader.TryGetDateTimeOffset(out DateTimeOffset datetime) => datetime, JsonTokenType.String when reader.TryGetDateTime(out DateTime datetime) => datetime, - JsonTokenType.String => reader.GetString()!, + JsonTokenType.String => reader.GetString(), _ => JsonDocument.ParseValue(ref reader).RootElement.Clone() }; } From d3fe69afe4ed891abaf2a2215a5051513c969f97 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Fri, 5 Jul 2024 09:05:23 +0200 Subject: [PATCH 2/7] add `type/improvement` to list of bug fixes --- .github/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/release.yml b/.github/release.yml index 9b9f32cdde..379dc1559d 100644 --- a/.github/release.yml +++ b/.github/release.yml @@ -17,6 +17,7 @@ changelog: labels: - type/bug - category/bug + - type/improvement - title: 📄 Documentation labels: - category/documentation From a79f2705dadeaf691aa2447ecfa4582f696ab79d Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Fri, 5 Jul 2024 09:10:06 +0200 Subject: [PATCH 3/7] introduce an "other changes" category --- .github/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/release.yml b/.github/release.yml index 379dc1559d..e65616aafe 100644 --- a/.github/release.yml +++ b/.github/release.yml @@ -31,5 +31,8 @@ changelog: labels: - category/accessibility - title: 🚀 New Features + labels: + - type/feature + - title: Other Changes labels: - '*' From 4283f34fd14cb7b17c12cb3c17c2981f7495f0e1 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Fri, 5 Jul 2024 11:05:18 +0200 Subject: [PATCH 4/7] update backoffice submodule --- src/Umbraco.Web.UI.Client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client b/src/Umbraco.Web.UI.Client index 9ec8c79227..2d42c53a00 160000 --- a/src/Umbraco.Web.UI.Client +++ b/src/Umbraco.Web.UI.Client @@ -1 +1 @@ -Subproject commit 9ec8c79227312d97e5dcd6b61a6209752e48d76f +Subproject commit 2d42c53a0012647be9174f20bc34cdba2b81de67 From 58a766293e65e226bceb2ff36f22319be92697b0 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Fri, 5 Jul 2024 13:29:59 +0200 Subject: [PATCH 5/7] update backoffice submodule --- src/Umbraco.Web.UI.Client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client b/src/Umbraco.Web.UI.Client index 2d42c53a00..98b657dba6 160000 --- a/src/Umbraco.Web.UI.Client +++ b/src/Umbraco.Web.UI.Client @@ -1 +1 @@ -Subproject commit 2d42c53a0012647be9174f20bc34cdba2b81de67 +Subproject commit 98b657dba652da774314e70e0bfeed0aa4ee5a48 From fd3f77c4778389a79dc0f5e2270b8a00d2c7abda Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 10 Jul 2024 11:50:40 +0200 Subject: [PATCH 6/7] update backoffice submodule (hotfix ufm) --- src/Umbraco.Web.UI.Client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client b/src/Umbraco.Web.UI.Client index 98b657dba6..3d252940b8 160000 --- a/src/Umbraco.Web.UI.Client +++ b/src/Umbraco.Web.UI.Client @@ -1 +1 @@ -Subproject commit 98b657dba652da774314e70e0bfeed0aa4ee5a48 +Subproject commit 3d252940b8872abc6b948e580422561711ebad0a From e4b776a56c6382f00d2702eb0838d0f42b2fe195 Mon Sep 17 00:00:00 2001 From: Zeegaan Date: Wed, 10 Jul 2024 11:53:07 +0200 Subject: [PATCH 7/7] bump version --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 31fd8e32c7..a3f6170c9f 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", - "version": "14.1.0-rc2", + "version": "14.1.0", "assemblyVersion": { "precision": "build" },