Upgraded to .NET 6

Author: ivanstus

.github/workflows/dotnet-core.yml

@@ -1,4 +1,4 @@
-name: .NET Core
+name: .NET
 
 on:
   push:
@@ -8,16 +8,11 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+    - uses: actions/checkout@v3
+    - name: Setup dotnet
+      uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 3.1.302
-    - name: Install dependencies
-      run: dotnet restore
-    - name: Build
-      run: dotnet build --configuration Release --no-restore
+        dotnet-version: 6.0.x
+    - run: dotnet build --configuration Release

OpenExchangeRates.sln

@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30320.27
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32505.173
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenExchangeRates", "OpenExchangeRates\OpenExchangeRates.csproj", "{10759FB5-7BB2-479D-B088-2314D01EBE9A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenExchangeRates", "OpenExchangeRates\OpenExchangeRates.csproj", "{10759FB5-7BB2-479D-B088-2314D01EBE9A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

OpenExchangeRates.sln.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=prettyprint/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

OpenExchangeRates/ApiStatus.cs

@@ -1,9 +1,8 @@
-namespace OpenExchangeRates
+namespace OpenExchangeRates;
+
+public enum ApiStatus
 {
-    public enum ApiStatus
-    {
-        Unknown,
-        Active,
-        AccessRestricted
-    }
+    Unknown,
+    Active,
+    AccessRestricted
 }

OpenExchangeRates/ConversionMetadata.cs

@@ -1,11 +1,7 @@
-using System;
+namespace OpenExchangeRates;
 
-namespace OpenExchangeRates
+public sealed class ConversionMetadata
 {
-    public sealed class ConversionMetadata
-    {
-        public DateTimeOffset Timestamp { get; set; }
-
-        public decimal Rate { get; set; }
-    }
+    public DateTimeOffset Timestamp { get; set; }
+    public decimal Rate { get; set; }
 }

OpenExchangeRates/ConvertRequest.cs

@@ -1,13 +1,9 @@
-namespace OpenExchangeRates
-{
-    public sealed class ConvertRequest
-    {
-        public string Query { get; set; }
-
-        public decimal Amount { get; set; }
+namespace OpenExchangeRates;
 
-        public string From { get; set; }
-
-        public string To { get; set; }
-    }
+public sealed class ConvertRequest
+{
+    public string Query { get; set; } = null!;
+    public decimal Amount { get; set; }
+    public string From { get; set; } = null!;
+    public string To { get; set; } = null!;
 }

OpenExchangeRates/ConvertResponse.cs

@@ -1,15 +1,14 @@
 using System.Text.Json.Serialization;
 
-namespace OpenExchangeRates
+namespace OpenExchangeRates;
+
+public sealed class ConvertResponse
 {
-    public sealed class ConvertResponse
-    {
-        public ConvertRequest Request { get; set; }
+    public ConvertRequest Request { get; set; } = null!;
 
-        [JsonPropertyName("response")]
-        public decimal Amount { get; set; }
+    [JsonPropertyName("response")]
+    public decimal Amount { get; set; }
 
-        [JsonPropertyName("meta")]
-        public ConversionMetadata Metadata { get; set; }
-    }
+    [JsonPropertyName("meta")]
+    public ConversionMetadata Metadata { get; set; } = null!;
 }

OpenExchangeRates/Converters/JsonValueConverterApiStatus.cs

@@ -1,27 +1,25 @@
-using System;
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace OpenExchangeRates.Converters
+namespace OpenExchangeRates.Converters;
+
+internal sealed class JsonValueConverterApiStatus : JsonConverter<ApiStatus>
 {
-    internal sealed class JsonValueConverterApiStatus : JsonConverter<ApiStatus>
+    public override ApiStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        public override ApiStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            var value = reader.GetString();
+        var value = reader.GetString();
 
-            if (string.Equals(value, "active", StringComparison.OrdinalIgnoreCase))
-                return ApiStatus.Active;
+        if (string.Equals(value, "active", StringComparison.OrdinalIgnoreCase))
+            return ApiStatus.Active;
 
-            if (string.Equals(value, "access_restricted", StringComparison.OrdinalIgnoreCase))
-                return ApiStatus.AccessRestricted;
+        if (string.Equals(value, "access_restricted", StringComparison.OrdinalIgnoreCase))
+            return ApiStatus.AccessRestricted;
 
-            return ApiStatus.Unknown;
-        }
+        return ApiStatus.Unknown;
+    }
 
-        public override void Write(Utf8JsonWriter writer, ApiStatus value, JsonSerializerOptions options)
-        {
-            throw new NotImplementedException();
-        }
+    public override void Write(Utf8JsonWriter writer, ApiStatus value, JsonSerializerOptions options)
+    {
+        throw new NotImplementedException();
     }
 }

OpenExchangeRates/Converters/JsonValueConverterDateTimeOffsetUnixSeconds.cs

@@ -1,19 +1,17 @@
-using System;
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace OpenExchangeRates.Converters
+namespace OpenExchangeRates.Converters;
+
+internal sealed class JsonValueConverterDateTimeOffsetUnixSeconds : JsonConverter<DateTimeOffset>
 {
-    internal sealed class JsonValueConverterDateTimeOffsetUnixSeconds : JsonConverter<DateTimeOffset>
+    public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            return DateTimeOffset.FromUnixTimeSeconds(reader.GetInt64());
-        }
+        return DateTimeOffset.FromUnixTimeSeconds(reader.GetInt64());
+    }
 
-        public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSerializerOptions options)
-        {
-            throw new NotImplementedException();
-        }
+    public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSerializerOptions options)
+    {
+        throw new NotImplementedException();
     }
 }

OpenExchangeRates/Extensions/StringBuilderExtensions.cs

@@ -0,0 +1,13 @@
+// ReSharper disable once CheckNamespace
+namespace System.Text;
+
+internal static class StringBuilderExtensions
+{
+    public static StringBuilder AppendNameValueBoolean(this StringBuilder sb, string name, bool? value)
+    {
+        ArgumentNullException.ThrowIfNull(sb);
+        ArgumentNullException.ThrowIfNull(name);
+
+        return value == null ? sb : sb.Append($"&{name}={(value.Value ? "true" : "false")}");
+    }
+}