Update to .NET 5.0

Console/Console.csproj

@@ -2,7 +2,7 @@
   <!-- Assembly -->
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>RedditQuoteBot.Console</AssemblyName>
     <RootNamespace>RedditQuoteBot.Console</RootNamespace>
     <StartupObject>RedditQuoteBot.Console.Program</StartupObject>
@@ -11,20 +11,22 @@
 
   <!-- C# compiler -->
   <PropertyGroup>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>
     <Features>strict</Features>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningsAsErrors>nullable</WarningsAsErrors>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <None Remove="Config.ini" />
     <None Remove="IgnoredUserNames.txt" />
     <None Remove="Quotes.txt" />
     <None Remove="Subreddits.txt" />
     <None Remove="TriggerPhrases.txt" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <Content Include="Config.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -47,7 +49,7 @@
       <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
     </Content>
   </ItemGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="ini-parser-netstandard" Version="2.5.2" />
   </ItemGroup>

Console/Program.cs

@@ -1,5 +1,4 @@
 using RedditQuoteBot.Core;
-using System;
 using System.Reflection;
 using System.Threading;
 
@@ -42,4 +41,4 @@ public static void Main()
             }
         }
     }
-}
+}

Console/Settings.cs

@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 
 namespace RedditQuoteBot.Console
 {
@@ -70,4 +69,4 @@ private static IList<string> GetFileContent(string value)
 
         public static readonly IList<string> Quotes;
     }
-}
+}

Core/Converters/MicrosecondEpochConverter.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -20,4 +18,4 @@ public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializer
             writer.WriteStringValue(((value - _epoch).TotalMilliseconds / 1000).ToString());
         }
     }
-}
+}

Core/Core.csproj

@@ -6,14 +6,14 @@
     <RootNamespace>RedditQuoteBot.Core</RootNamespace>
     <EmbedAllSources>true</EmbedAllSources>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>RedditQuoteBot.pfx</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>RedditQuoteBot.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <!-- NuGet -->
   <PropertyGroup>
     <PackageId>RedditQuoteBot</PackageId>
     <Product>RedditQuoteBot</Product>
-    <Version>1.0.0</Version>
+    <Version>1.1.0</Version>
     <Authors>David Sungaila</Authors>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -31,10 +31,12 @@
 
   <!-- C# compiler -->
   <PropertyGroup>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>
     <Features>strict</Features>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningsAsErrors>nullable</WarningsAsErrors>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
   </PropertyGroup>
 
   <!-- Release builds -->
@@ -58,7 +60,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Text.Json" Version="4.7.2" />
+    <PackageReference Include="System.Text.Json" Version="5.0.2" />
   </ItemGroup>
 
 </Project>

Core/Models/AccessTokenResponse.cs

@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Text;
 using System.Text.Json.Serialization;
 
 namespace RedditQuoteBot.Core.Models
@@ -36,4 +34,4 @@ public long ExpiresIn
 
         public override string? ToString() => Token;
     }
-}
+}

Core/Models/ChildData.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Text;
+using System.Diagnostics;
 using System.Text.Json.Serialization;
 
 namespace RedditQuoteBot.Core.Models
@@ -15,4 +12,4 @@ internal class ChildData
         [JsonPropertyName("data")]
         public CommentData? Data { get; set; }
     }
-}
+}

Core/Models/CommentData.cs

@@ -1,8 +1,6 @@
 using RedditQuoteBot.Core.Converters;
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Text;
 using System.Text.Json.Serialization;
 
 namespace RedditQuoteBot.Core.Models
@@ -56,4 +54,4 @@ internal class CommentData
         [JsonPropertyName("body")]
         public string? Body { get; set; }
     }
-}
+}

Core/Models/ListingData.cs

@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics;
-using System.Text;
 using System.Text.Json.Serialization;
 
 namespace RedditQuoteBot.Core.Models
@@ -24,4 +22,4 @@ internal class ListingData
         [JsonPropertyName("children")]
         public IList<ChildData>? Children { get; set; }
     }
-}
+}

Core/Models/ListingResponse.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Text;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace RedditQuoteBot.Core.Models
 {
@@ -14,4 +10,4 @@ internal class ListingResponse
         [JsonPropertyName("data")]
         public ListingData? Data { get; set; }
     }
-}
+}

Core/RedditClient.cs

@@ -159,7 +159,7 @@ public RedditClient(
             Subreddits = subreddits;
             TriggerPhrases = triggerPhrases;
             Quotes = quotes;
-            IgnoredUserNames = ignoredUserNames ?? IgnoredUserNames;
+            IgnoredUserNames = ignoredUserNames ?? new List<string>();
 
             ApplicationName = (!string.IsNullOrEmpty(applicationName) ? applicationName : Assembly.GetEntryAssembly().GetName().Name)!;
             ApplicationVersion = (!string.IsNullOrEmpty(applicationVersion) ? applicationVersion : Assembly.GetEntryAssembly().GetName().Version.ToString())!;
@@ -215,7 +215,7 @@ private async Task ThrottleRequestsAsync(CancellationToken cancellationToken)
             Console.WriteLine();
             var ratelimit = TimeSpan.FromTicks(Math.Max(Ratelimit.Ticks, _minRatelimit.Ticks));
             var availableAt = LastRequest.Add(ratelimit);
-            
+
             if (DateTime.UtcNow < availableAt)
             {
                 var availableIn = availableAt.Subtract(DateTime.UtcNow);
@@ -256,6 +256,9 @@ private async Task AuthenticateAsync(CancellationToken cancellationToken)
                 string responseContent = await response.Content.ReadAsStringAsync();
                 AccessTokenResponse = JsonSerializer.Deserialize<AccessTokenResponse>(responseContent);
 
+                if (AccessTokenResponse?.Token == null)
+                    throw new InvalidOperationException("Failed to receive access token.");
+
                 _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue(
                        "Bearer",
                        AccessTokenResponse.Token);
@@ -298,6 +301,9 @@ private async Task<IEnumerable<CommentData>> GetCommentsAsync(string subreddit,
                 var responseContent = await response.Content.ReadAsStreamAsync();
                 result = await JsonSerializer.DeserializeAsync<ListingResponse>(responseContent, null, cancellationToken);
 
+                if (result == null)
+                    throw new InvalidOperationException("Failed to receive listing response.");
+
                 Console.WriteLine("succeeded.");
             }
             catch (TaskCanceledException)
@@ -310,7 +316,7 @@ private async Task<IEnumerable<CommentData>> GetCommentsAsync(string subreddit,
                 Console.WriteLine("failed.");
                 Console.WriteLine(ex);
                 throw;
-            }            
+            }
 
             if (result.Data == null)
                 return new List<CommentData>();
@@ -454,4 +460,4 @@ public HistoryEntry(CommentData comment, int quoteId)
             public DateTime CreatedLocal { get => CreatedUtc.ToLocalTime(); }
         }
     }
-}
+}