From 4a8a372d1602397275366f416c3e9867baaf32ee Mon Sep 17 00:00:00 2001 From: Andreas Gullberg Larsen Date: Sun, 19 Jan 2025 23:36:21 +0100 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=92=9A=E2=AC=86=EF=B8=8Fnet7=20to=20n?= =?UTF-8?q?et8=20(LTS),=20net9=20(STS)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes CI build due to net7 no longer being available. New convention for target frameworks: - netstandard2.0 - latest LTS version (net8.0) - any newer STS versions (net9.0) --- UnitsNet.NumberExtensions/UnitsNet.NumberExtensions.csproj | 2 +- UnitsNet/UnitsNet.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/UnitsNet.NumberExtensions/UnitsNet.NumberExtensions.csproj b/UnitsNet.NumberExtensions/UnitsNet.NumberExtensions.csproj index 4a1e5c7f1e..59e8ffafa2 100644 --- a/UnitsNet.NumberExtensions/UnitsNet.NumberExtensions.csproj +++ b/UnitsNet.NumberExtensions/UnitsNet.NumberExtensions.csproj @@ -22,7 +22,7 @@ latest enable UnitsNet - netstandard2.0;net7.0 + netstandard2.0;net8.0;net9.0 diff --git a/UnitsNet/UnitsNet.csproj b/UnitsNet/UnitsNet.csproj index 0d2b1faec7..cae5af0468 100644 --- a/UnitsNet/UnitsNet.csproj +++ b/UnitsNet/UnitsNet.csproj @@ -24,7 +24,7 @@ latest enable UnitsNet - netstandard2.0;net7.0 + netstandard2.0;net8.0;net9.0 From 9f6f52495f1c7d11755f2433a9271093193c30ad Mon Sep 17 00:00:00 2001 From: Andreas Gullberg Larsen Date: Sun, 19 Jan 2025 23:42:34 +0100 Subject: [PATCH 2/3] update jsonnet proj --- .../UnitsNet.Serialization.JsonNet.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UnitsNet.Serialization.JsonNet/UnitsNet.Serialization.JsonNet.csproj b/UnitsNet.Serialization.JsonNet/UnitsNet.Serialization.JsonNet.csproj index e94de13670..2964dfd55e 100644 --- a/UnitsNet.Serialization.JsonNet/UnitsNet.Serialization.JsonNet.csproj +++ b/UnitsNet.Serialization.JsonNet/UnitsNet.Serialization.JsonNet.csproj @@ -24,7 +24,7 @@ latest enable UnitsNet.Serialization.JsonNet - netstandard2.0 + netstandard2.0;net8.0;net9.0 From bfdc76d732e66fd87f11caf79791b62f26e98d66 Mon Sep 17 00:00:00 2001 From: Andreas Gullberg Larsen Date: Sun, 19 Jan 2025 23:44:36 +0100 Subject: [PATCH 3/3] add null check --- UnitsNet.Serialization.JsonNet/UnitsNetBaseJsonConverter.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/UnitsNet.Serialization.JsonNet/UnitsNetBaseJsonConverter.cs b/UnitsNet.Serialization.JsonNet/UnitsNetBaseJsonConverter.cs index b284f0ebae..d39c4d2b57 100644 --- a/UnitsNet.Serialization.JsonNet/UnitsNetBaseJsonConverter.cs +++ b/UnitsNet.Serialization.JsonNet/UnitsNetBaseJsonConverter.cs @@ -110,7 +110,8 @@ protected IQuantity ConvertValueUnit(ValueUnit valueUnit) if (registeredQuantity is not null) { - return (IQuantity)Activator.CreateInstance(registeredQuantity, valueUnit.Value, unit); + return (IQuantity)(Activator.CreateInstance(registeredQuantity, valueUnit.Value, unit) ?? + throw new InvalidOperationException($"Failed to create instance of {registeredQuantity}.")); } return valueUnit switch