migrate to net6.0

nuetzliches · Nov 20, 2023 · 3972248 · 3972248
1 parent fed31c0
commit 3972248
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -77,7 +77,7 @@ public Task<List<UserList>> ListAsync(CancellationToken cancellationToken = defa
 
 # Required .NET Core Packages for Web-API
 
-- System.Data.SqlClient
+- Microsoft.Data.SqlClient
 - Microsoft.Extensions.Configuration
 
 # Installation

diff --git a/src/DataContext/DbContext.cs b/src/DataContext/DbContext.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;

diff --git a/src/DataContext/Queries/SchemaQueries.cs b/src/DataContext/Queries/SchemaQueries.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Threading;
 using System.Threading.Tasks;
 using SpocR.DataContext.Models;

diff --git a/src/DataContext/Queries/StoredProcedureQueries.cs b/src/DataContext/Queries/StoredProcedureQueries.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Threading;
 using System.Threading.Tasks;
 using SpocR.DataContext.Models;

diff --git a/src/DataContext/Queries/TableTypeQueries.cs b/src/DataContext/Queries/TableTypeQueries.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Threading;
 using System.Threading.Tasks;
 using SpocR.DataContext.Models;

diff --git a/src/DataContext/SqlDataReaderExtensions.cs b/src/DataContext/SqlDataReaderExtensions.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Linq;
 using System.Reflection;
 using SpocR.DataContext.Attributes;

diff --git a/src/Models/ConfigurationModel.cs b/src/Models/ConfigurationModel.cs
@@ -12,7 +12,7 @@ public class GlobalConfigurationModel : IVersioned
     {
         [JsonConverter(typeof(StringVersionConverter)), WriteProtectedBySystem]
         public Version Version { get; set; }
-        public string TargetFramework { get; set; } = "net5.0"; // Allowed values: null, net5.0
+        public string TargetFramework { get; set; } = "net6.0"; // Allowed values: null, net6.0
         public string UserId { get; set; }
         public GlobalAutoUpdateConfigurationModel AutoUpdate { get; set; } = new GlobalAutoUpdateConfigurationModel { Enabled = true, LongPauseInMinutes = 1440, ShortPauseInMinutes = 15 };
         public List<GlobalProjectConfigurationModel> Projects { get; set; } = new List<GlobalProjectConfigurationModel>();
@@ -37,7 +37,7 @@ public class ConfigurationModel : IVersioned
     {
         [JsonConverter(typeof(StringVersionConverter))]
         public Version Version { get; set; }
-        public string TargetFramework { get; set; } = "net5.0"; // Allowed values: null, net5.0
+        public string TargetFramework { get; set; } = "net6.0"; // Allowed values: null, net6.0
         public ProjectModel Project { get; set; }
         public List<SchemaModel> Schema { get; set; }
     }

diff --git a/src/Output-v5-0/DataContext/AppDbContext.base.cs b/src/Output-v5-0/DataContext/AppDbContext.base.cs
@@ -3,7 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;

diff --git a/src/Output-v5-0/DataContext/AppDbContextExtensions.base.cs b/src/Output-v5-0/DataContext/AppDbContextExtensions.base.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Linq;
 using System.Text;
 using System.Threading;

diff --git a/src/Output-v5-0/DataContext/SqlDataReaderExtensions.base.cs b/src/Output-v5-0/DataContext/SqlDataReaderExtensions.base.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Linq;
 using System.Reflection;
 

diff --git a/src/Output-v5-0/DataContext/SqlParameterExtensions.base.cs b/src/Output-v5-0/DataContext/SqlParameterExtensions.base.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Linq;
 using System.Reflection;
 using Source.DataContext.Outputs;

diff --git a/src/Output-v5-0/DataContext/StoredProcedures/StoredProcedureExtensions.cs b/src/Output-v5-0/DataContext/StoredProcedures/StoredProcedureExtensions.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Threading;
 using System.Threading.Tasks;
 using Source.DataContext.Models;

diff --git a/src/Output/DataContext/AppDbContext.base.cs b/src/Output/DataContext/AppDbContext.base.cs
@@ -3,7 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;

diff --git a/src/Output/DataContext/AppDbContextExtensions.base.cs b/src/Output/DataContext/AppDbContextExtensions.base.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Linq;
 using System.Text;
 using System.Threading;

diff --git a/src/Output/DataContext/SqlDataReaderExtensions.base.cs b/src/Output/DataContext/SqlDataReaderExtensions.base.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Linq;
 using System.Reflection;
 

diff --git a/src/Output/DataContext/SqlParameterExtensions.base.cs b/src/Output/DataContext/SqlParameterExtensions.base.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Linq;
 using System.Reflection;
 using Source.DataContext.Outputs;

diff --git a/src/Output/DataContext/StoredProcedures/StoredProcedureExtensions.cs b/src/Output/DataContext/StoredProcedures/StoredProcedureExtensions.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Threading;
 using System.Threading.Tasks;
 using Source.DataContext.Models;

diff --git a/src/Services/SpocrService.cs b/src/Services/SpocrService.cs
@@ -19,7 +19,7 @@ public GlobalConfigurationModel GetGlobalDefaultConfiguration()
             return new GlobalConfigurationModel
             {
                 Version = Version,
-                TargetFramework = "net5.0",
+                TargetFramework = "net6.0",
                 AutoUpdate = new GlobalAutoUpdateConfigurationModel
                 {
                     Enabled = true,
@@ -30,7 +30,7 @@ public GlobalConfigurationModel GetGlobalDefaultConfiguration()
             };
         }
 
-        public ConfigurationModel GetDefaultConfiguration(string targetFramework = "net5.0", string appNamespace = "", string connectionString = "", ERoleKind roleKind = default, string libNamespace = null /*, EIdentityKind identityKind = default */)
+        public ConfigurationModel GetDefaultConfiguration(string targetFramework = "net6.0", string appNamespace = "", string connectionString = "", ERoleKind roleKind = default, string libNamespace = null /*, EIdentityKind identityKind = default */)
         {
             var role = new RoleModel
             {

diff --git a/src/SpocR.csproj b/src/SpocR.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Label="Build">
-    <Version>3.1.14</Version>    
-    <TargetFramework>net5.0</TargetFramework>
+    <Version>3.2.1</Version>    
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup Label="Package References">
@@ -20,7 +20,7 @@
     <ToolCommandName>spocr</ToolCommandName>
     <PackAsTool>True</PackAsTool>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -48,7 +48,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.2" />
   </ItemGroup>
 
 </Project>