Multitarget

.github/workflows/build-pr.yml

@@ -21,6 +21,11 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
 
+    - name: Setup .NET 5.0 SDK
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '5.x'
+
     - name: Setup .NET 6.0 SDK
       uses: actions/setup-dotnet@v1
       with:

.github/workflows/build-release.yml

@@ -42,6 +42,11 @@ jobs:
       with:
         useConfigFile: true
 
+    - name: Setup .NET 5.0 SDK
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '5.x'
+
     - name: Setup .NET 6.0 SDK
       uses: actions/setup-dotnet@v1
       with:

src/FaluSdk/Core/BaseServiceClient.cs

@@ -80,7 +80,11 @@ protected virtual async Task<ResourceResponse<TResource>> RequestCoreAsync<TReso
 
             // get a stream reference for the content
             // the stream may still be being incoming and thus we should only read when necessary
+#if NET5_0_OR_GREATER
+            var stream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
+#else
             var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
+#endif
 
             // if the response was a success then deserialize the body as TResource otherwise TError
             if (response.IsSuccessStatusCode)

src/FaluSdk/Events/EventUtility.cs

@@ -98,7 +98,7 @@ private static bool IsSignaturePresent(string signature, IEnumerable<string> sig
             return signatures.Any(key => string.Equals(key, signature, StringComparison.Ordinal));
         }
 
-        private static string ComputeSignature(string secret, string timestamp, string payload)
+        private static string ComputeSignature(string secret, string? timestamp, string payload)
         {
             var secretBytes = Encoding.UTF8.GetBytes(secret);
             var payloadBytes = Encoding.UTF8.GetBytes($"{timestamp}.{payload}");

src/FaluSdk/Extensions/IServiceCollectionExtensions.cs

@@ -75,7 +75,7 @@ public static IHttpClientBuilder AddFalu<TClient, TClientOptions>(this IServiceC
             services.AddSingleton<IPostConfigureOptions<TClientOptions>, PostConfigureFaluClientOptions<TClientOptions>>();
 
             // get the version from the assembly
-            var productVersion = typeof(TClient).Assembly.GetName().Version.ToString(3);
+            var productVersion = typeof(TClient).Assembly.GetName().Version!.ToString(3);
 
             // setup client
             var builder = services.AddHttpClient<TClient>()

src/FaluSdk/FaluClientOptions.cs

@@ -35,7 +35,7 @@ internal static JsonSerializerOptions CreateSerializerOptions()
         {
             var serializerOptions = new JsonSerializerOptions
             {
-                IgnoreNullValues = true,
+                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
                 PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
                 PropertyNameCaseInsensitive = true,
                 AllowTrailingCommas = true,

src/FaluSdk/FaluSdk.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFrameworks>netstandard2.1;net5.0;net6.0</TargetFrameworks>
     <Description>The official client library for Falu. (https://falu.io)</Description>
     <RootNamespace>Falu</RootNamespace>
     <PackageIcon>falu-logo.png</PackageIcon>

src/FaluSdk/Files/FilesServiceClient.cs

@@ -65,10 +65,11 @@ public virtual Task<ResourceResponse<File>> CreateAsync(FileCreateRequest file,
                 throw new InvalidOperationException($"{nameof(file.FileName)} cannot be null or whitespace.");
             }
 
+            var purpose = file.Purpose!.Value;
             var content = new MultipartFormDataContent
             {
                 // populate fields of the model as key value pairs
-                { new StringContent(file.Purpose?.GetEnumMemberAttrValueOrDefault()), "purpose" },
+                { new StringContent(purpose.GetEnumMemberAttrValueOrDefault()), "purpose" },
 
                 // populate the file stream
                 { new StreamContent(file.Content), "file", file.FileName },

src/FaluSdk/ResourceResponse.cs

@@ -150,7 +150,7 @@ private static void AddIf(IList<string> collection, string? value, string format
                 t = Nullable.GetUnderlyingType(t);
             }
 
-            return (T)Convert.ChangeType(value, t);
+            return (T?)Convert.ChangeType(value, t!);
         }
     }
 }

tests/FaluSdk.Tests/FaluSdk.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
     <RootNamespace>Falu.Tests</RootNamespace>