Skip to content

Commit e785713

Browse files
committed
Merge fix
1 parent 2169d2b commit e785713

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

src/Tests/ApprovalFiles/NoPublicApiChanges.Run.approved.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[assembly: System.CLSCompliantAttribute(true)]
1+
[assembly: System.CLSCompliantAttribute(false)]
22
[assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
33
[assembly: System.Runtime.InteropServices.GuidAttribute("5ddc04cc-0bd3-421e-9ae4-9fd0e4f4ef04")]
44

@@ -20,6 +20,7 @@ namespace DbUp.Postgresql
2020
public class PostgresqlConnectionManager : DbUp.Engine.Transactions.DatabaseConnectionManager, DbUp.Engine.Transactions.IConnectionManager
2121
{
2222
public PostgresqlConnectionManager(string connectionString) { }
23+
public PostgresqlConnectionManager(Npgsql.NpgsqlDataSource datasource) { }
2324
public PostgresqlConnectionManager(string connectionString, System.Security.Cryptography.X509Certificates.X509Certificate2 certificate) { }
2425
public override System.Collections.Generic.IEnumerable<string> SplitScriptIntoCommands(string scriptContents) { }
2526
}

src/dbup-postgresql/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
using System.Runtime.InteropServices;
33

44
[assembly: ComVisible(false)]
5-
6-
#if (NETSTANDARD2_0_OR_GREATER || NET462_OR_GREATER)
75
// Npgsql is not CLS compliant and PostgresqlConnectionManager exposes types like NpgsqlDataSource
86
[assembly: CLSCompliant(false)]
9-
#else
10-
[assembly: CLSCompliant(true)]
11-
#endif
12-
137
// The following GUID is for the ID of the typelib if this project is exposed to COM
148
[assembly: Guid("5ddc04cc-0bd3-421e-9ae4-9fd0e4f4ef04")]

0 commit comments

Comments
 (0)