Add net5.0 to target frameworks and fix warnings

nickelc · May 16, 2021 · b2c4e70 · b2c4e70
1 parent 0edf24b
commit b2c4e70
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/Modio/Exceptions/ApiException.cs b/Modio/Exceptions/ApiException.cs
@@ -70,7 +70,7 @@ static ApiError GetApiError(string? message)
                 if (!string.IsNullOrEmpty(message))
                 {
                     var error = JsonSerializer.Deserialize<ApiErrorResponse>(message);
-                    return error.Error ?? new ApiError(message);
+                    return error!.Error ?? new ApiError(message);
                 }
             }
             catch (Exception)

diff --git a/Modio/Helpers/EditResult.cs b/Modio/Helpers/EditResult.cs
@@ -47,14 +47,14 @@ public override EditResult<T> Read(ref Utf8JsonReader reader, Type typeToConvert
                 var restore = reader;
 
                 var msg = JsonSerializer.Deserialize<ApiMessage>(ref reader, options);
-                if (msg.Code != null && msg.Message != null)
+                if (msg!.Code != null && msg.Message != null)
                 {
                     return new EditResult<T>(null);
                 }
 
                 reader = restore;
                 var entityType = typeToConvert.GetGenericArguments()[0];
-                var entity = (T)JsonSerializer.Deserialize(ref reader, entityType, options);
+                var entity = (T?)JsonSerializer.Deserialize(ref reader, entityType, options);
                 return new EditResult<T>(entity);
             }
 

diff --git a/Modio/Helpers/NoHttpContent.cs b/Modio/Helpers/NoHttpContent.cs
@@ -15,7 +15,7 @@ public NoHttpContent(string mediaType)
             Headers.ContentType = new MediaTypeHeaderValue(mediaType);
         }
 
-        protected override Task SerializeToStreamAsync(Stream stream, TransportContext context)
+        protected override Task SerializeToStreamAsync(Stream stream, TransportContext? context)
         {
             return Task.CompletedTask;
         }

diff --git a/Modio/Helpers/Parameters.cs b/Modio/Helpers/Parameters.cs
@@ -3,7 +3,7 @@
 
 namespace Modio
 {
-    internal class Parameters : List<KeyValuePair<string, string>>
+    internal class Parameters : List<KeyValuePair<string?, string?>>
     {
         public Parameters() { }
 
@@ -17,7 +17,7 @@ public Parameters(IEnumerable<(string, string)> values)
 
         public void Add(string name, string value)
         {
-            Add(new KeyValuePair<string, string>(name, value));
+            Add(new KeyValuePair<string?, string?>(name, value));
         }
 
         public HttpContent ToContent()

diff --git a/Modio/Http/Response.cs b/Modio/Http/Response.cs
@@ -22,7 +22,7 @@ public Response(HttpStatusCode statusCode, IReadOnlyDictionary<string, string> h
             Headers = headers;
         }
 
-        public Response(HttpStatusCode statusCode, IReadOnlyDictionary<string, string> headers, object? httpContent, T body)
+        public Response(HttpStatusCode statusCode, IReadOnlyDictionary<string, string> headers, object? httpContent, T? body)
         {
             StatusCode = statusCode;
             Headers = headers;

diff --git a/Modio/Models/Response/Metadata.cs b/Modio/Models/Response/Metadata.cs
@@ -39,7 +39,7 @@ public override Metadata Read(ref Utf8JsonReader reader, Type typeToConvert, Jso
 
                 var kvp = JsonSerializer.Deserialize<KVP>(ref reader);
 
-                if (kvp.Key == null || kvp.Value == null)
+                if (kvp!.Key == null || kvp.Value == null)
                 {
                     throw new JsonException("invalid metadata kvp entry");
                 }

diff --git a/Modio/Modio.csproj b/Modio/Modio.csproj
@@ -14,7 +14,7 @@
     <PackageTags>modio API modding dotnetcore</PackageTags>
 
     <LangVersion>8.0</LangVersion>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <NullableContextOptions>enable</NullableContextOptions>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>