Skip to content

Commit c6ff107

Browse files
cincuranetcincuranet
committed
Conditionals cleanup
1 parent 1ebebd4 commit c6ff107

40 files changed

+128
-588
lines changed

‎src/FirebirdSql.Data.FirebirdClient/Client/ClientFactory.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ private static ValueTask<DatabaseBase> CreateNativeDatabaseAsync(ConnectionStrin
128128
{
129129
var charset = GetCharset(options);
130130

131-
return ValueTask2.FromResult<DatabaseBase>(new Native.FesDatabase(options.ClientLibrary, charset, options.PacketSize, options.Dialect));
131+
return ValueTask.FromResult<DatabaseBase>(new Native.FesDatabase(options.ClientLibrary, charset, options.PacketSize, options.Dialect));
132132
}
133133

134134
private static ServiceManagerBase CreateManagedServiceManager(ConnectionString options)
@@ -194,7 +194,7 @@ private static ValueTask<ServiceManagerBase> CreateNativeServiceManagerAsync(Con
194194
{
195195
var charset = GetCharset(options);
196196

197-
return ValueTask2.FromResult<ServiceManagerBase>(new Native.FesServiceManager(options.ClientLibrary, charset));
197+
return ValueTask.FromResult<ServiceManagerBase>(new Native.FesServiceManager(options.ClientLibrary, charset));
198198
}
199199

200200
private static Exception UnsupportedProtocolException() => new NotSupportedException("Protocol not supported.");

‎src/FirebirdSql.Data.FirebirdClient/Client/Managed/FirebirdNetworkHandlingWrapper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public ValueTask WriteAsync(byte[] buffer, int offset, int count, CancellationTo
129129
{
130130
for (var i = offset; i < count; i++)
131131
_outputBuffer.Enqueue(buffer[offset + i]);
132-
return ValueTask2.CompletedTask;
132+
return ValueTask.CompletedTask;
133133
}
134134

135135
public void Flush()

‎src/FirebirdSql.Data.FirebirdClient/Client/Managed/GdsConnection.cs‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,7 @@ public async ValueTask ConnectAsync(CancellationToken cancellationToken = defaul
114114
{
115115
using (var combinedCts = CancellationTokenSource.CreateLinkedTokenSource(timeoutCts.Token, cancellationToken))
116116
{
117-
#if NET48 || NETSTANDARD2_0 || NETSTANDARD2_1
118-
static Func<IPEndPoint, CancellationToken, Task> ConnectAsyncHelper(Socket socket) => (e, ct) => Task.Factory.FromAsync(socket.BeginConnect, socket.EndConnect, e, null);
119-
#else
120-
static Func<IPEndPoint, CancellationToken, Task> ConnectAsyncHelper(Socket socket) => (e, ct) => SocketTaskExtensions.ConnectAsync(socket, e, ct).AsTask();
121-
#endif
122-
await ConnectAsyncHelper(socket)(endPoint, combinedCts.Token).ConfigureAwait(false);
117+
await socket.ConnectAsync(endPoint, combinedCts.Token).ConfigureAwait(false);
123118
}
124119
}
125120

@@ -366,24 +361,15 @@ public void Disconnect()
366361
{
367362
if (_networkStream != null)
368363
{
369-
#if NET48 || NETSTANDARD2_0
370364
_networkStream.Dispose();
371-
#else
372-
_networkStream.Dispose();
373-
#endif
374365
_networkStream = null;
375366
}
376367
}
377368
public async ValueTask DisconnectAsync(CancellationToken cancellationToken = default)
378369
{
379370
if (_networkStream != null)
380371
{
381-
#if NET48 || NETSTANDARD2_0
382-
_networkStream.Dispose();
383-
await ValueTask2.CompletedTask.ConfigureAwait(false);
384-
#else
385372
await _networkStream.DisposeAsync().ConfigureAwait(false);
386-
#endif
387373
_networkStream = null;
388374
}
389375
}

‎src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsDatabase.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ protected virtual void ProcessAttachResponse(GenericResponse response)
159159
protected virtual ValueTask ProcessAttachResponseAsync(GenericResponse response, CancellationToken cancellationToken = default)
160160
{
161161
_handle = response.ObjectHandle;
162-
return ValueTask2.CompletedTask;
162+
return ValueTask.CompletedTask;
163163
}
164164

165165
protected void AfterAttachActions()
@@ -353,7 +353,7 @@ protected void ProcessCreateResponse(GenericResponse response)
353353
protected ValueTask ProcessCreateResponseAsync(GenericResponse response, CancellationToken cancellationToken = default)
354354
{
355355
_handle = response.ObjectHandle;
356-
return ValueTask2.CompletedTask;
356+
return ValueTask.CompletedTask;
357357
}
358358

359359
public override void CreateDatabaseWithTrustedAuth(DatabaseParameterBufferBase dpb, string database, byte[] cryptKey)
@@ -784,7 +784,7 @@ protected virtual void ProcessReleaseObjectResponse(IResponse response)
784784
{ }
785785
protected virtual ValueTask ProcessReleaseObjectResponseAsync(IResponse response, CancellationToken cancellationToken = default)
786786
{
787-
return ValueTask2.CompletedTask;
787+
return ValueTask.CompletedTask;
788788
}
789789

790790
#endregion

‎src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsServiceManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ protected virtual void ProcessAttachResponse(GenericResponse response)
113113
protected virtual ValueTask ProcessAttachResponseAsync(GenericResponse response, CancellationToken cancellationToken = default)
114114
{
115115
Handle = response.ObjectHandle;
116-
return ValueTask2.CompletedTask;
116+
return ValueTask.CompletedTask;
117117
}
118118

119119
public override void Detach()

‎src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsStatement.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public override ArrayBase CreateArray(ArrayDesc descriptor)
191191
public override ValueTask<ArrayBase> CreateArrayAsync(ArrayDesc descriptor, CancellationToken cancellationToken = default)
192192
{
193193
var array = new GdsArray(descriptor);
194-
return ValueTask2.FromResult<ArrayBase>(array);
194+
return ValueTask.FromResult<ArrayBase>(array);
195195
}
196196

197197
public override ArrayBase CreateArray(string tableName, string fieldName)
@@ -643,7 +643,7 @@ protected ValueTask<byte[]> ProcessInfoSqlResponseAsync(GenericResponse response
643643
{
644644
Debug.Assert(response.Data != null && response.Data.Length > 0);
645645

646-
return ValueTask2.FromResult(response.Data);
646+
return ValueTask.FromResult(response.Data);
647647
}
648648
#endregion
649649

@@ -729,7 +729,7 @@ protected void ProcessFreeResponse(IResponse response)
729729
{ }
730730
protected ValueTask ProcessFreeResponseAsync(IResponse response, CancellationToken cancellationToken = default)
731731
{
732-
return ValueTask2.CompletedTask;
732+
return ValueTask.CompletedTask;
733733
}
734734
#endregion
735735

@@ -758,7 +758,7 @@ protected ValueTask ProcessAllocateResponseAsync(GenericResponse response, Cance
758758
_allRowsFetched = false;
759759
State = StatementState.Allocated;
760760
StatementType = DbStatementType.None;
761-
return ValueTask2.CompletedTask;
761+
return ValueTask.CompletedTask;
762762
}
763763
#endregion
764764

@@ -842,7 +842,7 @@ protected void ProcessExecuteResponse(GenericResponse response)
842842
{ }
843843
protected ValueTask ProcessExecuteResponseAsync(GenericResponse response, CancellationToken cancellationToken = default)
844844
{
845-
return ValueTask2.CompletedTask;
845+
return ValueTask.CompletedTask;
846846
}
847847

848848
protected void ProcessStoredProcedureExecuteResponse(SqlResponse response)
@@ -1247,7 +1247,7 @@ protected void WriteRawParameter(IXdrWriter xdr, DbField field)
12471247
else
12481248
{
12491249
var svalue = field.DbValue.GetString();
1250-
if ((field.Length % field.Charset.BytesPerCharacter) == 0 && svalue.EnumerateRunesEx().Count() > field.CharCount)
1250+
if ((field.Length % field.Charset.BytesPerCharacter) == 0 && svalue.EnumerateRunesToChars().Count() > field.CharCount)
12511251
{
12521252
throw IscException.ForErrorCodes(new[] { IscCodes.isc_arith_except, IscCodes.isc_string_truncation });
12531253
}
@@ -1272,7 +1272,7 @@ protected void WriteRawParameter(IXdrWriter xdr, DbField field)
12721272
else
12731273
{
12741274
var svalue = field.DbValue.GetString();
1275-
if ((field.Length % field.Charset.BytesPerCharacter) == 0 && svalue.EnumerateRunesEx().Count() > field.CharCount)
1275+
if ((field.Length % field.Charset.BytesPerCharacter) == 0 && svalue.EnumerateRunesToChars().Count() > field.CharCount)
12761276
{
12771277
throw IscException.ForErrorCodes(new[] { IscCodes.isc_arith_except, IscCodes.isc_string_truncation });
12781278
}
@@ -1395,7 +1395,7 @@ protected async ValueTask WriteRawParameterAsync(IXdrWriter xdr, DbField field,
13951395
else
13961396
{
13971397
var svalue = await field.DbValue.GetStringAsync(cancellationToken).ConfigureAwait(false);
1398-
if ((field.Length % field.Charset.BytesPerCharacter) == 0 && svalue.EnumerateRunesEx().Count() > field.CharCount)
1398+
if ((field.Length % field.Charset.BytesPerCharacter) == 0 && svalue.EnumerateRunesToChars().Count() > field.CharCount)
13991399
{
14001400
throw IscException.ForErrorCodes(new[] { IscCodes.isc_arith_except, IscCodes.isc_string_truncation });
14011401
}
@@ -1420,7 +1420,7 @@ protected async ValueTask WriteRawParameterAsync(IXdrWriter xdr, DbField field,
14201420
else
14211421
{
14221422
var svalue = await field.DbValue.GetStringAsync(cancellationToken).ConfigureAwait(false);
1423-
if ((field.Length % field.Charset.BytesPerCharacter) == 0 && svalue.EnumerateRunesEx().Count() > field.CharCount)
1423+
if ((field.Length % field.Charset.BytesPerCharacter) == 0 && svalue.EnumerateRunesToChars().Count() > field.CharCount)
14241424
{
14251425
throw IscException.ForErrorCodes(new[] { IscCodes.isc_arith_except, IscCodes.isc_string_truncation });
14261426
}
@@ -1533,7 +1533,7 @@ protected object ReadRawValue(IXdrReader xdr, DbField field)
15331533
else
15341534
{
15351535
var s = xdr.ReadString(innerCharset, field.Length);
1536-
var runes = s.EnumerateRunesEx().ToList();
1536+
var runes = s.EnumerateRunesToChars().ToList();
15371537
if ((field.Length % field.Charset.BytesPerCharacter) == 0 &&
15381538
runes.Count > field.CharCount)
15391539
{
@@ -1631,7 +1631,7 @@ protected async ValueTask<object> ReadRawValueAsync(IXdrReader xdr, DbField fiel
16311631
else
16321632
{
16331633
var s = await xdr.ReadStringAsync(innerCharset, field.Length, cancellationToken).ConfigureAwait(false);
1634-
var runes = s.EnumerateRunesEx().ToList();
1634+
var runes = s.EnumerateRunesToChars().ToList();
16351635
if ((field.Length % field.Charset.BytesPerCharacter) == 0 &&
16361636
runes.Count > field.CharCount)
16371637
{

‎src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version11/GdsDatabase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ protected virtual void SendTrustedAuthToBuffer(DatabaseParameterBufferBase dpb,
111111
protected virtual ValueTask SendTrustedAuthToBufferAsync(DatabaseParameterBufferBase dpb, byte[] authData, CancellationToken cancellationToken = default)
112112
{
113113
dpb.Append(IscCodes.isc_dpb_trusted_auth, authData);
114-
return ValueTask2.CompletedTask;
114+
return ValueTask.CompletedTask;
115115
}
116116

117117
protected IResponse ProcessTrustedAuthResponse(SspiHelper sspiHelper, IResponse response)

‎src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version16/GdsBatch.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ protected void ProcessReleaseResponse(IResponse response)
172172
{ }
173173
protected ValueTask ProcessReleaseResponseAsync(IResponse response, CancellationToken cancellationToken = default)
174174
{
175-
return ValueTask2.CompletedTask;
175+
return ValueTask.CompletedTask;
176176
}
177177

178178
protected ExecuteResultItem[] BuildResult(BatchCompletionStateResponse response)

‎src/FirebirdSql.Data.FirebirdClient/Client/Native/FbClientFactory.cs‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -257,14 +257,6 @@ private static void EmitLdarg(ILGenerator il, int i)
257257
private static IFbClient CreateInstance(TypeBuilder tb)
258258
{
259259
var t = tb.CreateTypeInfo().AsType();
260-
261-
#if DEBUG
262-
#if NET48
263-
var ab = (AssemblyBuilder)tb.Assembly;
264-
ab.Save("DynamicAssembly.dll");
265-
#endif
266-
#endif
267-
268260
return (IFbClient)Activator.CreateInstance(t);
269261
}
270262

@@ -288,13 +280,7 @@ private static TypeBuilder CreateTypeBuilder(string baseName)
288280
assemblyName.Name = baseName + "_Assembly";
289281

290282
// We create the dynamic assembly in our current AppDomain
291-
var assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(assemblyName,
292-
#if NET48
293-
AssemblyBuilderAccess.RunAndSave
294-
#else
295-
AssemblyBuilderAccess.Run
296-
#endif
297-
);
283+
var assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.Run);
298284

299285
// Generate the actual module (which is the DLL itself)
300286
var moduleBuilder = assemblyBuilder.DefineDynamicModule(baseName + "_Module");

‎src/FirebirdSql.Data.FirebirdClient/Client/Native/FesArray.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public override ValueTask<byte[]> GetSliceAsync(int sliceLength, CancellationTok
134134

135135
_database.ProcessStatusVector(_statusVector);
136136

137-
return ValueTask2.FromResult(buffer);
137+
return ValueTask.FromResult(buffer);
138138
}
139139

140140
public override void PutSlice(Array sourceArray, int sliceLength)
@@ -205,7 +205,7 @@ public override ValueTask PutSliceAsync(Array sourceArray, int sliceLength, Canc
205205

206206
_database.ProcessStatusVector(_statusVector);
207207

208-
return ValueTask2.CompletedTask;
208+
return ValueTask.CompletedTask;
209209
}
210210

211211
#endregion
@@ -520,7 +520,7 @@ protected override ValueTask<Array> DecodeSliceAsync(byte[] slice, CancellationT
520520
sliceData = tempData;
521521
}
522522

523-
return ValueTask2.FromResult(sliceData);
523+
return ValueTask.FromResult(sliceData);
524524
}
525525

526526
#endregion

0 commit comments

Comments
 (0)