Skip to content

Target .NET 8 #31270

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
merged 1 commit into from
Jul 18, 2023
Merged

Target .NET 8 #31270

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
3 changes: 3 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ updates:
schedule:
interval: weekly
allow:
- dependency-name: Azure.Identity
- dependency-name: Castle.Core
- dependency-name: Grpc.AspNetCore
- dependency-name: Humanizer.Core
- dependency-name: IdentityServer4.EntityFramework
- dependency-name: Microsoft.AspNetCore.Identity.EntityFrameworkCore
- dependency-name: Microsoft.AspNetCore.OData
- dependency-name: Microsoft.Azure.Cosmos
- dependency-name: Microsoft.CSharp
Expand Down
13 changes: 9 additions & 4 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project>
<Project>
<!-- Define project type conventions. -->
<PropertyGroup>
<IsTrimmingTestProject Condition="$(MSBuildProjectName.EndsWith('.TrimmingTests'))">true</IsTrimmingTestProject>
Expand All @@ -11,7 +11,7 @@
$(MSBuildProjectName.EndsWith('.FunctionalTests'))) ">true</IsUnitTestProject>
<IsUnitTestProject Condition=" '$(IsUnitTestProject)' == '' ">false</IsUnitTestProject>
</PropertyGroup>

<PropertyGroup>
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('Windows'))">win</TargetOsName>
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('OSX'))">osx</TargetOsName>
Expand All @@ -20,7 +20,7 @@
<TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
<TargetRuntimeIdentifier Condition="'$(TargetRuntimeIdentifier)' == ''">$(TargetOsName)-$(TargetArchitecture)</TargetRuntimeIdentifier>
</PropertyGroup>

<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />

<Import
Expand All @@ -42,6 +42,11 @@
<PackageProjectUrl>https://docs.microsoft.com/ef/core/</PackageProjectUrl>
</PropertyGroup>

<!-- HACK: Work around ericsink/SQLitePCL.raw#543 -->
<ItemGroup>
<RuntimeHostConfigurationOption Include="System.Runtime.Loader.UseRidGraph" Value="true" />
</ItemGroup>

<PropertyGroup Condition="'$(DeveloperBuild)' == 'true'">
<WarningsNotAsErrors>$(WarningsNotAsErrors);CS1591;SA1636</WarningsNotAsErrors>
</PropertyGroup>
Expand All @@ -57,7 +62,7 @@
<ItemGroup>
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" />
</ItemGroup>

<Import Project="eng\testing\linker\trimmingTests.props" Condition="'$(IsPublishedAppTestProject)' == 'true'" />

</Project>
2 changes: 0 additions & 2 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
<add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
Expand Down
2 changes: 1 addition & 1 deletion benchmark/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
<PackageReference Include="xunit.assert" Version="$(XunitVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesVersion)" />
Expand Down
2 changes: 1 addition & 1 deletion benchmark/EFCore.Benchmarks/EFCore.Benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>Microsoft.EntityFrameworkCore.Benchmarks</RootNamespace>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion benchmark/EFCore.SqlServer.Benchmarks/EFCore.SqlServer.Benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>Microsoft.EntityFrameworkCore.Benchmarks</RootNamespace>
<OutputType>Exe</OutputType>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>Microsoft.EntityFrameworkCore.Benchmarks</RootNamespace>
<OutputType>Exe</OutputType>
</PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23364.2</MicrosoftDotNetBuildTasksTemplatingVersion>
</PropertyGroup>
<PropertyGroup Label="Other dependencies">
<!-- NB: This version affects Visual Studio compatibility. See https://learn.microsoft.com/visualstudio/extensibility/roslyn-version-support -->
<MicrosoftCodeAnalysisVersion>4.5.0</MicrosoftCodeAnalysisVersion>
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23251.2</MicrosoftCodeAnalysisTestingVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion eng/helix.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</ItemGroup>

<PropertyGroup>
<XUnitPublishTargetFramework>net7.0</XUnitPublishTargetFramework>
<XUnitPublishTargetFramework>net8.0</XUnitPublishTargetFramework>
<XUnitRuntimeTargetFramework>netcoreapp2.0</XUnitRuntimeTargetFramework>
<XUnitRunnerVersion>2.4.2</XUnitRunnerVersion>
<XUnitArguments></XUnitArguments>
Expand Down
10 changes: 1 addition & 9 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,7 @@
"rollForward": "latestMajor"
},
"tools": {
"dotnet": "8.0.100-preview.7.23354.1",
"runtimes": {
"aspnetcore": [
"7.0.3"
],
"dotnet": [
"7.0.3"
]
}
"dotnet": "8.0.100-preview.7.23354.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23364.2",
Expand Down
2 changes: 1 addition & 1 deletion src/EFCore.Abstractions/EFCore.Abstractions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Provides abstractions and attributes that are used to configure Entity Framework Core</Description>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<MinClientVersion>3.6</MinClientVersion>
<AssemblyName>Microsoft.EntityFrameworkCore.Abstractions</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion src/EFCore.Cosmos/EFCore.Cosmos.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Azure Cosmos provider for Entity Framework Core.</Description>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<MinClientVersion>3.6</MinClientVersion>
<AssemblyName>Microsoft.EntityFrameworkCore.Cosmos</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore.Cosmos</RootNamespace>
Expand Down
4 changes: 2 additions & 2 deletions src/EFCore.Design/Design/Internal/DbContextOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ private KeyValuePair<Type, Func<DbContext>> FindContextType(string? name)
}

// Allow selecting types in the default namespace
candidates = candidates.Where(t => t.Key.Namespace == null).ToDictionary(t => t.Key, t => t.Value);
candidates = candidates.Where(t => t.Key.Namespace == null).ToDictionary();
Copy link
Contributor Author

Choose a reason for hiding this comment

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

😍

Copy link
Member

Choose a reason for hiding this comment

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

Ooooh that's a good one

if (candidates.Count == 0)
{
throw new OperationException(DesignStrings.MultipleContextsWithQualifiedName(name));
Expand All @@ -460,6 +460,6 @@ private static IDictionary<Type, Func<DbContext>> FilterTypes(
t => string.Equals(t.Key.Name, name, comparisonType)
|| string.Equals(t.Key.FullName, name, comparisonType)
|| string.Equals(t.Key.AssemblyQualifiedName, name, comparisonType))
.ToDictionary(t => t.Key, t => t.Value);
.ToDictionary();
}
}
1 change: 1 addition & 0 deletions src/EFCore.Design/Design/OperationException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public OperationException(string message, Exception? innerException)
/// </summary>
/// <param name="info">The serialization info.</param>
/// <param name="context">The streaming context being used.</param>
[Obsolete("This API supports obsolete formatter-based serialization. It should not be called or extended by application code.")]
public OperationException(SerializationInfo info, StreamingContext context)
: base(info, context)
{
Expand Down
2 changes: 1 addition & 1 deletion src/EFCore.Design/EFCore.Design.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Shared design-time components for Entity Framework Core tools.</Description>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>Microsoft.EntityFrameworkCore.Design</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
5 changes: 5 additions & 0 deletions src/EFCore.Design/Scaffolding/Internal/TextTemplatingEngineHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,11 @@ public virtual AppDomain ProvideTemplatingAppDomain(string content)
/// </summary>
public virtual string ResolveAssemblyReference(string assemblyReference)
{
if (Path.IsPathRooted(assemblyReference))
{
return assemblyReference;
}

var path = DependencyContext.Default?.CompileLibraries
.FirstOrDefault(l => l.Assemblies.Any(a => Path.GetFileNameWithoutExtension(a) == assemblyReference))
?.ResolveReferencePaths()
Expand Down
0 ...icrosoft.EntityFrameworkCore.Design.props → ...icrosoft.EntityFrameworkCore.Design.props
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/EFCore.InMemory/EFCore.InMemory.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>In-memory database provider for Entity Framework Core (to be used for testing purposes).</Description>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<MinClientVersion>3.6</MinClientVersion>
<AssemblyName>Microsoft.EntityFrameworkCore.InMemory</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore.InMemory</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion src/EFCore.Proxies/EFCore.Proxies.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Lazy loading proxies for Entity Framework Core.</Description>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<MinClientVersion>3.6</MinClientVersion>
<AssemblyName>Microsoft.EntityFrameworkCore.Proxies</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion src/EFCore.Relational/EFCore.Relational.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Shared Entity Framework Core components for relational database providers.</Description>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<MinClientVersion>3.6</MinClientVersion>
<AssemblyName>Microsoft.EntityFrameworkCore.Relational</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
Expand Down
4 changes: 2 additions & 2 deletions src/EFCore.Relational/Infrastructure/RelationalModelValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,9 +362,9 @@ private static void ValidateSproc(
var storeGeneratedProperties = storeObjectIdentifier.StoreObjectType switch
{
StoreObjectType.InsertStoredProcedure
=> properties.Where(p => p.Value.ValueGenerated.HasFlag(ValueGenerated.OnAdd)).ToDictionary(p => p.Key, p => p.Value),
=> properties.Where(p => p.Value.ValueGenerated.HasFlag(ValueGenerated.OnAdd)).ToDictionary(),
StoreObjectType.UpdateStoredProcedure
=> properties.Where(p => p.Value.ValueGenerated.HasFlag(ValueGenerated.OnUpdate)).ToDictionary(p => p.Key, p => p.Value),
=> properties.Where(p => p.Value.ValueGenerated.HasFlag(ValueGenerated.OnUpdate)).ToDictionary(),
_ => new Dictionary<string, IProperty>()
};

Expand Down
2 changes: 1 addition & 1 deletion src/EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<MinClientVersion>3.6</MinClientVersion>
<AssemblyName>Microsoft.EntityFrameworkCore.SqlServer.HierarchyId</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore.SqlServer</RootNamespace>
Expand Down
0 ...ameworkCore.SqlServer.HierarchyId.targets → ...ameworkCore.SqlServer.HierarchyId.targets
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>NetTopologySuite support for the Microsoft SQL Server database provider for Entity Framework Core.</Description>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<MinClientVersion>3.6</MinClientVersion>
<AssemblyName>Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore.SqlServer</RootNamespace>
Expand Down
0 ...rkCore.SqlServer.NetTopologySuite.targets → ...rkCore.SqlServer.NetTopologySuite.targets
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/EFCore.SqlServer/EFCore.SqlServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Microsoft SQL Server database provider for Entity Framework Core.</Description>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<MinClientVersion>3.6</MinClientVersion>
<AssemblyName>Microsoft.EntityFrameworkCore.SqlServer</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore.SqlServer</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<PackageId>Microsoft.EntityFrameworkCore.Sqlite.Core</PackageId>
<RootNamespace>Microsoft.EntityFrameworkCore.Sqlite</RootNamespace>
<Description>SQLite database provider for Entity Framework Core. This package does not include a copy of the native SQLite library.</Description>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<MinClientVersion>3.6</MinClientVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>$(PackageTags);SQLite</PackageTags>
Expand Down
2 changes: 1 addition & 1 deletion src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<PackageId>Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite</PackageId>
<RootNamespace>Microsoft.EntityFrameworkCore.Sqlite</RootNamespace>
<Description>NetTopologySuite support for the SQLite database provider for Entity Framework Core.</Description>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<MinClientVersion>3.6</MinClientVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>$(PackageTags);SQLite;GIS;NTS;OGC;SpatiaLite</PackageTags>
Expand Down
0 ...eworkCore.Sqlite.NetTopologySuite.targets → ...eworkCore.Sqlite.NetTopologySuite.targets
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion src/EFCore.Sqlite/EFCore.Sqlite.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<Description>SQLite database provider for Entity Framework Core.</Description>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<MinClientVersion>3.6</MinClientVersion>
<PackageId>Microsoft.EntityFrameworkCore.Sqlite</PackageId>
<PackageTags>$(PackageTags);SQLite</PackageTags>
Expand Down Expand Up @@ -47,6 +47,7 @@
</ItemGroup>

<ItemGroup>
<!-- TODO: Remove NoWarn NETSDK1206 in Directory.Build.props after updating -->
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.5" />
</ItemGroup>

Expand Down
0 src/EFCore.Sqlite/lib/net6.0/_._ → src/EFCore.Sqlite/lib/net8.0/_._
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/EFCore.Tools/EFCore.Tools.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
$CommonMetadataElements$
<minClientVersion>3.6</minClientVersion>
<dependencies>
<group targetFramework=".NET6.0">
<group targetFramework=".NET8.0">
<dependency id="Microsoft.EntityFrameworkCore.Design" version="$version$" />
</group>
</dependencies>
Expand Down
0 src/EFCore.Tools/lib/net6.0/_._ → src/EFCore.Tools/lib/net8.0/_._
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions src/EFCore/DbUpdateConcurrencyException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ public DbUpdateConcurrencyException(
/// </summary>
/// <param name="info">The serialization info.</param>
/// <param name="context">The streaming context being used.</param>
[Obsolete("This API supports obsolete formatter-based serialization. It should not be called or extended by application code.")]
public DbUpdateConcurrencyException(SerializationInfo info, StreamingContext context)
: base(info, context)
{
Expand Down
1 change: 1 addition & 0 deletions src/EFCore/DbUpdateException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ public DbUpdateException(
/// </summary>
/// <param name="info">The serialization info.</param>
/// <param name="context">The streaming context being used.</param>
[Obsolete("This API supports obsolete formatter-based serialization. It should not be called or extended by application code.")]
public DbUpdateException(SerializationInfo info, StreamingContext context)
: base(info, context)
{
Expand Down
5 changes: 4 additions & 1 deletion src/EFCore/EF.CompileAsyncQuery.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Linq.Expressions;
using System.Threading;
Expand All @@ -25,7 +26,9 @@ namespace Microsoft.EntityFrameworkCore
/// <typeparam name="TResult">The query result type.</typeparam>
/// <param name="queryExpression">The LINQ query expression.</param>
/// <returns>A delegate that can be invoked to execute the compiled query.</returns>
public static Func<TContext, IAsyncEnumerable<TResult>> CompileAsyncQuery<TContext, TResult>(
public static Func<TContext, IAsyncEnumerable<TResult>> CompileAsyncQuery<
TContext,
[DynamicallyAccessedMembers(IEntityType.DynamicallyAccessedMemberTypes)] TResult>(
Expression<Func<TContext, DbSet<TResult>>> queryExpression)
where TContext : DbContext
where TResult : class
Expand Down
5 changes: 0 additions & 5 deletions src/EFCore/EF.CompileQuery.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// <auto-generated />

using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using Microsoft.EntityFrameworkCore.Query;
using Microsoft.EntityFrameworkCore.Query.Internal;

namespace Microsoft.EntityFrameworkCore
Expand Down
2 changes: 1 addition & 1 deletion src/EFCore/EFCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Commonly Used Types:
Microsoft.EntityFrameworkCore.DbContext
Microsoft.EntityFrameworkCore.DbSet
</Description>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<MinClientVersion>3.6</MinClientVersion>
<AssemblyName>Microsoft.EntityFrameworkCore</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
Expand Down
1 change: 1 addition & 0 deletions src/EFCore/Storage/RetryLimitExceededException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ public RetryLimitExceededException(string message, Exception innerException)
/// </summary>
/// <param name="info">The serialization info.</param>
/// <param name="context">The streaming context being used.</param>
[Obsolete("This API supports obsolete formatter-based serialization. It should not be called or extended by application code.")]
public RetryLimitExceededException(SerializationInfo info, StreamingContext context)
: base(info, context)
{
Expand Down
0 ...et6.0/Microsoft.EntityFrameworkCore.props → ...et8.0/Microsoft.EntityFrameworkCore.props
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/dotnet-ef/dotnet-ef.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dotnet ef dbcontext scaffold
dotnet ef database drop
dotnet ef database update
</Description>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<OutputType>Exe</OutputType>
<PackAsTool>true</PackAsTool>
<PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;win-arm64</PackAsToolShimRuntimeIdentifiers>
Expand Down
2 changes: 1 addition & 1 deletion test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>Microsoft.EntityFrameworkCore.Analyzers.Tests</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
<PreserveCompilationContext>true</PreserveCompilationContext>
Expand Down
Loading