upgrade to .net 7 and fix test #1

DeskDirector · May 15, 2023 · 6f6fef8 · 6f6fef8
1 parent 9179ea2
commit 6f6fef8
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 25 deletions.
diff --git a/src/Optional.FluentValidation/Optional.FluentValidation.csproj b/src/Optional.FluentValidation/Optional.FluentValidation.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <LangVersion>8.0</LangVersion>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+		<LangVersion>latest</LangVersion>
+	  <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Nness.Text.Json.Validation</RootNamespace>
   </PropertyGroup>

diff --git a/src/Optional.Json/Optional.Json.csproj b/src/Optional.Json/Optional.Json.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <LangVersion>8.0</LangVersion>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+		<LangVersion>latest</LangVersion>
+	  <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Nness.Text.Json</RootNamespace>
   </PropertyGroup>

diff --git a/src/Optional.Json/OptionalCollectionConverter.cs b/src/Optional.Json/OptionalCollectionConverter.cs
@@ -49,7 +49,7 @@ private class OptionalCollectionConverterInner<TValue> : JsonConverter<OptionalC
             public OptionalCollectionConverterInner(JsonSerializerOptions options)
             {
                 _valueConverter = (JsonConverter<ICollection<TValue>>)options.GetConverter(typeof(ICollection<TValue>));
-                _valueType = typeof(TValue);
+                _valueType = typeof(ICollection<TValue>);
             }
 
             public override OptionalCollection<TValue> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -64,10 +64,10 @@ public override OptionalCollection<TValue> Read(ref Utf8JsonReader reader, Type
                     );
                 }
 
-                ICollection<TValue> value = _valueConverter == null
+                ICollection<TValue>? value = _valueConverter == null
                     ? JsonSerializer.Deserialize<TValue[]>(ref reader, options)
                     : _valueConverter.Read(ref reader, _valueType, options);
-                return new OptionalCollection<TValue>(value);
+                return new OptionalCollection<TValue>(value ?? Array.Empty<TValue>());
             }
 
             public override void Write(Utf8JsonWriter writer, OptionalCollection<TValue> value, JsonSerializerOptions options)

diff --git a/src/Optional/Optional.csproj b/src/Optional/Optional.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <LangVersion>8.0</LangVersion>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <LangVersion>latest</LangVersion>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Nness.Text.Json</RootNamespace>
   </PropertyGroup>

diff --git a/src/Optional/OptionalCollection.cs b/src/Optional/OptionalCollection.cs
@@ -9,22 +9,13 @@ namespace Nness.Text.Json
     [Serializable]
     public readonly struct OptionalCollection<T> : IOptional<ICollection<T>?>, IEnumerable<T>
     {
-        [AllowNull]
         private readonly ICollection<T>? _value;
 
         public OptionalState State { get; }
 
-        [MaybeNull]
-        public ICollection<T>? Value {
-            get {
-                if (State == OptionalState.HasValue && _value != null) {
-                    return _value;
-                }
-                return null;
-            }
-        }
+        public ICollection<T>? Value => State == OptionalState.HasValue && _value != null ? _value : null;
 
-        public OptionalCollection(ICollection<T> value)
+        public OptionalCollection(ICollection<T>? value)
         {
             _value = value;
             State = value == null ? OptionalState.Null : OptionalState.HasValue;
@@ -41,7 +32,7 @@ public OptionalCollection(OptionalState state)
 
         public bool IsSet() => State != OptionalState.Undefined;
 
-        public bool HasValue([NotNullWhen(true), MaybeNullWhen(false)] out ICollection<T>? value)
+        public bool HasValue([NotNullWhen(true)] out ICollection<T>? value)
         {
             value = _value;
             return value != null && State == OptionalState.HasValue;

diff --git a/tests/Optional.Json.Tests/Optional.Json.Tests.csproj b/tests/Optional.Json.Tests/Optional.Json.Tests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>8.0</LangVersion>
+		<LangVersion>latest</LangVersion>
+	  <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
     <RootNamespace>Nness.Text.Json.Tests</RootNamespace>

diff --git a/tests/Optional.Tests/Optional.Tests.csproj b/tests/Optional.Tests/Optional.Tests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>8.0</LangVersion>
+		<LangVersion>latest</LangVersion>
+	  <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
     <RootNamespace>Nness.Text.Json.Tests</RootNamespace>