Merge branch 'release/9.2.0'

Author: AGiorgetti

Changelog.md

@@ -1,5 +1,14 @@
 # NEventStore.Persistence.Sql
 
+## 9.2.0
+
+- Using Microsoft.Data.SqlClient instead of System.Data.SqlClient [#40](https://github.com/NEventStore/NEventStore.Persistence.SQL/issues/40)
+
+### Breaking Change
+
+- System.Data.SqlClient is not supported anymore.
+- To properly update to Microsoft.Data.SqlClient follow the guirelines in [SqlClient porting cheat sheet](https://github.com/dotnet/SqlClient/blob/main/porting-cheat-sheet.md).
+
 ## 9.1.2
 
 - fixed .nuspec file (wrong net462 references)

LICENSE renamed to LICENSE.txt

@@ -60,7 +60,7 @@ To build the project locally on a Windows Machine:
 - Define the following environment variables:
 
   ```
-  NEventStore.MsSql="Server=localhost,50001;Database=NEventStore;User Id=sa;Password=Password1;"
+  NEventStore.MsSql="Server=localhost,50001;Database=NEventStore;User Id=sa;Password=Password1;TrustServerCertificate=True;"
   NEventStore.MySql="Server=localhost;Port=50003;Database=NEventStore;Uid=sa;Pwd=Password1;AutoEnlist=false;"
   NEventStore.PostgreSql="Server=localhost;Port=50004;Database=NEventStore;Uid=sa;Pwd=Password1;Enlist=false;"
   NEventStore.Oracle="Data Source=localhost:1521/XE;User Id=system;Password=Password1;Persist Security Info=True;"

README.md

@@ -11,7 +11,7 @@ DockerComposeDown.ps1
 
 ## Docker Environment Variables
 
-NEventStore.MsSql="Server=localhost,50001;Database=NEventStore;User Id=sa;Password=Password1;"
+NEventStore.MsSql="Server=localhost,50001;Database=NEventStore;User Id=sa;Password=Password1;TrustServerCertificate=True;"
 NEventStore.MongoDB="mongodb://localhost:50002/NEventStore"
 NEventStore.MySql="Server=localhost;Port=50003;Database=NEventStore;Uid=sa;Pwd=Password1;AutoEnlist=false;"
 NEventStore.PostgreSql="Server=localhost;Port=50004;Database=NEventStore;Uid=sa;Pwd=Password1;Enlist=false;"

docker/Readme.md

@@ -1,7 +1,28 @@
-[*]
+[*]
+
 end_of_line = crlf
-indent_style = space
-indent_size = 4
+indent_style = tab
+trim_trailing_whitespace = true
 
 [*.xml]
-indent_style = space
+
+indent_style = tab
+
+[*.cs]
+
+csharp_new_line_before_open_brace = all
+
+# RCS1229: Use async/await when necessary.
+dotnet_diagnostic.RCS1229.severity = error
+
+# IDE0063: Use simple 'using' statement
+csharp_prefer_simple_using_statement = false
+
+# IDE0090: Use 'new(...)'
+csharp_style_implicit_object_creation_when_type_is_apparent = false
+
+# IDE0290: Use primary constructor
+csharp_style_prefer_primary_constructors = false
+
+# IDE0028: Simplify collection initialization
+dotnet_style_collection_initializer = false

src/.editorconfig

@@ -12,7 +12,9 @@
     <summary>Sql persistence provider for NEventStore.</summary>
     <language>es-US</language>
     <tags>events, event sourcing, cqrs, storage, persistence, database, sql</tags>
-    <!-- 
+		<readme>docs\README.md</readme>
+		<license type="file">LICENSE.txt</license>
+    <!--
     Until this is on develop branch, this version should be the previous version, so it made it compatible
 	with pre-release of the actual version. Ex, if we are on 6.0.0 unstable, dependency from NEventStore should
 	be latest stable version so it can take prerelease of 6.0.0 version.
@@ -23,12 +25,12 @@
       <group targetFramework=".NETFramework4.6.2">
         <dependency id="NEventStore" version="[9.1.1,10.0.0)" exclude="Build,Analyzers"/>
         <dependency id="Microsoft.Extensions.Logging.Abstractions" version="7.0.1" exclude="Build,Analyzers" />
-        <dependency id="System.Data.SqlClient" version="4.8.5" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Data.SqlClient" version="5.2.0" exclude="Build,Analyzers" />
       </group>
       <group targetFramework=".NETStandard2.0">
         <dependency id="NEventStore" version="[9.1.1,10.0.0)" exclude="Build,Analyzers"/>
         <dependency id="Microsoft.Extensions.Logging.Abstractions" version="7.0.1" exclude="Build,Analyzers" />
-        <dependency id="System.Data.SqlClient" version="4.8.5" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Data.SqlClient" version="5.2.0" exclude="Build,Analyzers" />
       </group>
     </dependencies>
     <frameworkAssemblies>
@@ -41,5 +43,7 @@
     <!--<file src="bin\$configuration$\**" target="lib"/>-->
     <file src="..\NEventStore.Persistence.Sql\bin\$configuration$\**\NEventStore.Persistence.Sql.dll" target="lib"/>
     <file src="..\NEventStore.Persistence.Sql\bin\$configuration$\**\NEventStore.Persistence.Sql.xml" target="lib"/>
+		<file src="..\..\README.md" target="docs\" />
+		<file src="..\..\LICENSE.txt" target="" />
   </files>
 </package>

src/.nuget/NEventStore.Persistence.Sql.nuspec

@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <Reference Include="System.Transactions" />

src/NEventStore.Persistence.MsSql.Tests/NEventStore.Persistence.MsSql.Core.Tests.csproj

@@ -2,39 +2,28 @@
 
 namespace NEventStore.Persistence.AcceptanceTests
 {
-    using NEventStore.Persistence.Sql;
-    using NEventStore.Persistence.Sql.SqlDialects;
-    using NEventStore.Serialization;
-    using System.Data.SqlClient;
-    using System.Transactions;
+	using NEventStore.Persistence.Sql;
+	using NEventStore.Persistence.Sql.SqlDialects;
+	using NEventStore.Serialization;
+	using System.Transactions;
 
-    public partial class PersistenceEngineFixture
-    {
-        /// <summary>
-        /// this mimic the current NEventStore default values which is run outside any transaction (creates a scope that
-        /// suppresses any transaction)
-        /// </summary>
-        public TransactionScopeOption? ScopeOption { get; set; } = null; // the old default: TransactionScopeOption.Suppress;
+	public partial class PersistenceEngineFixture
+	{
+		/// <summary>
+		/// this mimic the current NEventStore default values which is run outside any transaction (creates a scope that
+		/// suppresses any transaction)
+		/// </summary>
+		public TransactionScopeOption? ScopeOption { get; set; } = null; // the old default: TransactionScopeOption.Suppress;
 
-        public PersistenceEngineFixture()
-        {
-#if NET462
-            _createPersistence = pageSize =>
-                new SqlPersistenceFactory(new EnviromentConnectionFactory("MsSql", "System.Data.SqlClient"),
-                    new BinarySerializer(),
-                    new MsSqlDialect(),
-                    pageSize: pageSize,
-                    scopeOption: ScopeOption
-                    ).Build();
-#else
-            _createPersistence = pageSize =>
-                new SqlPersistenceFactory(new EnviromentConnectionFactory("MsSql", SqlClientFactory.Instance),
-                    new BinarySerializer(),
-                    new MsSqlDialect(),
-                    pageSize: pageSize,
-                    scopeOption: ScopeOption
-                    ).Build();
-#endif
-        }
-    }
+		public PersistenceEngineFixture()
+		{
+			_createPersistence = pageSize =>
+				new SqlPersistenceFactory(new EnviromentConnectionFactory("MsSql", Microsoft.Data.SqlClient.SqlClientFactory.Instance),
+					new BinarySerializer(),
+					new MsSqlDialect(),
+					pageSize: pageSize,
+					scopeOption: ScopeOption
+					).Build();
+		}
+	}
 }