Skip to content
This repository was archived by the owner on Feb 1, 2025. It is now read-only.

Commit a23793f

Browse files
sdanylivsdanyliv
committed
Fixed NRT warnings.
1 parent 4c3ea1c commit a23793f

File tree

7 files changed

+26
-14
lines changed

7 files changed

+26
-14
lines changed

‎Source/LinqToDB.EntityFrameworkCore/LinqToDBExtensionsAdapter.cs‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,21 @@ public Task<TSource> FirstAsync<TSource>(
8787
=> EntityFrameworkQueryableExtensions.FirstAsync(source, predicate, token);
8888

8989
/// <inheritdoc cref="EntityFrameworkQueryableExtensions.FirstOrDefaultAsync{TSource}(IQueryable{TSource}, CancellationToken)"/>
90-
public Task<TSource> FirstOrDefaultAsync<TSource>(
90+
public Task<TSource?> FirstOrDefaultAsync<TSource>(
9191
IQueryable<TSource> source,
9292
CancellationToken token)
93+
#pragma warning disable CS8619 // Nullability of reference types in value doesn't match target type.
9394
=> EntityFrameworkQueryableExtensions.FirstOrDefaultAsync(source, token);
95+
#pragma warning restore CS8619 // Nullability of reference types in value doesn't match target type.
9496

9597
/// <inheritdoc cref="EntityFrameworkQueryableExtensions.FirstOrDefaultAsync{TSource}(IQueryable{TSource}, Expression{Func{TSource, bool}}, CancellationToken)"/>
96-
public Task<TSource> FirstOrDefaultAsync<TSource>(
98+
public Task<TSource?> FirstOrDefaultAsync<TSource>(
9799
IQueryable<TSource> source,
98100
Expression<Func<TSource,bool>> predicate,
99101
CancellationToken token)
102+
#pragma warning disable CS8619 // Nullability of reference types in value doesn't match target type.
100103
=> EntityFrameworkQueryableExtensions.FirstOrDefaultAsync(source, predicate, token);
104+
#pragma warning restore CS8619 // Nullability of reference types in value doesn't match target type.
101105

102106
/// <inheritdoc cref="EntityFrameworkQueryableExtensions.SingleAsync{TSource}(IQueryable{TSource}, CancellationToken)"/>
103107
public Task<TSource> SingleAsync<TSource>(
@@ -113,17 +117,21 @@ public Task<TSource> SingleAsync<TSource>(
113117
=> EntityFrameworkQueryableExtensions.SingleAsync(source, predicate, token);
114118

115119
/// <inheritdoc cref="EntityFrameworkQueryableExtensions.SingleOrDefaultAsync{TSource}(IQueryable{TSource}, CancellationToken)"/>
116-
public Task<TSource> SingleOrDefaultAsync<TSource>(
120+
public Task<TSource?> SingleOrDefaultAsync<TSource>(
117121
IQueryable<TSource> source,
118122
CancellationToken token)
123+
#pragma warning disable CS8619 // Nullability of reference types in value doesn't match target type.
119124
=> EntityFrameworkQueryableExtensions.SingleOrDefaultAsync(source, token);
125+
#pragma warning restore CS8619 // Nullability of reference types in value doesn't match target type.
120126

121127
/// <inheritdoc cref="EntityFrameworkQueryableExtensions.SingleOrDefaultAsync{TSource}(IQueryable{TSource}, Expression{Func{TSource, bool}}, CancellationToken)"/>
122-
public Task<TSource> SingleOrDefaultAsync<TSource>(
128+
public Task<TSource?> SingleOrDefaultAsync<TSource>(
123129
IQueryable<TSource> source,
124130
Expression<Func<TSource,bool>> predicate,
125131
CancellationToken token)
132+
#pragma warning disable CS8619 // Nullability of reference types in value doesn't match target type.
126133
=> EntityFrameworkQueryableExtensions.SingleOrDefaultAsync(source, predicate, token);
134+
#pragma warning restore CS8619 // Nullability of reference types in value doesn't match target type.
127135

128136
/// <inheritdoc cref="EntityFrameworkQueryableExtensions.ContainsAsync{TSource}(IQueryable{TSource}, TSource, CancellationToken)"/>
129137
public Task<bool> ContainsAsync<TSource>(

‎Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFExtensions.Async.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@ public static Task<TSource> FirstAsyncLinqToDB<TSource>(
7676
=> AsyncExtensions.FirstAsync(source.ToLinqToDB(), predicate, token);
7777

7878
/// <inheritdoc cref="AsyncExtensions.FirstOrDefaultAsync{TSource}(IQueryable{TSource}, CancellationToken)"/>
79-
public static Task<TSource> FirstOrDefaultAsyncLinqToDB<TSource>(
79+
public static Task<TSource?> FirstOrDefaultAsyncLinqToDB<TSource>(
8080
this IQueryable<TSource> source,
8181
CancellationToken token = default)
8282
=> AsyncExtensions.FirstOrDefaultAsync(source.ToLinqToDB(), token);
8383

8484
/// <inheritdoc cref="AsyncExtensions.FirstOrDefaultAsync{TSource}(IQueryable{TSource}, Expression{Func{TSource, bool}}, CancellationToken)"/>
85-
public static Task<TSource> FirstOrDefaultAsyncLinqToDB<TSource>(
85+
public static Task<TSource?> FirstOrDefaultAsyncLinqToDB<TSource>(
8686
this IQueryable<TSource> source,
8787
Expression<Func<TSource,bool>> predicate,
8888
CancellationToken token = default)
@@ -102,13 +102,13 @@ public static Task<TSource> SingleAsyncLinqToDB<TSource>(
102102
=> AsyncExtensions.SingleAsync(source.ToLinqToDB(), predicate, token);
103103

104104
/// <inheritdoc cref="AsyncExtensions.SingleOrDefaultAsync{TSource}(IQueryable{TSource}, CancellationToken)"/>
105-
public static Task<TSource> SingleOrDefaultAsyncLinqToDB<TSource>(
105+
public static Task<TSource?> SingleOrDefaultAsyncLinqToDB<TSource>(
106106
this IQueryable<TSource> source,
107107
CancellationToken token = default)
108108
=> AsyncExtensions.SingleOrDefaultAsync(source.ToLinqToDB(), token);
109109

110110
/// <inheritdoc cref="AsyncExtensions.SingleOrDefaultAsync{TSource}(IQueryable{TSource}, Expression{Func{TSource, bool}}, CancellationToken)"/>
111-
public static Task<TSource> SingleOrDefaultAsyncLinqToDB<TSource>(
111+
public static Task<TSource?> SingleOrDefaultAsyncLinqToDB<TSource>(
112112
this IQueryable<TSource> source,
113113
Expression<Func<TSource,bool>> predicate,
114114
CancellationToken token = default)

‎Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFTools.ContextExtensions.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ public static async Task<BulkCopyRowsCopied> BulkCopyAsync<T>(
233233
[LinqTunnel]
234234
[Pure]
235235
public static IValueInsertable<T> Into<T>(this DbContext context, ITable<T> target)
236+
where T: notnull
236237
{
237238
if (context == null) throw new ArgumentNullException(nameof(context));
238239
if (target == null) throw new ArgumentNullException(nameof(target));

‎Tests/LinqToDB.EntityFrameworkCore.PostgreSQL.Tests/SampleTests/AAA.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
using System;
22
using System.Threading.Tasks;
33

4+
#pragma warning disable 8604
5+
#pragma warning disable CS8625
6+
47
namespace LinqToDB.EntityFrameworkCore.PostgreSQL.Tests.SampleTests
58
{
69
public class Unit
@@ -22,11 +25,11 @@ public static ArrangeResult<T, Unit> Arrange<T>(this T @object, Action<T> action
2225
}
2326

2427
public static ArrangeResult<T, Unit> Arrange<T>(T @object)
25-
=> new ArrangeResult<T, Unit>(@object, default);
28+
=> new(@object, default);
2629

2730
public static ArrangeResult<T, TMock> Arrange<T, TMock>(this TMock mock, Func<TMock, T> @object)
2831
where TMock: notnull
29-
=> new ArrangeResult<T, TMock>(@object(mock), mock);
32+
=> new(@object(mock), mock);
3033

3134
public static ActResult<T, TMock> Act<T, TMock>(this ArrangeResult<T, TMock> arrange, Action<T> act)
3235
where T : notnull
@@ -116,5 +119,5 @@ internal ActResult(T @object, TMock mock, Exception? exception)
116119
internal TMock Mock { get; }
117120
internal Exception? Exception { get; }
118121
}
119-
}
122+
}
120123
}

‎Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/IssueTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ private void InitOptions()
2929

3030
private IssueContext CreateContext()
3131
{
32-
var ctx = new IssueContext(_options);
32+
var ctx = new IssueContext(_options!);
3333

3434
if (!_created)
3535
{

‎Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/Models/IssueModel/IssueContext.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
4343
modelBuilder
4444
.Entity<Patent>()
4545
.HasOne(p => p.Assessment)
46-
.WithOne(pa => pa.Patent)
46+
.WithOne(pa => pa!.Patent)
4747
.HasForeignKey<PatentAssessment>(pa => pa.PatentId)
4848
.OnDelete(DeleteBehavior.Restrict);
4949

‎Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/ToolsTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ public async Task TestSetUpdate([Values(true, false)] bool enableFilter)
674674
{
675675
using (var ctx = CreateContext(enableFilter))
676676
{
677-
var customer = await ctx.Customers.FirstOrDefaultAsync();
677+
var customer = await ctx.Customers.FirstAsync();
678678

679679
var updatable = ctx.Customers.Where(c => c.CustomerId == customer.CustomerId)
680680
.Set(c => c.CompanyName, customer.CompanyName);

0 commit comments

Comments
 (0)