Skip to content

Nullability leftovers #24428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roji merged 1 commit into from
Mar 17, 2021
Merged

Nullability leftovers #24428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<IncludeSymbols>True</IncludeSymbols>
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\rulesets\EFCore.ruleset</CodeAnalysisRuleSet>
<Nullable>enable</Nullable>
<Feature>nullablePublicOnly</Feature>
Copy link
Copy Markdown
Member Author

@roji roji Mar 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will reduce our assembly IL size by not generating nullability attributes for non-public APIs.

See dotnet/aspnetcore#29908 for discussion on the same thing for ASP.NET.

</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Abstractions/ChangeTracking/Internal/SortableBindingList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.Reflection;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.ChangeTracking.Internal
{
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Abstractions/ChangeTracking/ObservableCollectionListSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.ChangeTracking
{
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Abstractions/Infrastructure/ILazyLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Infrastructure
{
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Abstractions/Infrastructure/LazyLoaderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System.Runtime.CompilerServices;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Infrastructure
{
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Cosmos/Diagnostics/CosmosQueryEventData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Diagnostics
{
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Cosmos/Diagnostics/CosmosReadItemEventData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

using System;
using System.Diagnostics;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Diagnostics
{
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Cosmos/Storage/Internal/CosmosSqlQuery.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System.Collections.Generic;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Cosmos.Storage.Internal
{
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Cosmos/Storage/Internal/HttpException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

using System;
using System.Net.Http;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Cosmos.Storage.Internal
{
Expand Down
2 changes: 0 additions & 2 deletions src/EFCore.Cosmos/Storage/Internal/SqlParameter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Cosmos.Storage.Internal
{
/// <summary>
Expand Down
2 changes: 0 additions & 2 deletions src/EFCore.Design/Design/IOperationReportHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Design
{
/// <summary>
Expand Down
2 changes: 0 additions & 2 deletions src/EFCore.Design/Design/IOperationResultHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Design
{
/// <summary>
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Design/Design/IPluralizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System.Diagnostics.CodeAnalysis;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Design
{
Expand Down
2 changes: 0 additions & 2 deletions src/EFCore.Design/Design/Internal/ContextInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Design.Internal
{
/// <summary>
Expand Down
2 changes: 0 additions & 2 deletions src/EFCore.Design/Design/Internal/IOperationReporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Design.Internal
{
/// <summary>
Expand Down
2 changes: 0 additions & 2 deletions src/EFCore.Design/Design/Internal/MigrationInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Design.Internal
{
/// <summary>
Expand Down
2 changes: 0 additions & 2 deletions src/EFCore.Design/Design/Internal/OperationReporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Design.Internal
{
/// <summary>
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Design/Design/OperationException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

using System;
using System.Runtime.Serialization;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Design
{
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Design/Design/OperationReportHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Design
{
Expand Down
2 changes: 0 additions & 2 deletions src/EFCore.Design/Metadata/Internal/ScaffoldingPropertyExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Metadata.Internal
{
/// <summary>
Expand Down
2 changes: 0 additions & 2 deletions src/EFCore.Design/Migrations/Design/IMigrationsCodeGeneratorSelector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Migrations.Design
{
/// <summary>
Expand Down
2 changes: 0 additions & 2 deletions src/EFCore.Design/Migrations/Design/IMigrationsScaffolder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Migrations.Design
{
/// <summary>
Expand Down
2 changes: 0 additions & 2 deletions src/EFCore.Design/Migrations/Design/MigrationFiles.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Migrations.Design
{
/// <summary>
Expand Down
2 changes: 0 additions & 2 deletions src/EFCore.Design/Scaffolding/IModelCodeGeneratorSelector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Scaffolding
{
/// <summary>
Expand Down
2 changes: 0 additions & 2 deletions src/EFCore.Design/Scaffolding/IReverseEngineerScaffolder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Scaffolding
{
/// <summary>
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Design/Scaffolding/Internal/CSharpUniqueNamer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

using System;
using System.Collections.Generic;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Scaffolding.Internal
{
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Design/Scaffolding/Internal/ICSharpUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

using System;
using System.Collections.Generic;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Scaffolding.Internal
{
Expand Down
2 changes: 0 additions & 2 deletions src/EFCore.Design/Scaffolding/Internal/IScaffoldingTypeMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Scaffolding.Internal
{
/// <summary>
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Design/Scaffolding/Metadata/Internal/DatabaseForeignKeyExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System.Linq;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Scaffolding.Metadata.Internal
{
Expand Down
2 changes: 0 additions & 2 deletions src/EFCore.Design/Scaffolding/Metadata/Internal/DatabaseTableExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Scaffolding.Metadata.Internal
{
/// <summary>
Expand Down
2 changes: 0 additions & 2 deletions src/EFCore.Design/Scaffolding/ModelCodeGenerationOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Scaffolding
{
/// <summary>
Expand Down
2 changes: 0 additions & 2 deletions src/EFCore.Design/Scaffolding/ScaffoldedFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Scaffolding
{
/// <summary>
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Design/Scaffolding/ScaffoldedModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System.Collections.Generic;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Scaffolding
{
Expand Down
12 changes: 4 additions & 8 deletions src/EFCore.InMemory/Query/Internal/InMemoryExpressionTranslatingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1511,16 +1511,13 @@ when CanEvaluate(memberInitExpression):
}
}

#nullable disable
// Need unconstrainted nullable T
private static T ParameterValueExtractor<T>(QueryContext context, string baseParameterName, IProperty property)
private static T? ParameterValueExtractor<T>(QueryContext context, string baseParameterName, IProperty property)
Copy link
Copy Markdown
Member Author

@roji roji Mar 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This may look a bit confusing, but remember that T? means defaultable and not nullable in unconstrained generic contexts. So the code below will still throw NRE if T is a value type and no base parameter is found - as today.

{
var baseParameter = context.ParameterValues[baseParameterName];
return baseParameter == null ? (T)(object)null : (T)property.GetGetter().GetClrValue(baseParameter);
return baseParameter == null ? (T?)(object?)null : (T?)property.GetGetter().GetClrValue(baseParameter);
}

// Need unconstrainted nullable TProperty
private static List<TProperty> ParameterListValueExtractor<TEntity, TProperty>(
private static List<TProperty?>? ParameterListValueExtractor<TEntity, TProperty>(
QueryContext context,
string baseParameterName,
IProperty property)
Expand All @@ -1531,9 +1528,8 @@ private static List<TProperty> ParameterListValueExtractor<TEntity, TProperty>(
}

var getter = property.GetGetter();
return baseListParameter.Select(e => e != null ? (TProperty)getter.GetClrValue(e) : (TProperty)(object)null).ToList();
return baseListParameter.Select(e => e != null ? (TProperty?)getter.GetClrValue(e) : (TProperty?)(object?)null).ToList();
}
#nullable enable

private static ConstantExpression GetValue(Expression expression)
=> Expression.Constant(
Expand Down
2 changes: 0 additions & 2 deletions src/EFCore.InMemory/Storage/Internal/IInMemoryStoreCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.InMemory.Storage.Internal
{
/// <summary>
Expand Down
2 changes: 0 additions & 2 deletions src/EFCore.InMemory/Storage/Internal/InMemoryTableFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@

using System;
using System.Collections.Concurrent;
using System.Linq;
using System.Reflection;
using JetBrains.Annotations;
using Microsoft.EntityFrameworkCore.Diagnostics;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.InMemory.Infrastructure.Internal;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Utilities;
Expand Down
2 changes: 0 additions & 2 deletions src/EFCore.InMemory/ValueGeneration/Internal/IInMemoryIntegerValueGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.InMemory.ValueGeneration.Internal
{
/// <summary>
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Relational/Diagnostics/CommandCorrelatedEventData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System;
using System.Data.Common;
using System.Diagnostics;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Diagnostics
{
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Relational/Diagnostics/CommandEndEventData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System;
using System.Data.Common;
using System.Diagnostics;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Diagnostics
{
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Relational/Diagnostics/CommandErrorEventData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System;
using System.Data.Common;
using System.Diagnostics;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Diagnostics
{
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Relational/Diagnostics/CommandEventData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System;
using System.Data.Common;
using System.Diagnostics;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Diagnostics
{
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Relational/Diagnostics/CommandExecutedEventData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System;
using System.Data.Common;
using System.Diagnostics;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Diagnostics
{
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Relational/Diagnostics/ConnectionEndEventData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System;
using System.Data.Common;
using System.Diagnostics;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Diagnostics
{
Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Relational/Diagnostics/ConnectionErrorEventData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System;
using System.Data.Common;
using System.Diagnostics;
using JetBrains.Annotations;

namespace Microsoft.EntityFrameworkCore.Diagnostics
{
Expand Down
Loading