Updated solution to .net8.0 and Microsoft.Data.SqlClient.

MiracleDevs · Mar 14, 2024 · a96312d · a96312d
1 parent 07a6885
commit a96312d
Show file tree

Hide file tree

Showing 17 changed files with 59 additions and 52 deletions.
diff --git a/README.md b/README.md
@@ -67,6 +67,12 @@ $ docker-compose down
 
 ## Change log
 
+Version `5.0.0`:
+- Changed .NET Standard libraries to .NET 8.0.
+- Updated dependencies to latest versions.
+- Migrated SQL Server connector to use `Microsoft.Data.SqlClient` vs `System.Data.SqlClient`. This will bring a lot of new security options to connect to Azure Entra ID, and a lot of security fixes and validations.
+  > **IMPORTANT**: This is a breaking change. If you were using the SqlServer connector, your connection strings will probably require some updates, to use either one of several options provided within Azure, or to use proper certificates and encryption.
+
 Version `4.0.1`:
 
 - Updated dependencies to latest versions.

diff --git a/build/publish.runtime.sh b/build/publish.runtime.sh
@@ -12,27 +12,36 @@ index=$4
 noclsArg=$5
 deployDir=../.deploy/$tool
 distDir=../dist
-ubuntu16=ubuntu.16.04-x64
 zipFile="$tool.$runtime.tar.gz"
-
-if [[ "$tool" == "" ]]; then error "Missing tool name." ; buildFailed ; fi
-if [[ "$toolProject" == "" ]]; then error "Missing tool path." ; buildFailed ; fi
-if [[ "$runtime" == "" ]]; then error "Missing runtime version." ; buildFailed ; fi
-if [[ "$index" == "" ]]; 	then index="1";fi
-if [[ "$noclsArg" == "" ]]; then clear;fi
-if [[ "$runtime" == "" ]]; 	then buildFailed;fi
-if [ ! -d "$distDir" ]; 	then mkdir $distDir;fi
+framework=net8.0
+
+if [[ "$tool" == "" ]]; then
+    error "Missing tool name."
+    buildFailed
+fi
+if [[ "$toolProject" == "" ]]; then
+    error "Missing tool path."
+    buildFailed
+fi
+if [[ "$runtime" == "" ]]; then
+    error "Missing runtime version."
+    buildFailed
+fi
+if [[ "$index" == "" ]]; then index="1"; fi
+if [[ "$noclsArg" == "" ]]; then clear; fi
+if [[ "$runtime" == "" ]]; then buildFailed; fi
+if [ ! -d "$distDir" ]; then mkdir $distDir; fi
 
 block "$index - PUBLISH AND ZIP $tool FOR $C_CYAN $runtime $C_TRANSPARENT"
 
 execute "rm -rf $deployDir/$runtime/"
 
-execute "dotnet publish $toolProject -c Release -f net7.0 -r $runtime --self-contained -o $deployDir/$runtime/ -v q"
+execute "dotnet publish $toolProject -c Release -f $framework -r $runtime --self-contained -o $deployDir/$runtime/ -v q"
 
 execute "rm -rf $distDir/$zipFile"
 
-pushd $deployDir/$runtime/
+pushd "$deployDir/$runtime/" || exit
 execute "tar -zcvf ../../$distDir/$zipFile ./" "gzip $distDir/$zipFile"
-popd
+popd || exit
 
-buildSuccessfully
+buildSuccessfully
diff --git a/src/Paradigm.ORM.Data.Cassandra/Paradigm.ORM.Data.Cassandra.csproj b/src/Paradigm.ORM.Data.Cassandra/Paradigm.ORM.Data.Cassandra.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
-        <Version>4.0.1</Version>
+        <TargetFramework>net8.0</TargetFramework>
+        <Version>5.0.0</Version>
         <Authors>Miracle Devs</Authors>
         <Company>Miracle Devs</Company>
         <Product>Paradigm.ORM</Product>
@@ -20,7 +20,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="CassandraCSharpDriver" Version="3.19.5" />
+        <PackageReference Include="CassandraCSharpDriver" Version="3.20.1" />
         <PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
         <PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
         <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />

diff --git a/src/Paradigm.ORM.Data.MySql/Paradigm.ORM.Data.MySql.csproj b/src/Paradigm.ORM.Data.MySql/Paradigm.ORM.Data.MySql.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
         <PackageProjectUrl>http://www.paradigm.net.co/</PackageProjectUrl>
         <Copyright>Miracle Devs</Copyright>
@@ -12,15 +12,15 @@
         <RepositoryType>git</RepositoryType>
         <Authors>Miracle Devs</Authors>
         <Company>Miracle Devs</Company>
-        <Version>4.0.1</Version>
+        <Version>5.0.0</Version>
         <Product>Paradigm.ORM</Product>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageTags>Paradigm;ORM;MySql;Database</PackageTags>
         <Title>Paradigm ORM MySql Connector</Title>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="MySqlConnector" Version="2.3.1" />
+        <PackageReference Include="MySqlConnector" Version="2.3.5" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Paradigm.ORM.Data.PostgreSql/Paradigm.ORM.Data.PostgreSql.csproj b/src/Paradigm.ORM.Data.PostgreSql/Paradigm.ORM.Data.PostgreSql.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Description>Paradigm ORM Posgre Connector library.</Description>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageIcon>icon.png</PackageIcon>
@@ -11,7 +11,7 @@
         <Company>Miracle Devs</Company>
         <Copyright>Miracle Devs</Copyright>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Version>4.0.1</Version>
+        <Version>5.0.0</Version>
         <Product>Paradigm.ORM</Product>
         <Title>Paradigm ORM PostgreSql Connector</Title>
         <PackageReadmeFile>README.md</PackageReadmeFile>

diff --git a/src/Paradigm.ORM.Data.SqlServer/Paradigm.ORM.Data.SqlServer.csproj b/src/Paradigm.ORM.Data.SqlServer/Paradigm.ORM.Data.SqlServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
         <PackageProjectUrl>http://www.paradigm.net.co/</PackageProjectUrl>
         <Copyright>Miracle Devs</Copyright>
@@ -12,15 +12,15 @@
         <PackageIcon>icon.png</PackageIcon>
         <RepositoryUrl>https://github.com/MiracleDevs/Paradigm.ORM.git</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
-        <Version>4.0.1</Version>
+        <Version>5.0.0</Version>
         <Product>Paradigm.ORM</Product>
         <Title>Paradigm ORM SqlServer Connector</Title>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageTags>Paradigm;ORM;SqlServer;TSQL;Database</PackageTags>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
+        <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Paradigm.ORM.Data.SqlServer/SqlDatabaseCommand.cs b/src/Paradigm.ORM.Data.SqlServer/SqlDatabaseCommand.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 Paradigm.ORM.Data.Converters;
 using Paradigm.ORM.Data.Database;

diff --git a/src/Paradigm.ORM.Data.SqlServer/SqlDatabaseConnector.cs b/src/Paradigm.ORM.Data.SqlServer/SqlDatabaseConnector.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 Paradigm.ORM.Data.CommandBuilders;
 using Paradigm.ORM.Data.Converters;

diff --git a/src/Paradigm.ORM.Data.SqlServer/SqlDatabaseReader.cs b/src/Paradigm.ORM.Data.SqlServer/SqlDatabaseReader.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.IO;
 using Paradigm.ORM.Data.Database;
 

diff --git a/src/Paradigm.ORM.Data.SqlServer/SqlDatabaseTransaction.cs b/src/Paradigm.ORM.Data.SqlServer/SqlDatabaseTransaction.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using Paradigm.ORM.Data.Database;
 
 namespace Paradigm.ORM.Data.SqlServer

diff --git a/src/Paradigm.ORM.Data/Paradigm.ORM.Data.csproj b/src/Paradigm.ORM.Data/Paradigm.ORM.Data.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
         <Copyright>Miracle Devs</Copyright>
         <PackageProjectUrl>http://www.paradigm.net.co/</PackageProjectUrl>
-        <Description>Paradigm ORM data library. 
+        <Description>Paradigm ORM data library.
 This library contains the core agnostic elements, and it's implemented in every specific connector package.</Description>
         <PostBuildEvent></PostBuildEvent>
         <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
@@ -15,7 +15,7 @@ This library contains the core agnostic elements, and it's implemented in every
         <RepositoryType>git</RepositoryType>
         <Authors>Miracle Devs</Authors>
         <Company>Miracle Devs</Company>
-        <Version>4.0.1</Version>
+        <Version>5.0.0</Version>
         <Product>Paradigm.ORM</Product>
         <Title>Paradigm ORM Data</Title>
         <PackageReadmeFile>README.md</PackageReadmeFile>

diff --git a/src/Paradigm.ORM.DataExport/Paradigm.ORM.DataExport.csproj b/src/Paradigm.ORM.DataExport/Paradigm.ORM.DataExport.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ApplicationIcon>dataexport.ico</ApplicationIcon>
     <StartupObject>Paradigm.ORM.DataExport.Program</StartupObject>
     <AssemblyName>dataexport</AssemblyName>

diff --git a/src/Paradigm.ORM.DbFirst/Paradigm.ORM.DbFirst.csproj b/src/Paradigm.ORM.DbFirst/Paradigm.ORM.DbFirst.csproj
@@ -2,20 +2,16 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>dbfirst.ico</ApplicationIcon>
     <OutputTypeEx>exe</OutputTypeEx>
     <StartupObject>Paradigm.ORM.DbFirst.Program</StartupObject>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <RuntimeIdentifiers>win10-x64;ubuntu.16.04-x64</RuntimeIdentifiers>
     <AssemblyName>dbfirst</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="12.0.1" />
+    <PackageReference Include="AutoMapper" Version="13.0.1" />
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="8.0.0" />

diff --git a/src/Paradigm.ORM.DbPublisher/Paradigm.ORM.DbPublisher.csproj b/src/Paradigm.ORM.DbPublisher/Paradigm.ORM.DbPublisher.csproj
@@ -2,15 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>dbpublisher.ico</ApplicationIcon>
     <OutputTypeEx>exe</OutputTypeEx>
     <StartupObject>Paradigm.ORM.DbPublisher.Program</StartupObject>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <RuntimeIdentifiers>win10-x64;ubuntu.16.04-x64</RuntimeIdentifiers>
     <AssemblyName>dbpublisher</AssemblyName>
   </PropertyGroup>
 

diff --git a/src/Paradigm.ORM.Tests/Fixtures/ConnectionStrings.cs b/src/Paradigm.ORM.Tests/Fixtures/ConnectionStrings.cs
@@ -8,6 +8,6 @@ public class ConnectionStrings
 
         public const string PSql = "Server=127.0.0.1;User Id=postgres;Password=Paradigm_Test_1234;Timeout=3;Database=test";
 
-        public const string MsSql = "Server=127.0.0.1;User=sa;Password=Paradigm_Test_1234;Connection Timeout=3600";
+        public const string MsSql = "Server=127.0.0.1;User=sa;Password=Paradigm_Test_1234;Connection Timeout=3600;Encrypt=false";
     }
 }
diff --git a/src/Paradigm.ORM.Tests/Paradigm.ORM.Tests.csproj b/src/Paradigm.ORM.Tests/Paradigm.ORM.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>    
-    <TargetFramework>net6.0</TargetFramework>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,9 +18,9 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="Paradigm.Core.Mapping" Version="3.0.0" />
-    <PackageReference Include="NUnit" Version="4.0.1" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 

diff --git a/src/Paradigm.ORM.Vb.Tests/Paradigm.ORM.Vb.Tests.vbproj b/src/Paradigm.ORM.Vb.Tests/Paradigm.ORM.Vb.Tests.vbproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
   </ItemGroup>
 
   <ItemGroup>