Merge pull request #1229 from progressonderwijs/fons/cs_14

Update to C# 14

Author: fdij

src/Common.props

@@ -12,7 +12,7 @@
     <DefineConstants>TRACE;JETBRAINS_ANNOTATIONS</DefineConstants>
     <TargetFramework>net10.0-windows</TargetFramework>
     <OutputType>library</OutputType>
-    <LangVersion>13.0</LangVersion>
+    <LangVersion>14.0</LangVersion>
     <Nullable>enable</Nullable>
     <NoWarn>CS1591, IDE1006, IDE0039</NoWarn>
     <Features>strict</Features>

src/ProgressOnderwijsUtils/Data/DbDataReaderBase.cs

@@ -9,9 +9,7 @@ public override long GetBytes(int ordinal, long dataOffset, byte[]? buffer, int
         long read = 0;
         var data = (byte[])GetValue(ordinal);
         while (read < length && read + dataOffset < data.Length) {
-            if (buffer != null) {
-                buffer[bufferOffset + read] = data[dataOffset + read];
-            }
+            buffer?[bufferOffset + read] = data[dataOffset + read];
             ++read;
         }
         return read;

src/ProgressOnderwijsUtils/ExponentialDecayEstimator.cs

@@ -11,11 +11,9 @@ public sealed class ExponentialDecayEstimator
 {
     public const double LogOfHalf = -0.69314718055994529; //Math.Log(0.5);
     public readonly TimeSpan halflife;
-    DateTime timestampOfValue = default(DateTime).ToUniversalTime();
     double currentValue;
 
-    public DateTime UtcTimestampOfValue
-        => timestampOfValue;
+    public DateTime UtcTimestampOfValue { get; private set; } = default(DateTime).ToUniversalTime();
 
     public ExponentialDecayEstimator(TimeSpan halflife)
         => this.halflife = halflife;
@@ -40,7 +38,7 @@ public double EstimatedRateOfChangePerHalflife(DateTime moment)
     public ExponentialDecayEstimatorValue ValueAt(DateTime moment)
     {
         Debug.Assert(moment.Kind == DateTimeKind.Utc, "Error:non-UTC DateTime detected; all moments should be in UTC to make reasoning about exponential decays simpler.");
-        var halflives = (moment - timestampOfValue).TotalSeconds / halflife.TotalSeconds;
+        var halflives = (moment - UtcTimestampOfValue).TotalSeconds / halflife.TotalSeconds;
         return new(currentValue * Math.Exp(LogOfHalf * Math.Max(0.0, halflives)));
     }
 
@@ -50,12 +48,12 @@ public ExponentialDecayEstimatorValue ValueAt(DateTime moment)
     public ExponentialDecayEstimatorValue AddAmount(DateTime timestamp, double amount)
     {
         currentValue = ValueAt(timestamp).RawValue + amount;
-        timestampOfValue = timestamp;
+        UtcTimestampOfValue = timestamp;
         return new(currentValue);
     }
 
     public override string ToString()
-        => $"{currentValue} at {timestampOfValue} with halflife {halflife}";
+        => $"{currentValue} at {UtcTimestampOfValue} with halflife {halflife}";
 }
 
 public readonly struct ExponentialDecayEstimatorValue

src/ProgressOnderwijsUtils/Extensions/ToStringInvariantExtension.cs

@@ -15,12 +15,12 @@ public static string ToStringInvariant<T>(this T val, string format)
     [Pure]
     public static string ToStringInvariant<T>(this T? val)
         where T : struct, IConvertible
-        => val == null ? "" : val.Value.ToString(CultureInfo.InvariantCulture);
+        => val?.ToString(CultureInfo.InvariantCulture) ?? "";
 
     [Pure]
     public static string ToStringInvariant<T>(this T? val, string format)
         where T : struct, IFormattable
-        => val == null ? "" : val.Value.ToString(format, CultureInfo.InvariantCulture);
+        => val?.ToString(format, CultureInfo.InvariantCulture) ?? "";
 
     [Pure]
     [return: NotNullIfNotNull("val")]

src/ProgressOnderwijsUtils/Html/CustomHtmlElement.cs

@@ -47,9 +47,7 @@ string IHtmlElement.EndTag
     public IHtmlElement Canonicalize()
     {
         var tagDescription = TagDescription.LookupTag(TagName);
-        return tagDescription.EmptyValue == null
-            ? this
-            : tagDescription.EmptyValue.ReplaceAttributesAndContents(Attributes, GetContent());
+        return tagDescription.EmptyValue?.ReplaceAttributesAndContents(Attributes, GetContent()) ?? this;
     }
 
     IHtmlElement IHtmlElement.ApplyAlteration<THtmlTagAlteration>(THtmlTagAlteration change)

src/ProgressOnderwijsUtils/Html/HtmlSpec.AttributeConstructionMethods.Generated.cs

@@ -38,6 +38,18 @@ public static THtmlTag _draggable<THtmlTag>(this THtmlTag htmlTagExpr, string? a
     public static THtmlTag _enterkeyhint<THtmlTag>(this THtmlTag htmlTagExpr, string? attrValue)
         where THtmlTag : struct, IHtmlElement<THtmlTag>
         => htmlTagExpr.Attribute("enterkeyhint", attrValue);
+    public static THtmlTag _headingoffset<THtmlTag>(this THtmlTag htmlTagExpr, string? attrValue)
+        where THtmlTag : struct, IHtmlElement<THtmlTag>
+        => htmlTagExpr.Attribute("headingoffset", attrValue);
+    public static THtmlTag _headingreset<THtmlTag>(this THtmlTag htmlTagExpr, bool attrValue)
+        where THtmlTag : struct, IHtmlElement<THtmlTag>
+        => htmlTagExpr.Attribute("headingreset", attrValue ? "" : null);
+    public static THtmlTag _headingreset<THtmlTag>(this THtmlTag htmlTagExpr)
+        where THtmlTag : struct, IHtmlElement<THtmlTag>
+        => htmlTagExpr.Attribute("headingreset", "");
+    public static THtmlTag _headingreset<THtmlTag>(this THtmlTag htmlTagExpr, string? attrValue)
+        where THtmlTag : struct, IHtmlElement<THtmlTag>
+        => htmlTagExpr.Attribute("headingreset", attrValue);
     public static THtmlTag _hidden<THtmlTag>(this THtmlTag htmlTagExpr, string? attrValue)
         where THtmlTag : struct, IHtmlElement<THtmlTag>
         => htmlTagExpr.Attribute("hidden", attrValue);