From 865942f5dcb1bbbd7962300594934d0b782706c0 Mon Sep 17 00:00:00 2001
From: "Greg Divis, Inedo" <gdivis@inedo.com>
Date: Wed, 7 Apr 2021 10:57:25 -0400
Subject: [PATCH] update Sql Server client library and minor code cleanup

---
 inedosql/EmbeddedScripts.cs       |  2 +-
 inedosql/Script.cs                |  2 +-
 inedosql/SqlServer/Scripts.cs     | 14 +++++++-------
 inedosql/SqlServer/SqlSplitter.cs |  2 +-
 inedosql/inedosql.csproj          |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/inedosql/EmbeddedScripts.cs b/inedosql/EmbeddedScripts.cs
index 0430ee0..70ca7dd 100644
--- a/inedosql/EmbeddedScripts.cs
+++ b/inedosql/EmbeddedScripts.cs
@@ -7,7 +7,7 @@ namespace Inedo.DbUpdater
 {
     internal static class EmbeddedScripts
     {
-        private static readonly Lazy<IReadOnlyCollection<Script>> scriptsIfAvailable = new Lazy<IReadOnlyCollection<Script>>(ReadScripts);
+        private static readonly Lazy<IReadOnlyCollection<Script>> scriptsIfAvailable = new(ReadScripts);
 
         public static IReadOnlyCollection<Script> All => scriptsIfAvailable.Value;
         public static bool Available => scriptsIfAvailable.Value != null;
diff --git a/inedosql/Script.cs b/inedosql/Script.cs
index a175ad8..b4e4eeb 100644
--- a/inedosql/Script.cs
+++ b/inedosql/Script.cs
@@ -10,7 +10,7 @@ namespace Inedo.DbUpdater
 {
     internal sealed class Script : IComparable<Script>, IEquatable<Script>
     {
-        private static readonly Regex ScriptIdRegex = new Regex(@"^--\s*AH:(?<1>.+)\n", RegexOptions.Compiled | RegexOptions.ExplicitCapture);
+        private static readonly Regex ScriptIdRegex = new(@"^--\s*AH:(?<1>.+)\n", RegexOptions.Compiled | RegexOptions.ExplicitCapture);
 
         public Script(string fileName, string scriptText)
         {
diff --git a/inedosql/SqlServer/Scripts.cs b/inedosql/SqlServer/Scripts.cs
index 8b6ef2b..09f4d3d 100644
--- a/inedosql/SqlServer/Scripts.cs
+++ b/inedosql/SqlServer/Scripts.cs
@@ -6,13 +6,13 @@ namespace Inedo.DbUpdater.SqlServer
 {
     internal static class Scripts
     {
-        private static readonly Lazy<string> initialize = new Lazy<string>(() => Read("Initialize.sql"));
-        private static readonly Lazy<string> recordExecution = new Lazy<string>(() => Read("RecordExecution.sql"));
-        private static readonly Lazy<string> updateExecution = new Lazy<string>(() => Read("UpdateExecution.sql"));
-        private static readonly Lazy<string> readV1Scripts = new Lazy<string>(() => Read("ReadV1Scripts.sql"));
-        private static readonly Lazy<string> migrateV2toV3 = new Lazy<string>(() => Read("MigrateV2toV3.sql"));
-        private static readonly Lazy<string> resolveError = new Lazy<string>(() => Read("ResolveError.sql"));
-        private static readonly Lazy<string> resolveAllErrors = new Lazy<string>(() => Read("ResolveAllErrors.sql"));
+        private static readonly Lazy<string> initialize = new(() => Read("Initialize.sql"));
+        private static readonly Lazy<string> recordExecution = new(() => Read("RecordExecution.sql"));
+        private static readonly Lazy<string> updateExecution = new(() => Read("UpdateExecution.sql"));
+        private static readonly Lazy<string> readV1Scripts = new(() => Read("ReadV1Scripts.sql"));
+        private static readonly Lazy<string> migrateV2toV3 = new(() => Read("MigrateV2toV3.sql"));
+        private static readonly Lazy<string> resolveError = new(() => Read("ResolveError.sql"));
+        private static readonly Lazy<string> resolveAllErrors = new(() => Read("ResolveAllErrors.sql"));
 
         public static string Initialize => initialize.Value;
         public static string RecordExecution => recordExecution.Value;
diff --git a/inedosql/SqlServer/SqlSplitter.cs b/inedosql/SqlServer/SqlSplitter.cs
index 0860318..3082d42 100644
--- a/inedosql/SqlServer/SqlSplitter.cs
+++ b/inedosql/SqlServer/SqlSplitter.cs
@@ -5,7 +5,7 @@ namespace Inedo.DbUpdater.SqlServer
 {
     internal static class SqlSplitter
     {
-        private static readonly Regex GoRegex = new Regex(@"^\s*GO\s*$", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
+        private static readonly Regex GoRegex = new(@"^\s*GO\s*$", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
 
         /// <summary>
         /// Returns a collection of the SQL scripts in a string separated by canonical GO statements.
diff --git a/inedosql/inedosql.csproj b/inedosql/inedosql.csproj
index c2270be..dbac1b1 100644
--- a/inedosql/inedosql.csproj
+++ b/inedosql/inedosql.csproj
@@ -11,7 +11,7 @@
     <Reference Include="System.IO.Compression" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework)=='net5.0'">
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="SqlServer\Scripts\*.sql" />