chore: Update to net8

QuickChart/QuickChart.cs

@@ -3,192 +3,177 @@ using System.Net.Http;
 using System.Text;
 using System.Text.Json;
 using System.IO;
+using System.Text.Json.Serialization;
 
-namespace QuickChart
+namespace QuickChart;
+
+internal class QuickChartShortUrlResponse
 {
-    internal class QuickChartShortUrlResponse
-    {
 #pragma warning disable IDE1006 // Naming Styles
-        public bool status { get; set; }
+    public bool status { get; set; }
-        public string url { get; set; }
+    public string url { get; set; }
 #pragma warning restore IDE1006 // Naming Styles
-    }
+}
 
-    public class Chart
+public class Chart
+{
+    public int Width { get; set; }
+    public int Height { get; set; }
+    public double DevicePixelRatio { get; set; }
+    public string Format { get; set; }
+    public string BackgroundColor { get; set; }
+    public string Key { get; set; }
+    public string Version { get; set; }
+    public string Config { get; set; }
+
+    public string Scheme { get; set; }
+    public string Host { get; set; }
+    public int Port { get; set; }
+
+    private static readonly HttpClient Client = new();
+
+    public Chart(string scheme = null, string host = null, int? port = null)
     {
-        public int Width { get; set; }
+        this.Width = 500;
-        public int Height { get; set; }
+        this.Height = 300;
-        public double DevicePixelRatio { get; set; }
+        this.DevicePixelRatio = 1.0;
-        public string Format { get; set; }
+        this.Format = "png";
-        public string BackgroundColor { get; set; }
+        this.BackgroundColor = "transparent";
-        public string Key { get; set; }
-        public string Version { get; set; }
-        public string Config { get; set; }
 
-        public string Scheme { get; set; }
+        if (host != null)
-        public string Host { get; set; }
-        public int Port { get; set; }
-
-        private static readonly HttpClient Client = new HttpClient();
-
-        public Chart(string scheme = null, string host = null, int? port = null)
         {
-            Width = 500;
+            this.Host = host;
-            Height = 300;
+            if (scheme != null)
-            DevicePixelRatio = 1.0;
-            Format = "png";
-            BackgroundColor = "transparent";
-
-            if (host != null)
             {
-                Host = host;
+                this.Scheme = scheme;
-                if (scheme != null)
+                this.Port = port ?? (scheme == "http" ? 80 : 443);
-                {
-                    Scheme = scheme;
-                    if (port.HasValue)
-                    {
-                        Port = port.Value;
-                    }
-                    else
-                    {
-                        if(scheme == "http")
-                        {
-                            Port = 80;
-                        }
-                        else
-                        {
-                            Port = 443;
-                        }
-                    }
-                }
-                else
-                {
-                    Scheme = "https";
-                    Port = 443;
-                }
             }
             else
             {
-                Scheme = "https";
+                this.Scheme = "https";
-                Host = "quickchart.io";
+                this.Port = 443;
-                Port = 443;
             }
         }
-
+        else
-        public string GetUrl()
         {
-            if (Config == null)
+            this.Scheme = "https";
-            {
+            this.Host = "quickchart.io";
-                throw new NullReferenceException("You must set Config on the QuickChart object before generating a URL");
+            this.Port = 443;
-            }
-
-            StringBuilder builder = new StringBuilder();
-            builder.Append("w=").Append(Width.ToString());
-            builder.Append("&h=").Append(Height.ToString());
-
-            builder.Append("&devicePixelRatio=").Append(DevicePixelRatio.ToString());
-            builder.Append("&f=").Append(Format);
-            builder.Append("&bkg=").Append(Uri.EscapeDataString(BackgroundColor));
-            builder.Append("&c=").Append(Uri.EscapeDataString(Config));
-            if (!string.IsNullOrEmpty(Key))
-            {
-                builder.Append("&key=").Append(Uri.EscapeDataString(Key));
-            }
-            if (!string.IsNullOrEmpty(Version))
-            {
-                builder.Append("&v=").Append(Uri.EscapeDataString(Version));
-            }
-
-            return $"{Scheme}://{Host}:{Port}/chart?{builder}";
-        }
-
-        public string GetShortUrl()
-        {
-            if (Config == null)
-            {
-                throw new NullReferenceException("You must set Config on the QuickChart object before generating a URL");
-            }
-
-            JsonSerializerOptions options = new JsonSerializerOptions();
-            options.IgnoreNullValues = true;
-
-            String json = JsonSerializer.Serialize(new
-            {
-                width = Width,
-                height = Height,
-                backgroundColor = BackgroundColor,
-                devicePixelRatio = DevicePixelRatio,
-                format = Format,
-                chart = Config,
-                key = Key,
-                version = Version,
-            }, options);
-
-            string url = $"{Scheme}://{Host}:{Port}/chart/create";
-
-            HttpResponseMessage response = Client.PostAsync(
-                url,
-                new StringContent(json, Encoding.UTF8, "application/json")
-            ).Result;
-
-            if (!response.IsSuccessStatusCode)
-            {
-                throw new ApiException("Unsuccessful response from API", response);
-            }
-
-            string responseText = response.Content.ReadAsStringAsync().Result;
-            QuickChartShortUrlResponse result = JsonSerializer.Deserialize<QuickChartShortUrlResponse>(responseText);
-            return result.url;
-        }
-
-        public byte[] ToByteArray()
-        {
-            if (Config == null)
-            {
-                throw new NullReferenceException("You must set Config on the QuickChart object before generating a URL");
-            }
-
-            JsonSerializerOptions options = new JsonSerializerOptions();
-            options.IgnoreNullValues = true;
-
-            String json = JsonSerializer.Serialize(new
-            {
-                width = Width,
-                height = Height,
-                backgroundColor = BackgroundColor,
-                devicePixelRatio = DevicePixelRatio,
-                format = Format,
-                chart = Config,
-                key = Key,
-                version = Version,
-            }, options);
-
-            string url = $"{Scheme}://{Host}:{Port}/chart";
-
-            HttpResponseMessage response = Client.PostAsync(
-                url,
-                new StringContent(json, Encoding.UTF8, "application/json")
-            ).Result;
-
-            if (!response.IsSuccessStatusCode)
-            {
-                throw new ApiException("Unsuccessful response from API", response);
-            }
-
-            return response.Content.ReadAsByteArrayAsync().Result;
-        }
-
-        public void ToFile(string filePath)
-        {
-            File.WriteAllBytes(filePath, this.ToByteArray());
         }
     }
 
-    public class ApiException : Exception
+    public string GetUrl()
     {
-        public ApiException(string message, HttpResponseMessage response) : base(message) 
+        if (this.Config == null)
-            => this.Response = response;
+        {
+            throw new NullReferenceException("You must set Config on the QuickChart object before generating a URL");
+        }
 
-        public HttpResponseMessage Response { get; private set; }
+        var builder = new StringBuilder();
+        _ = builder.Append("w=").Append(this.Width);
+        _ = builder.Append("&h=").Append(this.Height);
+
+        _ = builder.Append("&devicePixelRatio=").Append(this.DevicePixelRatio);
+        _ = builder.Append("&f=").Append(this.Format);
+        _ = builder.Append("&bkg=").Append(Uri.EscapeDataString(this.BackgroundColor));
+        _ = builder.Append("&c=").Append(Uri.EscapeDataString(this.Config));
+        if (!string.IsNullOrEmpty(this.Key))
+        {
+            _ = builder.Append("&key=").Append(Uri.EscapeDataString(this.Key));
+        }
+        if (!string.IsNullOrEmpty(this.Version))
+        {
+            _ = builder.Append("&v=").Append(Uri.EscapeDataString(this.Version));
+        }
+
+        return $"{this.Scheme}://{this.Host}:{this.Port}/chart?{builder}";
     }
+
+    public string GetShortUrl()
+    {
+        if (this.Config == null)
+        {
+            throw new NullReferenceException("You must set Config on the QuickChart object before generating a URL");
+        }
+
+        var options = new JsonSerializerOptions
+        {
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+        };
+
+        var json = JsonSerializer.Serialize(new
+        {
+            width = this.Width,
+            height = this.Height,
+            backgroundColor = this.BackgroundColor,
+            devicePixelRatio = this.DevicePixelRatio,
+            format = this.Format,
+            chart = this.Config,
+            key = this.Key,
+            version = this.Version,
+        }, options);
+
+        var url = $"{this.Scheme}://{this.Host}:{this.Port}/chart/create";
+
+        var response = Client.PostAsync(
+            url,
+            new StringContent(json, Encoding.UTF8, "application/json")
+        ).Result;
+
+        if (!response.IsSuccessStatusCode)
+        {
+            throw new ApiException("Unsuccessful response from API", response);
+        }
+
+        var responseText = response.Content.ReadAsStringAsync().Result;
+        var result = JsonSerializer.Deserialize<QuickChartShortUrlResponse>(responseText);
+        return result.url;
+    }
+
+    public byte[] ToByteArray()
+    {
+        if (this.Config == null)
+        {
+            throw new NullReferenceException("You must set Config on the QuickChart object before generating a URL");
+        }
+
+        var options = new JsonSerializerOptions
+        {
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+        };
+
+        var json = JsonSerializer.Serialize(new
+        {
+            width = this.Width,
+            height = this.Height,
+            backgroundColor = this.BackgroundColor,
+            devicePixelRatio = this.DevicePixelRatio,
+            format = this.Format,
+            chart = this.Config,
+            key = this.Key,
+            version = this.Version,
+        }, options);
+
+        var url = $"{this.Scheme}://{this.Host}:{this.Port}/chart";
+
+        var response = Client.PostAsync(
+            url,
+            new StringContent(json, Encoding.UTF8, "application/json")
+        ).Result;
+
+        return !response.IsSuccessStatusCode
+            ? throw new ApiException("Unsuccessful response from API", response)
+            : response.Content.ReadAsByteArrayAsync().Result;
+    }
+
+    public void ToFile(string filePath) 
+        => File.WriteAllBytes(filePath, this.ToByteArray());
+}
+
+public class ApiException : Exception
+{
+    public ApiException(string message, HttpResponseMessage response) : base(message) 
+        => this.Response = response;
+
+    public HttpResponseMessage Response { get; private set; }
 }

QuickChart/QuickChart.csproj

@@ -2,23 +2,27 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>netcoreapp3.1;netstandard2.0;net472</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
+	<PlatformTarget>x64</PlatformTarget>
+	<Configurations>Debug;Release;x64</Configurations>
+    <Platforms>AnyCPU;x64</Platforms>
     <PackOnBuild>true</PackOnBuild>
-    <Authors>Ian Webster</Authors>
+    <Authors>Ian Webster, TheXorog</Authors>
-    <Copyright>Ian Webster</Copyright>
+    <Copyright>Ian Webster, TheXorog</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Owners>QuickChart</Owners>
-    <PackageProjectUrl>https://github.com/typpo/quickchart-csharp</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/TheXorog/quickchart-csharp</PackageProjectUrl>
     <Summary>Client library for the QuickChart Chart API, used to generate chart images.</Summary>
     <PackageTags>chart image, chart api, chart, charts, image charts</PackageTags>
     <Title>QuickChart</Title>
     <Description>Client library for the QuickChart Chart API, used to generate chart images.</Description>
     <PackageVersion>2.3.0</PackageVersion>
     <PackageId>QuickChart</PackageId>
+    <RunAnalyzersDuringBuild>False</RunAnalyzersDuringBuild>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="5.0.0" />
+    <PackageReference Include="System.Text.Json" Version="7.0.3" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
 </Project>