Spring cleaning

Updated packages, and moved entities to separate folder

Author: rabryst

SqlExcelExporter/DatabaseHelper.cs

@@ -1,11 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using Microsoft.Data.SqlClient;
 using System.Diagnostics;
 using System.IO;
 using System.Net.Sockets;
 using System.Text;
+using Microsoft.Data.SqlClient;
+using SqlExcelExporter.Entities;
 
 namespace SqlExcelExporter
 {

SqlExcelExporter/ConfigurationEntity.cs …Exporter/Entities/ConfigurationEntity.csSqlExcelExporter/ConfigurationEntity.cs renamed to SqlExcelExporter/Entities/ConfigurationEntity.cs SqlExcelExporter/ConfigurationEntity.cs renamed to SqlExcelExporter/Entities/ConfigurationEntity.cs

@@ -1,4 +1,4 @@
-namespace SqlExcelExporter
+namespace SqlExcelExporter.Entities
 {
     /// <summary>
     /// Container for configuration settings from the config.json file

SqlExcelExporter/ConnectionEntity.cs …celExporter/Entities/ConnectionEntity.csSqlExcelExporter/ConnectionEntity.cs renamed to SqlExcelExporter/Entities/ConnectionEntity.cs SqlExcelExporter/ConnectionEntity.cs renamed to SqlExcelExporter/Entities/ConnectionEntity.cs

@@ -1,4 +1,4 @@
-namespace SqlExcelExporter
+namespace SqlExcelExporter.Entities
 {
     /// <summary>
     /// Container for connection settings from the connection.json file

SqlExcelExporter/ResultEntity.cs SqlExcelExporter/Entities/ResultEntity.csSqlExcelExporter/ResultEntity.cs renamed to SqlExcelExporter/Entities/ResultEntity.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Data;
 
-namespace SqlExcelExporter
+namespace SqlExcelExporter.Entities
 {
     /// <summary>
     /// Container for results from one or more queries against SQL Server

SqlExcelExporter/FileWriter.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
+using SqlExcelExporter.Entities;
 
 namespace SqlExcelExporter
 {

SqlExcelExporter/SqlExcelExporter.csproj

@@ -5,7 +5,10 @@
         <ReleaseVersion>0.2</ReleaseVersion>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.1" />
-        <PackageReference Include="ClosedXML" Version="0.95.0-beta2" />
+        <PackageReference Include="Microsoft.Data.SqlClient" Version="2.0.0" />
+        <PackageReference Include="ClosedXML" Version="0.95.3" />
+    </ItemGroup>
+    <ItemGroup>
+      <Folder Include="Entities\" />
     </ItemGroup>
 </Project>

SqlExcelExporter/Tools.cs

@@ -16,7 +16,7 @@ public static T ReadJsonItem<T>(FileInfo file)
         {
             if (!File.Exists(file.FullName))
             {
-                return default(T);
+                return default;
             }
 
             return JsonSerializer.Deserialize<T>(File.ReadAllText(file.FullName));
@@ -26,9 +26,6 @@ public static T ReadJsonItem<T>(FileInfo file)
         /// Checks if assembly is running on Windows
         /// </summary>
         /// <returns>True or false</returns>
-        public static bool IsWindows()
-        {
-            return Path.DirectorySeparatorChar.Equals('\\');
-        }
+        public static bool IsWindows() => Path.DirectorySeparatorChar.Equals('\\');
     }
 }

SqlExcelExporter/WorkbookManager.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text;
 using ClosedXML.Excel;
+using SqlExcelExporter.Entities;
 
 namespace SqlExcelExporter
 {

sql2xls/Program.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using SqlExcelExporter;
+using SqlExcelExporter.Entities;
 
 namespace SqlToExcelExporter
 {
@@ -12,7 +13,7 @@ class Program
 
         private static void Main()
         {
-            Console.WriteLine("--- SQL to Excel Exporter v0.2.0");
+            Console.WriteLine("--- SQL to Excel Exporter v0.2.1");
             Console.WriteLine("--- Copyright (c) Born SQL");
             Console.WriteLine("--- Written by Randolph West and other contributors. https://bornsql.ca/.");
             Console.WriteLine();

sql2xls/scripts/sp_Blitz.sql

@@ -1 +1 @@
-exec sp_Blitz
+exec sp_Blitz;