Add .NET 7 support (#305)

build/common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
-    <Version>3.2.0-alpha2</Version>
-    <AssemblyVersion>3.1.0.0</AssemblyVersion>
-    <FileVersion>3.1.0.0</FileVersion>
+    <Version>3.2.0</Version>
+    <AssemblyVersion>3.2.0.0</AssemblyVersion>
+    <FileVersion>3.2.0.0</FileVersion>
   </PropertyGroup>
 </Project>

src/Evolve.Cli/Evolve.Cli.csproj

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <PublishTrimmed>true</PublishTrimmed>
     <RootNamespace>EvolveDb.Cli</RootNamespace>
   </PropertyGroup>

src/Evolve.Tool/Evolve.Tool.csproj

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>evolve</ToolCommandName>
     <RootNamespace>EvolveDb.Tool</RootNamespace>
@@ -24,7 +24,8 @@ Every time you build your project, it will automatically ensure that your databa
     <PackageTags>evolve flyway dotnet tool sql database migration mysql sqlserver cassandra mariadb sqlite postgresql cockroachdb</PackageTags>
     <PackageReleaseNotes>## Features
 - #293 Add timeout for ambient transactions
-- #189 Enabled use of Evolve CLI/Tool Placeholders with ':' in their value</PackageReleaseNotes>
+- #189 Enabled use of Evolve CLI/Tool Placeholders with ':' in their value
+- Add .NET 7 support, drop .NET 5 support</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>

src/Evolve/Evolve.csproj

@@ -2,7 +2,7 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net7.0</TargetFrameworks>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <LangVersion>latest</LangVersion>

test/Evolve.Tests/Cli/CliTest.cs

@@ -2,54 +2,38 @@
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
+using System.Threading.Tasks;
 using EvolveDb.Tests.Infrastructure;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace EvolveDb.Tests.Cli
 {
-    [Collection("Database collection")]
     public class CliTest
     {
-        private readonly PostgreSqlFixture _pgContainer;
-        private readonly MySQLFixture _mySQLContainer;
-        private readonly SQLServerFixture _sqlServerContainer;
-        private readonly CassandraFixture _cassandraContainer;
-        private readonly CockroachDBFixture _cockroachDBContainer;
         private readonly ITestOutputHelper _output;
 
-        public CliTest(PostgreSqlFixture pgContainer, MySQLFixture mySQLContainer, SQLServerFixture sqlServerContainer, CassandraFixture cassandraContainer, CockroachDBFixture cockroachDBContainer, ITestOutputHelper output)
+        public CliTest(ITestOutputHelper output)
         {
-            _pgContainer = pgContainer;
-            _mySQLContainer = mySQLContainer;
-            _sqlServerContainer = sqlServerContainer;
-            _cassandraContainer = cassandraContainer;
-            _cockroachDBContainer = cockroachDBContainer;
             _output = output;
-
-            if (TestContext.Local || TestContext.AzureDevOps)
-            {
-                pgContainer.Run();
-                sqlServerContainer.Run();
-                cassandraContainer.Run();
-                cockroachDBContainer.Run();
-                if (TestContext.Local)
-                {
-                    mySQLContainer.Run();
-                }
-            }
         }
 
         [FactSkippedOnAppVeyor]
         [Category(Test.Cli, Test.CockroachDB)]
-        public void CockroachDB_Should_Run_All_Cli_Commands()
+        public async Task CockroachDB_Should_Run_All_Cli_Commands()
         {
+            var container = new CockroachDBContainer();
+            if (TestContext.Local || TestContext.AzureDevOps)
+            {
+                await container.Start();
+            }
+
             foreach (var command in new[] { "erase", "migrate", "repair", "info" })
             {
                 string stderr = RunCli(
                     db: "cockroachdb",
                     command: command,
-                    cnxStr: _cockroachDBContainer.CnxStr,
+                    cnxStr: container.CnxStr,
                     location: TestContext.CockroachDB.MigrationFolder,
                     args: "-s evolve -s defaultdb");
 
@@ -59,16 +43,22 @@ public void CockroachDB_Should_Run_All_Cli_Commands()
 
         [FactSkippedOnAppVeyor]
         [Category(Test.Cli, Test.Cassandra)]
-        public void Cassandra_Should_Run_All_Cli_Commands()
+        public async Task Cassandra_Should_Run_All_Cli_Commands()
         {
+            var container = new CassandraContainer();
+            if (TestContext.Local || TestContext.AzureDevOps)
+            {
+                await container.Start();
+            }
+
             string metadataKeyspaceName = "my_keyspace_3";
 
             foreach (var command in new[] { "erase", "migrate", "repair", "info" })
             {
                 string stderr = RunCli(
                     db: "cassandra",
                     command: command,
-                    cnxStr: _cassandraContainer.CnxStr,
+                    cnxStr: container.CnxStr,
                     location: TestContext.CassandraDb.MigrationFolder,
                     args: $"--scripts-suffix .cql -p keyspace:{metadataKeyspaceName} --keyspace {metadataKeyspaceName} --metadata-table-keyspace evolve_change_log");
 
@@ -78,14 +68,20 @@ public void Cassandra_Should_Run_All_Cli_Commands()
 
         [Fact]
         [Category(Test.Cli, Test.MySQL)]
-        public void MySQL_With_Embedded_Resources_Should_Run_All_Cli_Commands()
+        public async Task MySQL_With_Embedded_Resources_Should_Run_All_Cli_Commands()
         {
+            var container = new MySQLContainer();
+            if (TestContext.Local || TestContext.AzureDevOps)
+            {
+                await container.Start();
+            }
+
             foreach (var command in new[] { "erase", "migrate", "repair", "info" })
             {
                 string stderr = RunCli(
                     db: "mysql",
                     command: command,
-                    cnxStr: _mySQLContainer.CnxStr,
+                    cnxStr: container.CnxStr,
                     location: null,
                     args: $"-a Evolve.Tests.dll -f {TestContext.MySQL.MigrationFolderFilter}");
 
@@ -95,34 +91,46 @@ public void MySQL_With_Embedded_Resources_Should_Run_All_Cli_Commands()
 
         [Fact]
         [Category(Test.Cli, Test.PostgreSQL)]
-        public void PostgreSql_Should_Run_All_Cli_Commands()
+        public async Task PostgreSql_Should_Run_All_Cli_Commands()
         {
-            foreach (var command in new [] { "erase", "migrate", "repair", "info" })
+            var container = new PostgreSqlContainer();
+            if (TestContext.Local || TestContext.AzureDevOps)
+            {
+                await container.Start();
+            }
+
+            foreach (var command in new[] { "erase", "migrate", "repair", "info" })
             {
                 string stderr = RunCli(
                     db: "postgresql",
                     command: command,
-                    cnxStr: _pgContainer.CnxStr.Replace(PostgreSqlContainer.DbPwd, "${pwd}"), // add secret to the connection string
+                    cnxStr: container.CnxStr.Replace(PostgreSqlContainer.DbPwd, "${pwd}"), // add secret to the connection string
                     location: TestContext.PostgreSQL.MigrationFolder,
-                    args: $"-s public -s unittest --metadata-table-schema unittest --erase-disabled false -p schema1:unittest -p pwd;{PostgreSqlContainer.DbPwd}");
+                    args: $"-s public -s unittest --metadata-table-schema unittest --erase-disabled false -p schema1:unittest -p pwd:{PostgreSqlContainer.DbPwd}");
 
                 Assert.True(string.IsNullOrEmpty(stderr), stderr);
             }
         }
 
         [Fact]
         [Category(Test.Cli, Test.SQLServer)]
-        public void SQLServer_Should_Run_All_Cli_Commands()
+        public async Task SQLServer_Should_Run_All_Cli_Commands()
         {
+            var container = new SQLServerContainer();
+            if (TestContext.Local || TestContext.AzureDevOps)
+            {
+                await container.Start();
+            }
+
             string dbName = "my_database_3";
-            TestUtil.CreateSqlServerDatabase(dbName, _sqlServerContainer.GetCnxStr("master"));
+            TestUtil.CreateSqlServerDatabase(dbName, container.CnxStr);
 
             foreach (var command in new[] { "erase", "migrate", "repair", "info" })
             {
                 string stderr = RunCli(
                     db: "sqlserver",
                     command: command,
-                    cnxStr: _sqlServerContainer.GetCnxStr(dbName),
+                    cnxStr: container.CnxStr,
                     location: TestContext.SqlServer.MigrationFolder,
                     args: $"-p db:{dbName} -p schema2:dbo --target-version 8_9");
 

test/Evolve.Tests/Connection/WrappedConnectionTest.cs

@@ -7,24 +7,8 @@
 
 namespace EvolveDb.Tests.Connection
 {
-    [Collection("PostgreSql collection")]
-    public class WrappedConnectionTest
+    public record WrappedConnectionTest : DbContainerFixture<PostgreSqlContainer>
     {
-        private static PostgreSqlFixture _pgContainer;
-
-        public WrappedConnectionTest(PostgreSqlFixture pgContainer)
-        {
-            if (_pgContainer is null)
-            {
-                _pgContainer = pgContainer;
-
-                if (TestContext.Local || TestContext.AzureDevOps)
-                {
-                    pgContainer.Run();
-                }
-            }
-        }
-
         [Fact]
         [Category(Test.Connection)]
         public void Inner_dbconnection_can_not_be_null()
@@ -36,7 +20,7 @@ public void Inner_dbconnection_can_not_be_null()
         [Category(Test.Connection)]
         public void When_disposed_inner_dbconnection_is_closed()
         {
-            var cnn = _pgContainer.CreateDbConnection();
+            var cnn = CreateDbConnection();
             using (var wrappedConnection = new WrappedConnection(cnn))
             {
                 wrappedConnection.Open();
@@ -49,7 +33,7 @@ public void When_disposed_inner_dbconnection_is_closed()
         [Category(Test.Connection)]
         public void Commit_a_null_transaction_throws_InvalidOperationException()
         {
-            var cnn = _pgContainer.CreateDbConnection();
+            var cnn = CreateDbConnection();
             using (var wrappedConnection = new WrappedConnection(cnn))
             {
                 Assert.Throws<InvalidOperationException>(() => wrappedConnection.Commit());
@@ -62,7 +46,7 @@ public void Commit_a_null_transaction_throws_InvalidOperationException()
         [Category(Test.Connection)]
         public void Rollback_a_null_transaction_throws_InvalidOperationException()
         {
-            var cnn = _pgContainer.CreateDbConnection();
+            var cnn = CreateDbConnection();
             using (var wrappedConnection = new WrappedConnection(cnn))
             {
                 Assert.Throws<InvalidOperationException>(() => wrappedConnection.Rollback());
@@ -75,7 +59,7 @@ public void Rollback_a_null_transaction_throws_InvalidOperationException()
         [Category(Test.Connection)]
         public void BeginTransaction_opens_a_connection_and_returns_a_transaction()
         {
-            var cnn = _pgContainer.CreateDbConnection();
+            var cnn = CreateDbConnection();
             using (var wrappedConnection = new WrappedConnection(cnn))
             {
                 var tx = wrappedConnection.BeginTransaction();

test/Evolve.Tests/Evolve.Tests.csproj

@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
     <RootNamespace>EvolveDb.Tests</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="altcover" Version="8.4.840" />
+    <PackageReference Include="altcover" Version="8.6.61" />
     <PackageReference Include="CassandraCSharpDriver" Version="3.18.0" />
-    <PackageReference Include="Docker.DotNet" Version="3.125.11" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="Docker.DotNet" Version="3.125.15" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="MySqlConnector" Version="2.1.13" />
     <PackageReference Include="Npgsql" Version="6.0.7" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />

test/Evolve.Tests/Infrastructure/Cassandra/CassandraContainer.cs → test/Evolve.Tests/Infrastructure/CassandraContainer.cs

@@ -1,4 +1,5 @@
 using System.Data.Common;
+using System.Threading.Tasks;
 using Cassandra.Data;
 
 namespace EvolveDb.Tests.Infrastructure
@@ -12,15 +13,14 @@ public class CassandraContainer : IDbContainer
         public const string DbUser = "postgres";
 
         private DockerContainer _container;
-        private bool _disposedValue = false;
 
         public string Id => _container?.Id;
         public string CnxStr => $"Contact Points=127.0.0.1;Port={HostPort};Cluster Name={ClusterName}";
         public int TimeOutInSec => 60;
 
-        public bool Start(bool fromScratch = false)
+        public async Task<bool> Start(bool fromScratch = false)
         {
-            _container = new DockerContainerBuilder(new DockerContainerBuilderOptions
+            _container = await new DockerContainerBuilder(new DockerContainerBuilderOptions
             {
                 FromImage = "cassandra",
                 Tag = "latest",
@@ -31,27 +31,9 @@ public bool Start(bool fromScratch = false)
                 RemovePreviousContainer = fromScratch
             }).Build();
 
-            return _container.Start();
+            return await _container.Start();
         }
 
         public DbConnection CreateDbConnection() => new CqlConnection(CnxStr);
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!_disposedValue)
-            {
-                if (disposing)
-                {
-                    _container?.Dispose();
-                }
-
-                _disposedValue = true;
-            }
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-        }
     }
 }