Skip to content

Commit dd362a2

Browse files
committed
Using ValueTuple
1 parent 8cfb711 commit dd362a2

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Provider/src/EntityFramework.Firebird/FbMigrationSqlGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ protected virtual IEnumerable<MigrationStatement> Generate(ProcedureOperation op
589589
}
590590
}
591591

592-
protected Tuple<string, IEnumerable<string>> Generate(ColumnModel column, string tableName)
592+
protected (string, IEnumerable<string>) Generate(ColumnModel column, string tableName)
593593
{
594594
var builder = new StringBuilder();
595595
var additionalCommands = new List<string>();
@@ -631,7 +631,7 @@ protected Tuple<string, IEnumerable<string>> Generate(ColumnModel column, string
631631
additionalCommands.AddRange(identity.Where(x => !string.IsNullOrWhiteSpace(x)));
632632
}
633633

634-
return Tuple.Create(builder.ToString(), additionalCommands.AsEnumerable());
634+
return (builder.ToString(), additionalCommands);
635635
}
636636

637637
protected string Generate(ParameterModel parameter)

Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/SrpClient.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@ public byte[] ClientProof(string user, string password, byte[] authData)
8484
return ClientProof(user, password, salt, serverPublicKey);
8585
}
8686

87-
public Tuple<BigInteger, BigInteger> ServerSeed(string user, string password, byte[] salt)
87+
public (BigInteger, BigInteger) ServerSeed(string user, string password, byte[] salt)
8888
{
8989
var v = BigInteger.ModPow(g, GetUserHash(user, password, salt), N);
9090
var b = GetSecret();
9191
var gb = BigInteger.ModPow(g, b, N);
9292
BigInteger.DivRem(k * v, N, out var kv);
9393
BigInteger.DivRem(BigInteger.Add(kv, gb), N, out var B);
94-
return Tuple.Create(B, b);
94+
return (B, b);
9595
}
9696

9797
public byte[] GetServerSessionKey(string user, string password, byte[] salt, BigInteger A, BigInteger B, BigInteger b)

Provider/src/FirebirdSql.Data.TestsBase/FbTestsSetup.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ public class FbTestsSetup
3535
internal const int PageSize = 16384;
3636
internal const bool ForcedWrite = false;
3737

38-
private static HashSet<Tuple<FbServerType, bool, FbWireCrypt>> _initalized = new HashSet<Tuple<FbServerType, bool, FbWireCrypt>>();
38+
private static HashSet<(FbServerType, bool, FbWireCrypt)> _initalized = new HashSet<(FbServerType, bool, FbWireCrypt)>();
3939

4040
public static void SetUp(FbServerType serverType, bool compression, FbWireCrypt wireCrypt)
4141
{
42-
var item = Tuple.Create(serverType, compression, wireCrypt);
42+
var item = (serverType, compression, wireCrypt);
4343
if (!_initalized.Contains(item))
4444
{
4545
var cs = FbTestsBase.BuildConnectionString(serverType, compression, wireCrypt);

0 commit comments

Comments
 (0)