💚⬆️net7 to net8 (LTS), net9 (STS) (#1502)

angularsen · web-flow · commit d3cf2dfc6c1c · 2025-01-19T23:45:10.000+01:00
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)
diff --git a/UnitsNet.NumberExtensions/UnitsNet.NumberExtensions.csproj b/UnitsNet.NumberExtensions/UnitsNet.NumberExtensions.csproj
@@ -22,7 +22,7 @@
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <RootNamespace>UnitsNet</RootNamespace>
-    <TargetFrameworks>netstandard2.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/UnitsNet.Serialization.JsonNet/UnitsNet.Serialization.JsonNet.csproj b/UnitsNet.Serialization.JsonNet/UnitsNet.Serialization.JsonNet.csproj
@@ -24,7 +24,7 @@
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <RootNamespace>UnitsNet.Serialization.JsonNet</RootNamespace>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <!-- SourceLink: https://github.com/dotnet/sourcelink -->
diff --git 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
diff --git a/UnitsNet/UnitsNet.csproj b/UnitsNet/UnitsNet.csproj
@@ -24,7 +24,7 @@
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <RootNamespace>UnitsNet</RootNamespace>
-    <TargetFrameworks>netstandard2.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <!-- SourceLink: https://github.com/dotnet/sourcelink -->

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,8 @@ protected IQuantity ConvertValueUnit(ValueUnit valueUnit)`
`110`	`110`
`111`	`111`	`if (registeredQuantity is not null)`
`112`	`112`	`{`
`113`		`- return (IQuantity)Activator.CreateInstance(registeredQuantity, valueUnit.Value, unit);`
	`113`	`+ return (IQuantity)(Activator.CreateInstance(registeredQuantity, valueUnit.Value, unit) ??`
	`114`	`+ throw new InvalidOperationException($"Failed to create instance of {registeredQuantity}."));`
`114`	`115`	`}`
`115`	`116`
`116`	`117`	`return valueUnit switch`